From 8c688c82d7667ee60ccbbf4828fcf502a0286545 Mon Sep 17 00:00:00 2001 From: HailSanta <53960937+HailSanta@users.noreply.github.com> Date: Mon, 13 Feb 2023 19:46:48 -0500 Subject: [PATCH] all map data complete (#941) * just 10 left * six left * split dead flo_19 * merged texture pan includes * cooking * bedroom * study * one left * kkj_25 ok * kkj_25 cleanup I * enemy include reorg * NO_DROPS cleanup * revised NO_DROP * dead_flo_19 splits * StaticNpc -> NpcData * removed tabs * canonical npcdata fields ordering * ANIM_LIST_END for ExtraAnims * npcdata field reordering * DISPOSE_LOCATION * kkj_25 done * marked unused area bytes * adjusted function temp defines --------- Co-authored-by: HailSanta --- include/common_structs.h | 5 +- include/effects.h | 16 +- include/enums.h | 62 +- include/npc.h | 30 +- include/script_api/common.h | 1 + include/script_api/macros.h | 2 +- src/16c8e0.c | 6 +- src/182B30.c | 30 +- src/7B440.c | 4 +- src/7E9D0.c | 4 +- src/EFEB00.c | 60 - src/battle/area_flo/actor/lakitu.c | 2 +- src/battle/area_flo2/actor/huff_n_puff.c | 2 +- src/battle/area_flo2/actor/monty_mole_boss.c | 2 +- src/battle/area_jan/actor/jungle_fuzzy.c | 2 +- src/battle/area_jan/actor/spear_guy.c | 2 +- src/battle/area_kkj/stage/kpa_05.c | 6 +- src/battle/area_kpa2/stage/kpa_03.c | 6 +- .../area_kpa4/actor/bombshell_bill_blaster.c | 2 +- src/battle/area_mac/actor/lee.c | 12 +- src/battle/area_mim/actor/forest_fuzzy.c | 2 +- src/battle/area_pra2/actor/crystal_bit.c | 4 +- src/battle/area_pra2/actor/crystal_king.c | 2 +- src/battle/area_tik/stage/tik_05.c | 1 - src/battle/area_tik2/stage/tik_05.c | 1 - src/battle/area_tik3/stage/tik_05.c | 1 - .../area_trd_part_1/actor/bill_blaster.c | 2 +- .../area_trd_part_2/actor/blue_ninja_koopa.c | 4 +- .../area_trd_part_2/actor/green_ninja_koopa.c | 4 +- .../area_trd_part_2/actor/red_ninja_koopa.c | 4 +- .../actor/yellow_ninja_koopa.c | 4 +- src/battle/common/actor/bandit.inc.c | 2 +- src/battle/common/actor/duplighost.inc.c | 14 +- src/battle/common/actor/ember.inc.c | 2 +- src/battle/common/actor/ghost_goombario.inc.c | 2 +- src/battle/common/actor/koopatrol.inc.c | 2 +- src/battle/common/actor/magikoopa.inc.c | 2 +- src/battle/common/actor/monty_mole.inc.c | 2 +- src/battle/partner/lakilester.c | 12 +- src/battle/partner/watt.c | 4 +- src/battle/star/up_and_away/7952E0.c | 2 +- src/collision.c | 14 +- src/common/ActorJumpToPos.inc.c | 2 +- src/common/AddFP.inc.c | 2 +- src/common/AddHP.inc.c | 2 +- src/common/CalculateArcsinDeg.inc.c | 2 +- src/common/CanPlayerLoseAction.inc.c | 2 +- src/common/ChompChainInit.inc.c | 2 +- src/common/CompareFloats.inc.c | 2 +- src/common/CosInterpMinMax.inc.c | 2 +- src/common/DisableRandomAbility.inc.c | 2 +- src/common/Dist3D.inc.c | 2 +- src/common/DivActorLevel4.inc.c | 2 +- src/common/FadeBackgroundToBlack.inc.c | 2 +- src/common/FoliageTransform.inc.c | 2 +- src/common/FreeIcon.inc.c | 2 +- src/common/GetBootsHammerLevel.inc.c | 2 +- src/common/GetItemEntityPosition.inc.c | 2 +- src/common/GetJumpHammerCharge.inc.c | 2 +- src/common/GetLastActorEventType.inc.c | 2 +- src/common/GetLastEventType.inc.c | 2 +- src/common/GetModelPos.inc.c | 2 +- src/common/GetPlayerHpPercent.inc.c | 2 +- src/common/GetSelectedMoveID.inc.c | 2 +- src/common/IsAOrBPressed.inc.c | 2 +- src/common/ItemEntityJumpToPos.inc.c | 2 +- src/common/MediGuySpriteRotationFunc.inc.c | 2 +- src/common/RemoveChillOut.inc.c | 2 +- src/common/Set80071270_0_16.inc.c | 2 +- src/common/Set80218630_Var0.inc.c | 2 +- src/common/SetAngleClamped.inc.c | 2 +- src/common/SetBackgroundAlpha.inc.c | 2 +- src/common/SetNpcCollision32.inc.c | 2 +- src/common/SetNpcPosYaw.inc.c | 2 +- src/common/SetPlayerStatusPosYaw.inc.c | 2 +- src/common/SetSpinSmashable.inc.c | 2 +- src/common/ShrinkActor.inc.c | 2 +- src/common/SpitInk.inc.c | 2 +- src/common/SpyGuyActionFunc.inc.c | 2 +- src/common/StarPower.inc.c | 8 +- src/common/StarRodAppearEffect.inc.c | 2 +- src/common/StarRodPowerUpEffect.inc.c | 2 +- src/common/StartRumbleWithParams.inc.c | 2 +- src/common/UnfadeBackgroundToBlack.inc.c | 2 +- src/common/UnkActorPosFunc.inc.c | 2 +- src/common/UnkActorSizeFunc.inc.c | 2 +- src/common/UnkAngleFunc2.inc.c | 2 +- src/common/UnkBackgroundFunc.inc.c | 2 +- src/common/UnkBackgroundFunc2.inc.c | 2 +- src/common/UnkBackgroundFunc3.inc.c | 2 +- src/common/UnkBattleFunc1.inc.c | 2 +- src/common/UnkBattleFunc2.inc.c | 4 +- src/common/UnkBattleFunc5.inc.c | 2 +- src/common/UnkBowserFunc1.inc.c | 2 +- src/common/UnkEffect6CFunc.inc.c | 2 +- src/common/UnkEffect6FFunc.inc.c | 2 +- src/common/UnkEnemyPosFunc.inc.c | 2 +- src/common/UnkFireBreathFXFunc.inc.c | 2 +- src/common/UnkFloatFunc005.inc.c | 2 +- src/common/UnkFloatFunc2.inc.c | 2 +- src/common/UnkFloatFunc3.inc.c | 2 +- src/common/UnkFogFunc.inc.c | 2 +- src/common/UnkFogFunc2.inc.c | 2 +- src/common/UnkLightningBoltFxFunc1.inc.c | 2 +- src/common/UnkLightningFXFunc.inc.c | 15 - src/common/UnkModelStuff2.inc.c | 2 +- src/common/UnkSfxFunc.inc.c | 2 +- src/common/UnkStarFunc.inc.c | 2 +- src/common/UnkWhirlwindEffectFunc.inc.c | 2 +- src/de740_len_23f0.c | 80 +- src/effects/firework_rocket.c | 2 +- src/effects/stars_orbiting.c | 76 +- src/encounter.c | 2 +- src/evt/map_api.c | 17 +- src/world/action/idle.c | 4 +- src/world/action/sneaky_parasol.c | 2 +- src/world/action/step_up.c | 4 +- src/world/action/walk.c | 12 +- src/world/actions.c | 98 +- src/world/area_arn/arn.h | 50 +- src/world/area_arn/arn_02/arn_02_4_npc.c | 28 +- src/world/area_arn/arn_03/arn_03_3_npc.c | 70 +- src/world/area_arn/arn_04/arn_04_3_npc.c | 38 +- src/world/area_arn/arn_05/arn_05_3_npc.c | 72 +- src/world/area_arn/arn_07/arn_07.h | 1 + src/world/area_arn/arn_07/arn_07_2_main.c | 1 + src/world/area_arn/arn_07/arn_07_5_npc.c | 134 +- src/world/area_arn/arn_08/arn_08_6_npc.c | 16 +- src/world/area_arn/arn_09/arn_09_5_npc.c | 8 +- src/world/area_arn/arn_10/arn_10_3_npc.c | 20 +- src/world/area_arn/arn_11/arn_11_3_npc.c | 8 +- src/world/area_arn/arn_12/arn_12_3_npc.c | 20 +- src/world/area_arn/arn_13/arn_13_3_npc.c | 20 +- src/world/area_dgb/dgb_00/dgb_00_3_npc.c | 65 +- src/world/area_dgb/dgb_01/dgb_01.h | 6 +- src/world/area_dgb/dgb_01/dgb_01_5_npc.c | 80 +- src/world/area_dgb/dgb_02/dgb_02_3_npc.c | 18 +- src/world/area_dgb/dgb_03/dgb_03_5_npc.c | 28 +- src/world/area_dgb/dgb_04/dgb_04_3_npc.c | 10 +- src/world/area_dgb/dgb_05/dgb_05_5_npc.c | 18 +- src/world/area_dgb/dgb_06/dgb_06_4_npc.c | 8 +- src/world/area_dgb/dgb_07/dgb_07_4_npc.c | 10 +- src/world/area_dgb/dgb_08/dgb_08_3_npc.c | 78 +- src/world/area_dgb/dgb_09/dgb_09_4_npc.c | 30 +- src/world/area_dgb/dgb_15/dgb_15_3_npc.c | 14 +- src/world/area_dgb/dgb_16/dgb_16_4_npc.c | 50 +- src/world/area_dgb/dgb_18/dgb_18_3_npc.c | 22 +- src/world/area_dro/dro.h | 18 +- src/world/area_dro/dro_01/dro_01_3_npc.c | 116 +- src/world/area_dro/dro_02/dro_02_5_npc.c | 110 +- src/world/area_end/end.h | 32 +- .../area_end/end_00/end_00_3_parade_setup.c | 52 +- src/world/area_end/end_00/end_00_7_boos.c | 8 +- src/world/area_flo/flo.h | 8 + src/world/area_flo/flo_00/flo_00_3_npc.c | 70 +- src/world/area_flo/flo_00/flo_00_4_epilogue.c | 32 +- src/world/area_flo/flo_03/flo_03_3_npc.c | 72 +- src/world/area_flo/flo_07/flo_07_2_main.c | 1 - src/world/area_flo/flo_07/flo_07_3_npc.c | 8 +- src/world/area_flo/flo_08/flo_08_4_npc.c | 78 +- src/world/area_flo/flo_09/flo_09_5_npc.c | 38 +- src/world/area_flo/flo_10/flo_10_4_fountain.c | 1 - src/world/area_flo/flo_10/flo_10_5_npc.c | 8 +- src/world/area_flo/flo_11/flo_11_3_npc.c | 12 +- src/world/area_flo/flo_12/flo_12_3_npc.c | 12 +- src/world/area_flo/flo_13/flo_13_4_npc.c | 118 +- src/world/area_flo/flo_14/flo_14_2_main.c | 1 - src/world/area_flo/flo_14/flo_14_4_npc.c | 18 +- src/world/area_flo/flo_15/flo_15_3_npc.c | 14 +- src/world/area_flo/flo_16/flo_16_5_npc.c | 18 +- src/world/area_flo/flo_17/flo_17_4_npc.c | 50 +- src/world/area_flo/flo_18/flo_18_2_main.c | 1 - src/world/area_flo/flo_18/flo_18_4_npc.c | 30 +- src/world/area_flo/flo_19/flo_19_3_main.c | 1 - src/world/area_flo/flo_21/flo_21_2_main.c | 2 +- src/world/area_flo/flo_21/flo_21_4_npc.c | 120 +- src/world/area_flo/flo_22/flo_22_3_npc.c | 18 +- src/world/area_flo/flo_23/flo_23_3_npc.c | 26 +- src/world/area_flo/flo_24/flo_24_4_water.c | 1 - src/world/area_flo/flo_25/flo_25_3_npc.c | 28 +- src/world/area_gv/gv.h | 32 +- src/world/area_gv/gv_01/gv_01_1_main.c | 1 - src/world/area_hos/hos.h | 18 +- src/world/area_hos/hos_00/hos_00_4_npc.c | 28 +- src/world/area_hos/hos_01/hos_01.h | 24 +- src/world/area_hos/hos_01/hos_01_3_model_fx.c | 1 - src/world/area_hos/hos_01/hos_01_4_npc.c | 32 +- src/world/area_hos/hos_02/hos_02_3_model_fx.c | 1 - src/world/area_hos/hos_02/hos_02_5_npc.c | 26 +- src/world/area_hos/hos_03/hos_03.h | 16 +- src/world/area_hos/hos_03/hos_03_3_model_fx.c | 1 - src/world/area_hos/hos_03/hos_03_6_npc.c | 54 +- .../area_hos/hos_04/hos_04_3_fountains.c | 1 - src/world/area_hos/hos_04/hos_04_6_intro.c | 8 +- src/world/area_hos/hos_05/hos_05.h | 2 +- src/world/area_hos/hos_05/hos_05_3_misc.c | 1 - src/world/area_hos/hos_05/hos_05_4_npc.c | 215 +-- src/world/area_hos/hos_05/hos_05_5_intro.c | 56 +- src/world/area_hos/hos_05/hos_05_7_model_fx.c | 1 - src/world/area_hos/hos_06/hos_06.h | 8 +- src/world/area_hos/hos_06/hos_06_2_main.c | 1 - src/world/area_hos/hos_06/hos_06_3_merlow.c | 14 +- src/world/area_hos/hos_06/hos_06_6_chest.c | 9 +- src/world/area_hos/hos_10/hos_10.h | 22 +- src/world/area_hos/hos_10/hos_10_2_npc1.c | 92 +- src/world/area_hos/hos_10/hos_10_3_npc2.c | 82 +- src/world/area_hos/hos_10/hos_10_5_intro.c | 1 - .../area_hos/hos_10/hos_10_6_pre_title.c | 1 - src/world/area_hos/hos_20/hos_20_1_main.c | 1 - src/world/area_isk/isk.h | 32 +- src/world/area_isk/isk_02/isk_02_5_npc.c | 32 +- src/world/area_isk/isk_04/isk_04_2_main.c | 2 +- src/world/area_isk/isk_04/isk_04_5_npc.c | 18 +- src/world/area_isk/isk_05/isk_05_3_npc.c | 16 +- src/world/area_isk/isk_07/isk_07_3_npc.c | 32 +- src/world/area_isk/isk_08/isk_08_2_npc.c | 10 +- src/world/area_isk/isk_13/isk_13_3_npc.c | 16 +- src/world/area_isk/isk_14/isk_14_3_npc.c | 16 +- src/world/area_isk/isk_16/isk_16.h | 4 + src/world/area_isk/isk_16/isk_16_1_main.c | 1 + src/world/area_isk/isk_16/isk_16_2_npc.c | 34 +- src/world/area_isk/isk_18/isk_18_2_npc.c | 34 +- src/world/area_iwa/iwa.h | 32 +- src/world/area_iwa/iwa_00/iwa_00_3_npc.c | 56 +- src/world/area_iwa/iwa_01/iwa_01_4_npc.c | 58 +- src/world/area_iwa/iwa_02/iwa_02_3_npc.c | 56 +- src/world/area_iwa/iwa_03/iwa_03_3_npc.c | 46 +- src/world/area_iwa/iwa_04/iwa_04_4_npc.c | 14 +- src/world/area_iwa/iwa_10/iwa_10.h | 2 +- src/world/area_iwa/iwa_10/iwa_10_3_npc.c | 60 +- .../area_iwa/iwa_10/iwa_10_6_parakarry.c | 12 +- src/world/area_iwa/iwa_11/iwa_11_5_npc.c | 8 +- src/world/area_jan/jan_00/jan_00_1_main.c | 1 - src/world/area_jan/jan_00/jan_00_2_npc.c | 52 +- src/world/area_jan/jan_01/jan_01_2_main.c | 1 - src/world/area_jan/jan_01/jan_01_3_npc.c | 50 +- src/world/area_jan/jan_02/jan_02_2_main.c | 1 - src/world/area_jan/jan_02/jan_02_3_npc.c | 50 +- src/world/area_jan/jan_03/jan_03_2_main.c | 1 - src/world/area_jan/jan_03/jan_03_4_npc.c | 150 +- src/world/area_jan/jan_04/jan_04_2_main.c | 3 +- src/world/area_jan/jan_04/jan_04_4_npc.c | 36 +- src/world/area_jan/jan_05/jan_05_2_main.c | 1 - src/world/area_jan/jan_05/jan_05_5_npc.c | 44 +- src/world/area_jan/jan_06/jan_06_1_main.c | 1 - src/world/area_jan/jan_06/jan_06_6_npc.c | 34 +- src/world/area_jan/jan_07/jan_07_3_npc.c | 38 +- src/world/area_jan/jan_08/jan_08_2_main.c | 1 - src/world/area_jan/jan_08/jan_08_5_npc.c | 28 +- src/world/area_jan/jan_09/jan_09_1_main.c | 1 - src/world/area_jan/jan_09/jan_09_3_npc.c | 16 +- src/world/area_jan/jan_10/jan_10_2_main.c | 1 - src/world/area_jan/jan_10/jan_10_3_npc.c | 20 +- src/world/area_jan/jan_11/jan_11_3_npc.c | 4 +- src/world/area_jan/jan_12/jan_12_5_npc.c | 4 +- src/world/area_jan/jan_14/jan_14_4_npc.c | 18 +- src/world/area_jan/jan_15/jan_15_2_npc.c | 32 +- src/world/area_jan/jan_16/jan_16_3_npc.c | 64 +- src/world/area_jan/jan_22/jan_22_3_npc.c | 64 +- src/world/area_jan/jan_23/jan_23_3_npc.c | 40 +- src/world/area_kgr/kgr.h | 32 +- src/world/area_kgr/kgr_02/kgr_02_3_npc.c | 10 +- .../common/ApproachPlayer100Units.inc.c} | 22 +- .../common/ApproachPlayer50Units.inc.c} | 4 +- .../common/RestoreFromPeachState.inc.c | 7 + .../common/Searchlights.inc.c} | 88 +- .../common/SetAvailableDisguise.inc.c | 8 + src/world/area_kkj/common/SetPeachFlag8.inc.c | 8 + src/world/area_kkj/kkj.h | 125 +- src/world/area_kkj/kkj_00/ABB290.c | 29 - src/world/area_kkj/kkj_00/ABB340.c | 25 - src/world/area_kkj/kkj_00/kkj_00.h | 99 +- src/world/area_kkj/kkj_00/kkj_00_0_header.c | 24 + src/world/area_kkj/kkj_00/kkj_00_1_music.c | 19 + src/world/area_kkj/kkj_00/kkj_00_2_main.c | 169 ++ .../area_kkj/kkj_00/kkj_00_3_npc_intro.c | 435 +++++ .../area_kkj/kkj_00/kkj_00_4_scene_intro.c | 48 + .../area_kkj/kkj_00/kkj_00_5_npc_ending.c | 1041 ++++++++++++ .../area_kkj/kkj_00/kkj_00_6_scene_ending.c | 221 +++ src/world/area_kkj/kkj_01/AC5170.c | 8 - src/world/area_kkj/kkj_01/kkj_01.h | 25 +- src/world/area_kkj/kkj_01/kkj_01_0_header.c | 18 + src/world/area_kkj/kkj_01/kkj_01_1_music.c | 12 + src/world/area_kkj/kkj_01/kkj_01_2_main.c | 133 ++ src/world/area_kkj/kkj_01/kkj_01_3_npc.c | 442 +++++ src/world/area_kkj/kkj_02/AC8D20.c | 4 - src/world/area_kkj/kkj_02/kkj_02.h | 14 +- src/world/area_kkj/kkj_02/kkj_02_0_header.c | 13 + src/world/area_kkj/kkj_02/kkj_02_1_music.c | 15 + src/world/area_kkj/kkj_02/kkj_02_2_main.c | 43 + src/world/area_kkj/kkj_02/kkj_02_3_npc.c | 70 + src/world/area_kkj/kkj_03/AC9710.c | 8 - src/world/area_kkj/kkj_03/AC9730.c | 4 - src/world/area_kkj/kkj_03/kkj_03.h | 16 +- src/world/area_kkj/kkj_03/kkj_03_0_header.c | 16 + src/world/area_kkj/kkj_03/kkj_03_1_music.c | 16 + src/world/area_kkj/kkj_03/kkj_03_2_main.c | 71 + src/world/area_kkj/kkj_03/kkj_03_3_npc.c | 18 + src/world/area_kkj/kkj_03/kkj_03_4_scenes.c | 146 ++ src/world/area_kkj/kkj_10/ACAB20.c | 25 - src/world/area_kkj/kkj_10/ACAB90.c | 3 - src/world/area_kkj/kkj_10/ACABD0.c | 7 - src/world/area_kkj/kkj_10/ACB3C0.c | 16 - src/world/area_kkj/kkj_10/kkj_10.h | 21 +- src/world/area_kkj/kkj_10/kkj_10_0_header.c | 16 + src/world/area_kkj/kkj_10/kkj_10_1_main.c | 188 +++ src/world/area_kkj/kkj_10/kkj_10_2_entity.c | 47 + .../area_kkj/kkj_10/kkj_10_3_npcs_early.c | 159 ++ .../area_kkj/kkj_10/kkj_10_4_npcs_later.c | 220 +++ src/world/area_kkj/kkj_11/ACE140.c | 27 - src/world/area_kkj/kkj_11/ACE1B0.c | 3 - src/world/area_kkj/kkj_11/ACE1F0.c | 7 - src/world/area_kkj/kkj_11/ACE9E0.c | 20 - src/world/area_kkj/kkj_11/kkj_11.h | 30 +- src/world/area_kkj/kkj_11/kkj_11_0_header.c | 20 + src/world/area_kkj/kkj_11/kkj_11_1_main.c | 223 +++ src/world/area_kkj/kkj_11/kkj_11_2_entity.c | 47 + src/world/area_kkj/kkj_11/kkj_11_3_scene.c | 62 + src/world/area_kkj/kkj_11/kkj_11_4_demo.c | 222 +++ .../area_kkj/kkj_11/kkj_11_5_npcs_early.c | 303 ++++ .../area_kkj/kkj_11/kkj_11_6_npcs_later.c | 366 +++++ src/world/area_kkj/kkj_12/AD4090.c | 21 - src/world/area_kkj/kkj_12/AD4100.c | 19 - src/world/area_kkj/kkj_12/kkj_12.h | 16 +- src/world/area_kkj/kkj_12/kkj_12_0_header.c | 13 + src/world/area_kkj/kkj_12/kkj_12_1_main.c | 68 + src/world/area_kkj/kkj_12/kkj_12_2_npc.c | 265 +++ src/world/area_kkj/kkj_13/AD5ED0.c | 6 - src/world/area_kkj/kkj_13/AD5EF0.c | 4 - src/world/area_kkj/kkj_13/AD6200.c | 111 -- src/world/area_kkj/kkj_13/kkj_13.h | 31 +- src/world/area_kkj/kkj_13/kkj_13_0_header.c | 18 + src/world/area_kkj/kkj_13/kkj_13_1_music.c | 20 + src/world/area_kkj/kkj_13/kkj_13_2_main.c | 94 ++ .../area_kkj/kkj_13/kkj_13_3_npcs_finale.c | 385 +++++ .../area_kkj/kkj_13/kkj_13_4_npcs_intro.c | 147 ++ .../area_kkj/kkj_13/kkj_13_5_intro_scenes.c | 506 ++++++ src/world/area_kkj/kkj_14/ADAEA0.c | 10 - src/world/area_kkj/kkj_14/ADAEF0.c | 44 - src/world/area_kkj/kkj_14/kkj_14.h | 43 +- src/world/area_kkj/kkj_14/kkj_14_0_header.c | 31 + .../area_kkj/kkj_14/kkj_14_10_chapter2.c | 238 +++ .../area_kkj/kkj_14/kkj_14_11_chapter3.c | 70 + .../area_kkj/kkj_14/kkj_14_12_chapter4.c | 22 + .../area_kkj/kkj_14/kkj_14_13_chapter5.c | 47 + .../area_kkj/kkj_14/kkj_14_14_chapter6.c | 34 + .../area_kkj/kkj_14/kkj_14_15_chapter7.c | 438 +++++ src/world/area_kkj/kkj_14/kkj_14_1_music.c | 19 + src/world/area_kkj/kkj_14/kkj_14_2_main.c | 231 +++ .../area_kkj/kkj_14/kkj_14_3_interactables.c | 427 +++++ .../area_kkj/kkj_14/kkj_14_4_npc_guards.c | 231 +++ src/world/area_kkj/kkj_14/kkj_14_5_npc_ch0.c | 55 + src/world/area_kkj/kkj_14/kkj_14_6_npc_ch2.c | 56 + src/world/area_kkj/kkj_14/kkj_14_7_npc_ch7.c | 90 ++ src/world/area_kkj/kkj_14/kkj_14_8_chapter0.c | 493 ++++++ src/world/area_kkj/kkj_14/kkj_14_9_chapter1.c | 48 + src/world/area_kkj/kkj_15/AE5590.c | 17 - src/world/area_kkj/kkj_15/AE58D0.c | 20 - src/world/area_kkj/kkj_15/AE5A90.c | 13 - src/world/area_kkj/kkj_15/AE5B60.c | 15 - src/world/area_kkj/kkj_15/kkj_15.h | 44 +- src/world/area_kkj/kkj_15/kkj_15_0_header.c | 14 + .../area_kkj/kkj_15/kkj_15_10_npc_chapter3.c | 86 + src/world/area_kkj/kkj_15/kkj_15_1_music.c | 20 + src/world/area_kkj/kkj_15/kkj_15_2_main.c | 156 ++ .../area_kkj/kkj_15/kkj_15_3_rotating_wall.c | 131 ++ src/world/area_kkj/kkj_15/kkj_15_4_chapter0.c | 413 +++++ src/world/area_kkj/kkj_15/kkj_15_5_chapter1.c | 344 ++++ src/world/area_kkj/kkj_15/kkj_15_6_chapter2.c | 31 + src/world/area_kkj/kkj_15/kkj_15_7_chapter3.c | 345 ++++ .../area_kkj/kkj_15/kkj_15_8_npc_chapter0.c | 116 ++ .../area_kkj/kkj_15/kkj_15_9_npc_chapter1.c | 65 + src/world/area_kkj/kkj_16/AED410.c | 23 - src/world/area_kkj/kkj_16/AEDC60.c | 18 - src/world/area_kkj/kkj_16/kkj_16.h | 31 +- src/world/area_kkj/kkj_16/kkj_16_0_header.c | 12 + src/world/area_kkj/kkj_16/kkj_16_1_main.c | 68 + .../area_kkj/kkj_16/kkj_16_2_npcs_early.c | 254 +++ .../area_kkj/kkj_16/kkj_16_3_npcs_later.c | 229 +++ src/world/area_kkj/kkj_16/kkj_16_4_stealth.c | 276 ++++ src/world/area_kkj/kkj_16/kkj_16_5_entity.c | 28 + src/world/area_kkj/kkj_17/AF1C60.c | 119 -- src/world/area_kkj/kkj_17/kkj_17.h | 11 +- src/world/area_kkj/kkj_17/kkj_17_0_header.c | 12 + src/world/area_kkj/kkj_17/kkj_17_1_main.c | 42 + src/world/area_kkj/kkj_17/kkj_17_2_entity.c | 26 + src/world/area_kkj/kkj_17/kkj_17_3_chest.c | 283 ++++ src/world/area_kkj/kkj_18/AF2CA0.c | 15 - src/world/area_kkj/kkj_18/AF2FE0.c | 88 - src/world/area_kkj/kkj_18/kkj_18.h | 30 +- src/world/area_kkj/kkj_18/kkj_18_0_header.c | 13 + src/world/area_kkj/kkj_18/kkj_18_1_music.c | 9 + src/world/area_kkj/kkj_18/kkj_18_2_main.c | 132 ++ src/world/area_kkj/kkj_18/kkj_18_3_npc.c | 153 ++ src/world/area_kkj/kkj_18/kkj_18_4_gourmet.c | 661 ++++++++ src/world/area_kkj/kkj_19/AF7950.c | 87 - src/world/area_kkj/kkj_19/AF7C00.c | 272 ---- src/world/area_kkj/kkj_19/kkj_19.h | 25 +- src/world/area_kkj/kkj_19/kkj_19_0_header.c | 12 + src/world/area_kkj/kkj_19/kkj_19_1_music.c | 16 + src/world/area_kkj/kkj_19/kkj_19_2_main.c | 220 +++ .../area_kkj/kkj_19/kkj_19_3_npcs_intro.c | 58 + .../area_kkj/kkj_19/kkj_19_4_npcs_peach.c | 53 + src/world/area_kkj/kkj_19/kkj_19_5_baking.c | 1433 +++++++++++++++++ src/world/area_kkj/kkj_20/AFDB40.c | 12 - src/world/area_kkj/kkj_20/AFDE00.c | 5 - src/world/area_kkj/kkj_20/kkj_20.h | 19 +- src/world/area_kkj/kkj_20/kkj_20_0_header.c | 12 + src/world/area_kkj/kkj_20/kkj_20_1_music.c | 13 + src/world/area_kkj/kkj_20/kkj_20_2_main.c | 38 + src/world/area_kkj/kkj_20/kkj_20_3_entity.c | 27 + src/world/area_kkj/kkj_20/kkj_20_4_npc.c | 355 ++++ src/world/area_kkj/kkj_21/B022A0.c | 3 - src/world/area_kkj/kkj_21/kkj_21.h | 8 +- src/world/area_kkj/kkj_21/kkj_21_0_header.c | 12 + src/world/area_kkj/kkj_21/kkj_21_1_main.c | 40 + src/world/area_kkj/kkj_22/B024F0.c | 4 - src/world/area_kkj/kkj_22/kkj_22.h | 8 +- src/world/area_kkj/kkj_22/kkj_22_0_header.c | 14 + src/world/area_kkj/kkj_22/kkj_22_1_music.c | 9 + src/world/area_kkj/kkj_22/kkj_22_2_main.c | 33 + src/world/area_kkj/kkj_23/B02880.c | 8 - src/world/area_kkj/kkj_23/B028A0.c | 40 - src/world/area_kkj/kkj_23/B03190.c | 23 - src/world/area_kkj/kkj_23/kkj_23.h | 29 +- src/world/area_kkj/kkj_23/kkj_23_0_header.c | 16 + src/world/area_kkj/kkj_23/kkj_23_1_music.c | 9 + src/world/area_kkj/kkj_23/kkj_23_2_main.c | 71 + .../area_kkj/kkj_23/kkj_23_3_npcs_finale.c | 208 +++ .../area_kkj/kkj_23/kkj_23_4_npcs_peach.c | 170 ++ src/world/area_kkj/kkj_23/kkj_23_5_scene.c | 347 ++++ src/world/area_kkj/kkj_24/B06570.c | 9 - src/world/area_kkj/kkj_24/kkj_24.h | 9 +- src/world/area_kkj/kkj_24/kkj_24_0_header.c | 14 + src/world/area_kkj/kkj_24/kkj_24_1_music.c | 9 + src/world/area_kkj/kkj_24/kkj_24_2_main.c | 53 + src/world/area_kkj/kkj_24/kkj_24_3_entity.c | 8 + src/world/area_kkj/kkj_25/B06A00.c | 8 - src/world/area_kkj/kkj_25/B06A20.c | 8 - src/world/area_kkj/kkj_25/B06A50.c | 3 - src/world/area_kkj/kkj_25/B06A80.c | 21 - src/world/area_kkj/kkj_25/B06D10.c | 135 -- src/world/area_kkj/kkj_25/kkj_25.h | 88 +- src/world/area_kkj/kkj_25/kkj_25_0_header.c | 15 + src/world/area_kkj/kkj_25/kkj_25_1_main.c | 135 ++ .../area_kkj/kkj_25/kkj_25_2_npc_initial.c | 298 ++++ .../area_kkj/kkj_25/kkj_25_3_npc_midpoint.c | 432 +++++ .../area_kkj/kkj_25/kkj_25_4_npc_final.c | 183 +++ src/world/area_kkj/kkj_25/kkj_25_5_arena.c | 611 +++++++ .../area_kkj/kkj_25/kkj_25_6_peach_free.c | 237 +++ .../area_kkj/kkj_25/kkj_25_7_kammy_defeated.c | 407 +++++ .../kkj_25/kkj_25_8_bowser_defeated.c | 514 ++++++ src/world/area_kkj/kkj_25/kkj_25_9_entity.c | 13 + src/world/area_kkj/kkj_26/B13120.c | 13 - src/world/area_kkj/kkj_26/kkj_26.h | 13 +- src/world/area_kkj/kkj_26/kkj_26_0_header.c | 16 + src/world/area_kkj/kkj_26/kkj_26_1_main.c | 73 + src/world/area_kkj/kkj_26/kkj_26_2_scenes.c | 77 + src/world/area_kkj/kkj_26/kkj_26_3_demo.c | 60 + src/world/area_kkj/kkj_27/B13D70.c | 7 - src/world/area_kkj/kkj_27/B14080.c | 32 - src/world/area_kkj/kkj_27/kkj_27.h | 11 +- src/world/area_kkj/kkj_27/kkj_27_0_header.c | 12 + src/world/area_kkj/kkj_27/kkj_27_1_music.c | 20 + src/world/area_kkj/kkj_27/kkj_27_2_main.c | 73 + .../area_kkj/kkj_27/kkj_27_3_rotating_wall.c | 141 ++ src/world/area_kkj/kkj_28/B14EA0.c | 3 - src/world/area_kkj/kkj_28/kkj_28.h | 7 +- src/world/area_kkj/kkj_28/kkj_28_0_header.c | 11 + src/world/area_kkj/kkj_28/kkj_28_1_main.c | 36 + src/world/area_kkj/kkj_29/B150B0.c | 11 - src/world/area_kkj/kkj_29/B150E0.c | 15 - src/world/area_kkj/kkj_29/kkj_29.h | 24 +- src/world/area_kkj/kkj_29/kkj_29_0_header.c | 11 + src/world/area_kkj/kkj_29/kkj_29_1_main.c | 57 + src/world/area_kkj/kkj_29/kkj_29_2_npc.c | 114 ++ src/world/area_kkj/kkj_29/kkj_29_3_quiz.c | 1297 +++++++++++++++ src/world/area_kmr/kmr.h | 32 +- src/world/area_kmr/kmr_00/kmr_00_4_npc.c | 52 +- src/world/area_kmr/kmr_02/kmr_02.h | 38 +- src/world/area_kmr/kmr_02/kmr_02_3_npc.c | 157 +- src/world/area_kmr/kmr_03/kmr_03_3_npc.c | 12 +- src/world/area_kmr/kmr_04/kmr_04_3_npc.c | 16 +- src/world/area_kmr/kmr_05/kmr_05_3_npc.c | 40 +- src/world/area_kmr/kmr_06/kmr_06_3_npc.c | 20 +- src/world/area_kmr/kmr_07/kmr_07_3_npc.c | 20 +- src/world/area_kmr/kmr_09/kmr_09_3_npc.c | 38 +- src/world/area_kmr/kmr_10/kmr_10_3_npc.c | 8 +- src/world/area_kmr/kmr_11/kmr_11.h | 6 +- src/world/area_kmr/kmr_11/kmr_11_4_npc.c | 46 +- src/world/area_kmr/kmr_12/kmr_12_3_npc.c | 12 +- src/world/area_kmr/kmr_20/kmr_20_10_npc.c | 36 +- src/world/area_kmr/kmr_20/kmr_20_8_bed.c | 4 +- .../area_kmr/kmr_20/kmr_20_9_npc_scenes.c | 20 +- src/world/area_kmr/kmr_21/kmr_21_1_main.c | 2 +- src/world/area_kmr/kmr_22/kmr_22.h | 68 +- src/world/area_kmr/kmr_22/kmr_22_2_npc.c | 284 ++-- .../area_kmr/kmr_22/npc/lava_piranha.inc.c | 2 +- src/world/area_kmr/kmr_23/kmr_23_2_npc.c | 98 +- src/world/area_kmr/kmr_30/kmr_30_1_main.c | 1 - src/world/area_kmr/kmr_30/kmr_30_2_npc.c | 10 +- src/world/area_kpa/kpa.h | 2 + src/world/area_kpa/kpa_01/kpa_01_3_npc.c | 18 +- src/world/area_kpa/kpa_03/kpa_03_3_npc.c | 50 +- src/world/area_kpa/kpa_08/kpa_08_4_npc.c | 10 +- src/world/area_kpa/kpa_09/kpa_09_4_npc.c | 10 +- src/world/area_kpa/kpa_10/kpa_10_2_main.c | 1 - src/world/area_kpa/kpa_10/kpa_10_3_npc.c | 14 +- src/world/area_kpa/kpa_102/kpa_102_2_main.c | 1 - src/world/area_kpa/kpa_102/kpa_102_3_npc.c | 30 +- src/world/area_kpa/kpa_11/kpa_11_2_main.c | 1 - src/world/area_kpa/kpa_11/kpa_11_4_npc.c | 32 +- src/world/area_kpa/kpa_111/kpa_111_4_npc.c | 18 +- src/world/area_kpa/kpa_113/kpa_113_5_npc.c | 10 +- src/world/area_kpa/kpa_115/kpa_115_4_npc.c | 10 +- src/world/area_kpa/kpa_12/kpa_12_2_main.c | 1 - src/world/area_kpa/kpa_13/kpa_13_2_main.c | 1 - src/world/area_kpa/kpa_130/kpa_130_3_npc.c | 114 +- src/world/area_kpa/kpa_133/kpa_133_2_main.c | 1 - src/world/area_kpa/kpa_133/kpa_133_4_npc.c | 8 +- src/world/area_kpa/kpa_134/kpa_134_2_main.c | 1 - src/world/area_kpa/kpa_134/kpa_134_4_npc.c | 8 +- src/world/area_kpa/kpa_14/kpa_14_2_main.c | 1 - src/world/area_kpa/kpa_15/kpa_15_2_main.c | 1 - src/world/area_kpa/kpa_16/kpa_16_2_main.c | 1 - src/world/area_kpa/kpa_16/kpa_16_4_npc.c | 18 +- src/world/area_kpa/kpa_17/kpa_17_4_npc.c | 26 +- src/world/area_kpa/kpa_32/kpa_32_3_main.c | 1 - src/world/area_kpa/kpa_33/kpa_33_3_main.c | 1 - src/world/area_kpa/kpa_50/kpa_50_3_npc.c | 28 +- src/world/area_kpa/kpa_51/kpa_51_3_npc.c | 28 +- src/world/area_kpa/kpa_52/kpa_52_4_npc.c | 18 +- src/world/area_kpa/kpa_53/kpa_53_3_npc.c | 62 +- src/world/area_kpa/kpa_60/kpa_60_3_main.c | 1 - src/world/area_kpa/kpa_61/kpa_61_2_main.c | 1 - src/world/area_kpa/kpa_61/kpa_61_3_npc.c | 36 +- src/world/area_kpa/kpa_62/kpa_62_3_main.c | 1 - src/world/area_kpa/kpa_70/kpa_70.h | 6 +- src/world/area_kpa/kpa_70/kpa_70_2_main.c | 1 - src/world/area_kpa/kpa_70/kpa_70_3_npc.c | 18 +- src/world/area_kpa/kpa_81/kpa_81_3_npc.c | 8 +- src/world/area_kpa/kpa_82/kpa_82_3_npc.c | 872 +++++----- src/world/area_kpa/kpa_83/kpa_83_3_npc.c | 42 +- src/world/area_kpa/kpa_91/kpa_91_3_npc.c | 38 +- src/world/area_kpa/kpa_95/kpa_95_4_npc.c | 38 +- src/world/area_kpa/kpa_96/kpa_96_3_npc.c | 8 +- .../area_kzn/common/SmokeTexPanners.inc.c | 1 - src/world/area_kzn/kzn.h | 14 + src/world/area_kzn/kzn_01/kzn_01_2_npc.c | 10 +- src/world/area_kzn/kzn_02/kzn_02_1_main.c | 1 - src/world/area_kzn/kzn_02/kzn_02_3_npc.c | 28 +- src/world/area_kzn/kzn_03/kzn_03_2_npc.c | 56 +- src/world/area_kzn/kzn_04/kzn_04_3_npc.c | 54 +- src/world/area_kzn/kzn_06/kzn_06_1_main.c | 1 - src/world/area_kzn/kzn_07/kzn_07_2_main.c | 1 - src/world/area_kzn/kzn_07/kzn_07_4_npc.c | 18 +- src/world/area_kzn/kzn_08/kzn_08_1_main.c | 1 - src/world/area_kzn/kzn_08/kzn_08_3_npc.c | 12 +- src/world/area_kzn/kzn_09/kzn_09_4_npc.c | 36 +- src/world/area_kzn/kzn_11/kzn_11_3_npc.c | 72 +- src/world/area_kzn/kzn_17/kzn_17_3_npc.c | 28 +- src/world/area_kzn/kzn_18/kzn_18_2_npc.c | 18 +- src/world/area_kzn/kzn_19/kzn_19.h | 1 + src/world/area_kzn/kzn_19/kzn_19_2_main.c | 1 + .../area_kzn/kzn_19/kzn_19_3_npc_settings.c | 2 +- src/world/area_kzn/kzn_19/kzn_19_4_npc.c | 38 +- src/world/area_kzn/kzn_20/kzn_20_2_main.c | 1 - src/world/area_kzn/kzn_20/kzn_20_3_npc.c | 16 +- src/world/area_kzn/kzn_22/kzn_22_4_npc.c | 16 +- src/world/area_kzn/kzn_23/kzn_23_3_npc.c | 16 +- src/world/area_mac/mac.h | 32 +- .../area_mac/mac_00/mac_00_10_shared_npc.c | 66 +- .../area_mac/mac_00/mac_00_11_intro_npc.c | 48 +- .../area_mac/mac_00/mac_00_13_epilogue_npc.c | 134 +- src/world/area_mac/mac_00/mac_00_2_main.c | 1 - src/world/area_mac/mac_00/mac_00_5_npc.c | 136 +- .../area_mac/mac_01/mac_01_10_intro_npc.c | 20 +- .../area_mac/mac_01/mac_01_11_epilogue_npc.c | 138 +- src/world/area_mac/mac_01/mac_01_9_npc.c | 256 ++- .../area_mac/mac_01/npc/flower_gate.inc.c | 8 +- .../area_mac/mac_01/npc/post_office.inc.c | 4 +- .../area_mac/mac_01/npc/rowf_and_rhuff.inc.c | 26 +- src/world/area_mac/mac_02/mac_02_2_main.c | 1 - src/world/area_mac/mac_02/mac_02_6_npc.c | 86 +- src/world/area_mac/mac_03/mac_03_4_npc.c | 184 ++- src/world/area_mac/mac_03/mac_03_5_entity.c | 2 +- src/world/area_mac/mac_04/mac_04_6_npc.c | 166 +- .../area_mac/mac_04/mac_04_7_wish_scene.c | 20 +- src/world/area_mac/mac_05/mac_05_3_main.c | 1 - src/world/area_mac/mac_05/mac_05_4_npc.c | 170 +- src/world/area_mac/mac_06/mac_06_1_main.c | 1 - src/world/area_mac/mac_06/mac_06_3_npc.c | 40 +- src/world/area_mac/machi/machi.h | 2 +- src/world/area_mac/machi/machi_5_npc.c | 64 +- src/world/area_mac/machi/machi_6_misstar.c | 4 +- src/world/area_mgm/mgm.h | 32 +- src/world/area_mgm/mgm_00/mgm_00_2_npc.c | 28 +- src/world/area_mgm/mgm_01/mgm_01_2_npc.c | 8 +- src/world/area_mgm/mgm_02/mgm_02_2_npc.c | 232 +-- src/world/area_mim/mim.h | 40 +- src/world/area_mim/mim_01/mim_01_6_npc.c | 10 +- src/world/area_mim/mim_02/mim_02_3_npc.c | 26 +- src/world/area_mim/mim_03/mim_03_6_npc.c | 8 +- src/world/area_mim/mim_04/mim_04_6_npc.c | 18 +- src/world/area_mim/mim_05/mim_05_6_npc.c | 18 +- src/world/area_mim/mim_06/mim_06_6_npc.c | 28 +- src/world/area_mim/mim_07/mim_07_6_npc.c | 34 +- src/world/area_mim/mim_08/mim_08_5_npc.c | 30 +- src/world/area_mim/mim_09/mim_09_6_npc.c | 10 +- src/world/area_mim/mim_10/mim_10_4_npc.c | 24 +- src/world/area_mim/mim_11/mim_11_2_main.c | 1 - src/world/area_mim/mim_11/mim_11_5_npc.c | 22 +- src/world/area_mim/mim_12/mim_12_4_npc.c | 22 +- src/world/area_nok/nok_01/nok_01_4_npc.c | 152 +- src/world/area_nok/nok_02/nok_02_6_npc.c | 178 +- src/world/area_nok/nok_02/nok_02_7_demo.c | 2 +- src/world/area_nok/nok_03/nok_03.h | 8 +- src/world/area_nok/nok_03/nok_03_4_npc.c | 38 +- src/world/area_nok/nok_04/nok_04_4_npc.c | 58 +- src/world/area_nok/nok_11/nok_11_4_npc.c | 62 +- src/world/area_nok/nok_12/nok_12_6_npc.c | 56 +- src/world/area_nok/nok_13/nok_13_4_npc.c | 8 +- src/world/area_nok/nok_14/nok_14_5_npc.c | 40 +- src/world/area_nok/nok_15/nok_15_4_npc.c | 22 +- src/world/area_obk/obk.h | 32 +- src/world/area_obk/obk_01/obk_01.h | 4 +- src/world/area_obk/obk_01/obk_01_6_npc.c | 40 +- src/world/area_obk/obk_02/obk_02_3_npc.c | 14 +- src/world/area_obk/obk_03/obk_03.h | 2 +- src/world/area_obk/obk_03/obk_03_6_npc.c | 8 +- src/world/area_obk/obk_04/obk_04_3_npc.c | 94 +- src/world/area_obk/obk_05/obk_05_5_npc.c | 14 +- src/world/area_obk/obk_07/obk_07_5_npc.c | 24 +- src/world/area_obk/obk_08/obk_08_5_npc.c | 100 +- src/world/area_obk/obk_09/obk_09.h | 6 +- src/world/area_obk/obk_09/obk_09_4_npc.c | 34 +- .../common/TrainStationSwitches.inc.c | 1 - src/world/area_omo/omo_01/omo_01_4_npc.c | 52 +- src/world/area_omo/omo_02/omo_02_6_npc.c | 88 +- src/world/area_omo/omo_03/omo_03.h | 18 +- src/world/area_omo/omo_03/omo_03_5_npc.c | 38 +- src/world/area_omo/omo_04/omo_04_5_npc.c | 54 +- src/world/area_omo/omo_05/omo_05_4_npc.c | 108 +- src/world/area_omo/omo_06/omo_06_5_npc.c | 14 +- src/world/area_omo/omo_07/omo_07_4_npc.c | 92 +- src/world/area_omo/omo_08/omo_08_6_npc.c | 64 +- src/world/area_omo/omo_09/omo_09_7_npc.c | 110 +- src/world/area_omo/omo_10/omo_10_5_npc.c | 14 +- src/world/area_omo/omo_11/omo_11_5_npc.c | 18 +- src/world/area_omo/omo_12/omo_12_3_npc.c | 36 +- src/world/area_omo/omo_13/omo_13_4_npc.c | 32 +- src/world/area_omo/omo_14/omo_14_3_npc.c | 72 +- src/world/area_omo/omo_15/omo_15.h | 4 + src/world/area_omo/omo_15/omo_15_2_main.c | 1 + src/world/area_omo/omo_15/omo_15_3_npc.c | 64 +- src/world/area_omo/omo_16/omo_16_3_npc.c | 6 +- src/world/area_omo/omo_17/omo_17_4_npc.c | 40 +- src/world/area_osr/osr_00/osr_00_2_main.c | 1 - .../area_osr/osr_00/osr_00_3_npc_intro.c | 6 +- .../area_osr/osr_00/osr_00_4_npc_epilogue.c | 138 +- src/world/area_osr/osr_01/osr_01_2_main.c | 1 - src/world/area_osr/osr_01/osr_01_3_npc.c | 8 +- src/world/area_osr/osr_02/osr_02_3_npc.c | 156 +- .../area_osr/osr_02/osr_02_4_npc_peach.c | 14 +- src/world/area_osr/osr_03/osr_03_2_npc.c | 20 +- src/world/area_pra/pra_01/pra_01_3_npc.c | 8 +- src/world/area_pra/pra_04/pra_04_4_npc.c | 10 +- src/world/area_pra/pra_09/pra_09_3_npc.c | 100 +- src/world/area_pra/pra_10/pra_10_3_npc.c | 22 +- src/world/area_pra/pra_13/pra_13_3_npc.c | 32 +- src/world/area_pra/pra_18/pra_18_3_npc.c | 44 +- src/world/area_pra/pra_19/pra_19_3_npc.c | 128 +- src/world/area_pra/pra_31/pra_31.h | 6 +- src/world/area_pra/pra_31/pra_31_2_npc.c | 22 +- src/world/area_pra/pra_32/pra_32.h | 1 + src/world/area_pra/pra_32/pra_32_2_main.c | 1 + src/world/area_pra/pra_32/pra_32_3_npc.c | 28 +- src/world/area_pra/pra_35/pra_35_3_npc.c | 24 +- src/world/area_pra/pra_36/pra_36_3_npc.c | 12 +- src/world/area_pra/pra_37/pra_37_3_npc.c | 12 +- src/world/area_pra/pra_38/pra_38_3_npc.c | 22 +- src/world/area_pra/pra_39/pra_39_3_npc.c | 14 +- src/world/area_sam/sam.h | 32 +- src/world/area_sam/sam_01/sam_01_2_main.c | 1 - src/world/area_sam/sam_01/sam_01_4_npc.c | 104 +- src/world/area_sam/sam_02/sam_02.h | 20 +- src/world/area_sam/sam_02/sam_02_2_main.c | 1 - src/world/area_sam/sam_02/sam_02_3_rooms.c | 60 +- src/world/area_sam/sam_02/sam_02_4_npc.c | 68 +- src/world/area_sam/sam_03/sam_03_3_npc1.c | 14 +- src/world/area_sam/sam_03/sam_03_4_npc2.c | 18 +- src/world/area_sam/sam_04/sam_04_4_npc.c | 46 +- src/world/area_sam/sam_05/sam_05_4_npc.c | 146 +- src/world/area_sam/sam_06/sam_06_2_main.c | 1 - src/world/area_sam/sam_06/sam_06_4_npc.c | 136 +- src/world/area_sam/sam_07/sam_07.h | 12 +- src/world/area_sam/sam_07/sam_07_5_npc.c | 28 +- src/world/area_sam/sam_08/sam_08_4_npc.c | 64 +- src/world/area_sam/sam_10/sam_10_5_npc.c | 10 +- src/world/area_sam/sam_11/sam_11_5_npc.c | 136 +- src/world/area_sam/sam_11/sam_11_6_pond.c | 1 - src/world/area_sam/sam_12/sam_12_3_npc.c | 8 +- src/world/area_sbk/sbk.h | 32 +- src/world/area_sbk/sbk_00/sbk_00.h | 4 + src/world/area_sbk/sbk_00/sbk_00_0_header.c | 16 + src/world/area_sbk/sbk_00/sbk_00_1_main.c | 19 - src/world/area_sbk/sbk_00/sbk_00_2_npc.c | 18 +- src/world/area_sbk/sbk_01/sbk_01_2_npc.c | 18 +- src/world/area_sbk/sbk_02/sbk_02_4_npc.c | 20 +- src/world/area_sbk/sbk_03/sbk_03_2_npc.c | 34 +- src/world/area_sbk/sbk_04/sbk_04_2_npc.c | 18 +- src/world/area_sbk/sbk_05/sbk_05_3_npc.c | 82 +- src/world/area_sbk/sbk_06/sbk_06_2_npc.c | 10 +- src/world/area_sbk/sbk_11/sbk_11_2_npc.c | 20 +- src/world/area_sbk/sbk_12/sbk_12_2_npc.c | 26 +- src/world/area_sbk/sbk_13/sbk_13_2_npc.c | 28 +- src/world/area_sbk/sbk_15/sbk_15_2_npc.c | 18 +- src/world/area_sbk/sbk_20/sbk_20_2_npc.c | 18 +- src/world/area_sbk/sbk_22/sbk_22_2_npc.c | 20 +- src/world/area_sbk/sbk_24/sbk_24_2_npc.c | 2 +- src/world/area_sbk/sbk_25/sbk_25_2_npc.c | 18 +- src/world/area_sbk/sbk_26/sbk_26_2_npc.c | 20 +- src/world/area_sbk/sbk_30/sbk_30_3_npc.c | 24 +- src/world/area_sbk/sbk_31/sbk_31_2_npc.c | 10 +- src/world/area_sbk/sbk_32/sbk_32_2_npc.c | 28 +- src/world/area_sbk/sbk_34/sbk_34_2_npc.c | 22 +- src/world/area_sbk/sbk_35/sbk_35_2_npc.c | 10 +- src/world/area_sbk/sbk_40/sbk_40_2_npc.c | 18 +- src/world/area_sbk/sbk_42/sbk_42_2_npc.c | 18 +- src/world/area_sbk/sbk_44/sbk_44_2_npc.c | 28 +- src/world/area_sbk/sbk_46/sbk_46_2_npc.c | 28 +- src/world/area_sbk/sbk_51/sbk_51_2_npc.c | 20 +- src/world/area_sbk/sbk_53/sbk_53_2_npc.c | 26 +- src/world/area_sbk/sbk_55/sbk_55_2_npc.c | 18 +- src/world/area_sbk/sbk_60/sbk_60_2_npc.c | 10 +- src/world/area_sbk/sbk_62/sbk_62_2_npc.c | 26 +- src/world/area_sbk/sbk_63/sbk_63_2_npc.c | 18 +- src/world/area_sbk/sbk_66/sbk_66_2_npc.c | 50 +- src/world/area_tik/tik.h | 32 +- src/world/area_tik/tik_01/tik_01_2_main.c | 1 - src/world/area_tik/tik_01/tik_01_5_npc.c | 10 +- src/world/area_tik/tik_02/tik_02_2_main.c | 1 - src/world/area_tik/tik_02/tik_02_5_npc.c | 10 +- src/world/area_tik/tik_03/tik_03_2_main.c | 3 +- src/world/area_tik/tik_03/tik_03_6_demo.c | 2 +- src/world/area_tik/tik_04/tik_04_2_main.c | 1 - src/world/area_tik/tik_04/tik_04_5_npc.c | 22 +- src/world/area_tik/tik_05/tik_05_2_main.c | 1 - src/world/area_tik/tik_05/tik_05_5_npc.c | 18 +- src/world/area_tik/tik_06/tik_06_2_main.c | 1 - src/world/area_tik/tik_07/tik_07_6_npc.c | 18 +- src/world/area_tik/tik_08/tik_08_2_main.c | 1 - src/world/area_tik/tik_08/tik_08_5_npc.c | 10 +- src/world/area_tik/tik_09/tik_09_2_main.c | 1 - src/world/area_tik/tik_09/tik_09_5_npc.c | 32 +- src/world/area_tik/tik_10/tik_10_2_main.c | 1 - src/world/area_tik/tik_12/tik_12_2_main.c | 1 - src/world/area_tik/tik_12/tik_12_5_npc.c | 10 +- src/world/area_tik/tik_14/tik_14_2_main.c | 1 - src/world/area_tik/tik_15/tik_15_2_main.c | 1 - src/world/area_tik/tik_15/tik_15_5_npc.c | 12 +- src/world/area_tik/tik_17/tik_17_3_main.c | 1 - src/world/area_tik/tik_18/tik_18_2_main.c | 1 - src/world/area_tik/tik_18/tik_18_4_npc.c | 22 +- src/world/area_tik/tik_19/tik_19_2_main.c | 1 - src/world/area_tik/tik_20/tik_20_2_main.c | 1 - src/world/area_tik/tik_20/tik_20_3_npc.c | 18 +- src/world/area_tik/tik_21/tik_21_2_main.c | 1 - src/world/area_tik/tik_22/tik_22_2_main.c | 1 - src/world/area_tik/tik_23/tik_23_2_main.c | 1 - src/world/area_tik/tik_23/tik_23_4_npc.c | 26 +- src/world/area_tik/tik_24/tik_24_2_main.c | 1 - src/world/area_tik/tik_24/tik_24_5_npc.c | 18 +- src/world/area_tik/tik_25/tik_25_2_main.c | 1 - src/world/area_trd/trd.h | 32 +- src/world/area_trd/trd_00/trd_00_1_main.c | 1 - src/world/area_trd/trd_00/trd_00_3_npc.c | 22 +- src/world/area_trd/trd_01/trd_01_1_main.c | 1 - src/world/area_trd/trd_01/trd_01_3_npc.c | 46 +- src/world/area_trd/trd_02/trd_02_3_npc.c | 30 +- src/world/area_trd/trd_03/trd_03_3_npc.c | 44 +- src/world/area_trd/trd_04/trd_04_1_main.c | 1 - src/world/area_trd/trd_04/trd_04_3_npc.c | 36 +- src/world/area_trd/trd_05/trd_05_4_npc.c | 22 +- src/world/area_trd/trd_06/trd_06_1_main.c | 1 - .../area_trd/trd_06/trd_06_3_npc_prisoners.c | 56 +- .../area_trd/trd_06/trd_06_4_npc_koopa_bros.c | 26 +- src/world/area_trd/trd_07/trd_07_1_main.c | 1 - src/world/area_trd/trd_07/trd_07_2_npc.c | 34 +- src/world/area_trd/trd_08/trd_08_1_main.c | 1 - src/world/area_trd/trd_08/trd_08_3_npc.c | 36 +- src/world/area_trd/trd_09/trd_09_1_main.c | 2 +- src/world/area_trd/trd_09/trd_09_3_npc.c | 212 +-- src/world/area_trd/trd_10/trd_10.h | 4 + src/world/area_trd/trd_10/trd_10_1_main.c | 1 + src/world/area_trd/trd_10/trd_10_2_npc.c | 34 +- src/world/area_tst/tst.h | 32 +- src/world/area_tst/tst_04/tst_04_4_npc.c | 4 +- src/world/area_tst/tst_13/tst_13_1_main.c | 22 +- src/world/common/atomic/BetaFloorPanels.inc.c | 2 +- .../common/atomic/MakeConsumableChoice.inc.c | 2 +- src/world/common/atomic/MakeKeyChoice.inc.c | 2 +- .../atomic/MonitorMusicProximityTrigger.inc.c | 2 +- .../{TexturePan.data.inc.c => TexturePan.h} | 22 +- src/world/common/atomic/TexturePan.inc.c | 24 +- src/world/common/atomic/ToadHouse.data.inc.c | 8 +- src/world/common/atomic/WhaleGeyser.inc.c | 2 +- src/world/common/complete/KeyItemChoice.inc.c | 4 +- src/world/common/complete/Quizmo.inc.c | 7 - .../common/enemy/{complete => }/AlbinoDino.h | 0 .../enemy/{complete => }/AlbinoDino.inc.c | 0 .../common/enemy/{complete => }/AmazyDayzee.h | 0 .../enemy/{complete => }/AmazyDayzee.inc.c | 0 .../common/enemy/{complete => }/Bandit.h | 0 .../common/enemy/{complete => }/Bandit.inc.c | 0 .../common/enemy/{complete => }/Blooper.h | 7 - .../common/enemy/{complete => }/Blooper.inc.c | 0 .../common/enemy/{complete => }/Bobomb.h | 0 .../enemy/{complete => }/Bobomb_Guard.inc.c | 0 .../enemy/{complete => }/Bobomb_Wander.inc.c | 0 .../common/enemy/{complete => }/Bombette.h | 0 .../enemy/{complete => }/Bombette.inc.c | 0 .../enemy/{complete => }/BombshellBill.h | 7 - .../common/enemy/{complete => }/BulletBill.h | 7 - src/world/common/enemy/{complete => }/Bzzap.h | 7 - .../common/enemy/{complete => }/Bzzap.inc.c | 0 src/world/common/enemy/{complete => }/Cleft.h | 0 .../common/enemy/{complete => }/Cleft.inc.c | 0 .../common/enemy/{complete => }/Clubba.h | 2 +- .../common/enemy/{complete => }/Clubba.inc.c | 0 .../enemy/{complete => }/Clubba_Multi.inc.c | 8 +- .../common/enemy/{complete => }/CrazyDayzee.h | 0 .../enemy/{complete => }/CrazyDayzee.inc.c | 0 .../common/enemy/{complete => }/CrystalKing.h | 0 .../enemy/{complete => }/CrystalKing.inc.c | 0 .../common/enemy/{complete => }/DarkTroopa.h | 0 .../{complete => }/DarkTroopa_Wander.inc.c | 0 .../common/enemy/{complete => }/DryBones.h | 6 +- .../enemy/{complete => }/DryBones.inc.c | 0 .../common/enemy/{complete => }/Duplighost.h | 0 .../{complete => }/Duplighost_Patrol.inc.c | 0 .../{complete => }/Duplighost_Wander.inc.c | 0 src/world/common/enemy/{complete => }/Ember.h | 0 .../common/enemy/{complete => }/Ember.inc.c | 0 .../enemy/{complete => }/FlyingMagikoopa.h | 8 +- .../{complete => }/FlyingMagikoopa.inc.c | 4 +- .../common/enemy/{complete => }/ForestFuzzy.h | 0 .../{complete => }/ForestFuzzy_Wander.inc.c | 0 .../common/enemy/{complete => }/FrostClubba.h | 2 +- .../{complete => }/FrostClubba_Multi.inc.c | 8 +- .../enemy/{complete => }/FrostPiranha.h | 2 +- .../enemy/{complete => }/FrostPiranha.inc.c | 8 +- src/world/common/enemy/{complete => }/Fuzzy.h | 0 .../common/enemy/{complete => }/Fuzzy.inc.c | 0 .../enemy/{complete => }/Fuzzy_Wander.inc.c | 0 .../common/enemy/{complete => }/Gloomba.h | 0 .../enemy/{complete => }/Gloomba_Wander.inc.c | 0 .../common/enemy/{complete => }/Goomba.h | 0 .../common/enemy/{complete => }/Goomba.inc.c | 0 .../common/enemy/{complete => }/GoombaBros.h | 7 - .../{complete => }/GoombaBros_Guard.inc.c | 0 .../enemy/{complete => }/Goomba_Wander.inc.c | 0 .../common/enemy/{complete => }/GrooveGuy.h | 0 .../enemy/{complete => }/GrooveGuy.inc.c | 0 .../common/enemy/{complete => }/Gulpit.h | 2 +- .../common/enemy/{complete => }/Gulpit.inc.c | 8 +- .../common/enemy/{complete => }/HammerBros.h | 6 +- src/world/common/enemy/HammerBros.inc.c | 7 + ...mmerBros.inc.c => HammerBros_Wander.inc.c} | 6 +- .../common/enemy/{complete => }/HeartPlant.h | 0 .../enemy/{complete => }/HeartPlant.inc.c | 2 +- .../common/enemy/{complete => }/HuffNPuff.h | 7 - .../common/enemy/{complete => }/HurtPlant.h | 0 .../enemy/{complete => }/HurtPlant.inc.c | 4 +- .../common/enemy/{complete => }/HyperCleft.h | 0 .../enemy/{complete => }/HyperCleft.inc.c | 0 .../common/enemy/{complete => }/HyperGoomba.h | 0 .../{complete => }/HyperGoomba_Patrol.inc.c | 0 .../{complete => }/HyperGoomba_Wander.inc.c | 0 .../enemy/{complete => }/HyperParagoomba.h | 0 .../{complete => }/HyperParagoomba.inc.c | 0 .../common/enemy/{complete => }/JungleFuzzy.h | 0 .../enemy/{complete => }/JungleFuzzy.inc.c | 0 .../{complete => }/JungleFuzzy_Wander.inc.c | 0 src/world/common/enemy/{complete => }/Kammy.h | 0 .../common/enemy/{complete => }/Kammy.inc.c | 4 +- src/world/common/enemy/Kammy_Flying.inc.c | 9 + src/world/common/enemy/Kammy_Guard.inc.c | 26 + .../common/enemy/{complete => }/KentCKoopa.h | 7 - .../enemy/{complete => }/KentCKoopa.inc.c | 0 .../common/enemy/{complete => }/KoopaTroopa.h | 0 .../{complete => }/KoopaTroopa_Patrol.inc.c | 0 .../KoopaTroopa_Stationary.inc.c | 0 .../{complete => }/KoopaTroopa_Wander.inc.c | 0 .../common/enemy/{complete => }/Koopatrol.h | 7 - .../{complete => }/Koopatrol_Patrol.inc.c | 0 .../{complete => }/Koopatrol_Stationary.inc.c | 0 .../{complete => }/Koopatrol_Wander.inc.c | 0 .../common/enemy/{complete => }/Lakitu.h | 0 .../{complete => }/Lakitu_SpinySpawner.inc.c | 0 .../{complete => }/Lakitu_Stationary.inc.c | 0 .../common/enemy/{complete => }/LavaBubble.h | 0 .../enemy/{complete => }/LavaBubble.inc.c | 0 .../common/enemy/{complete => }/LavaPiranha.h | 7 - .../enemy/{complete => }/LavaPiranha.inc.c | 0 src/world/common/enemy/{complete => }/MBush.h | 0 .../common/enemy/{complete => }/MBush.inc.c | 0 .../common/enemy/{complete => }/Magikoopa.h | 8 +- .../enemy/{complete => }/Magikoopa.inc.c | 4 +- .../common/enemy/{complete => }/MontyMole.h | 0 .../enemy/{complete => }/MontyMole.inc.c | 0 .../MontyMole_GroundAmbush.inc.c | 0 .../MontyMole_StoneThrower.inc.c | 6 +- .../{complete => }/MontyMole_WallAmbush.inc.c | 0 .../common/enemy/{complete => }/Paragloomba.h | 0 .../{complete => }/Paragloomba_Wander.inc.c | 0 .../common/enemy/{complete => }/Paragoomba.h | 0 .../{complete => }/Paragoomba_Wander.inc.c | 0 .../common/enemy/{complete => }/Paratroopa.h | 0 .../enemy/{complete => }/Paratroopa.inc.c | 0 .../enemy/{complete => }/PiranhaPlant.h | 6 +- .../enemy/{complete => }/PiranhaPlant.inc.c | 0 src/world/common/enemy/{complete => }/Pokey.h | 0 .../common/enemy/{complete => }/Pokey.inc.c | 0 .../common/enemy/{complete => }/PokeyMummy.h | 0 .../enemy/{complete => }/PokeyMummy.inc.c | 0 .../enemy/{complete => }/PutridPiranha.h | 6 +- .../enemy/{complete => }/PutridPiranha.inc.c | 0 .../{complete => }/PutridPiranhaSentinel.h | 2 +- .../PutridPiranhaSentinel.inc.c | 0 .../common/enemy/{complete => }/PyroGuy.h | 0 .../common/enemy/{complete => }/PyroGuy.inc.c | 0 .../common/enemy/{complete => }/Sentinel.h | 7 - .../enemy/{complete => }/Sentinel.inc.c | 0 .../common/enemy/{complete => }/ShyGuy.h | 7 - .../{complete => }/ShyGuy_AvoidPlayer.inc.c | 0 .../enemy/{complete => }/ShyGuy_Guard.inc.c | 0 .../enemy/{complete => }/ShyGuy_Patrol.inc.c | 0 .../{complete => }/ShyGuy_Stationary.inc.c | 0 .../enemy/{complete => }/ShyGuy_Wander.inc.c | 0 .../common/enemy/{complete => }/SkyGuy.h | 0 .../common/enemy/{complete => }/SkyGuy.inc.c | 0 .../common/enemy/{complete => }/SpearGuy.h | 2 +- .../{complete => }/SpearGuy_Patrol.inc.c | 0 .../{complete => }/SpearGuy_Wander.inc.c | 6 +- .../common/enemy/{complete => }/SpikeTop.h | 0 .../enemy/{complete => }/SpikeTop.inc.c | 0 .../enemy/{complete => }/SpikedGloomba.h | 0 .../{complete => }/SpikedGloomba_Wander.inc.c | 0 .../enemy/{complete => }/SpikedGoomba.h | 0 .../{complete => }/SpikedGoomba_Patrol.inc.c | 0 .../{complete => }/SpikedGoomba_Wander.inc.c | 0 src/world/common/enemy/{complete => }/Spiny.h | 0 .../common/enemy/{complete => }/Spiny.inc.c | 0 .../common/enemy/{complete => }/SpyGuy.h | 2 +- .../common/enemy/{complete => }/SpyGuy.inc.c | 0 .../common/enemy/{complete => }/StoneChomp.h | 0 .../enemy/{complete => }/StoneChomp.inc.c | 0 .../common/enemy/{complete => }/Swooper.h | 0 .../common/enemy/{complete => }/Swooper.inc.c | 0 .../common/enemy/{complete => }/TubbaBlubba.h | 7 - .../enemy/{complete => }/TubbaBlubba.inc.c | 0 .../{complete => }/TubbaBlubba_Patrol.inc.c | 0 .../common/enemy/{complete => }/TuffPuff.h | 7 - .../enemy/{complete => }/TuffPuff.inc.c | 0 .../common/enemy/{complete => }/Whacka.h | 7 - .../common/enemy/{complete => }/Whacka.inc.c | 0 .../common/enemy/{complete => }/YMagikoopa.h | 2 +- src/world/common/enemy/ai/AvoidPlayerAI.inc.c | 2 +- .../common/enemy/ai/ClubbaNappingAI.inc.c | 2 +- .../common/enemy/ai/ClubbaPatrolAI.inc.c | 2 +- src/world/common/enemy/ai/FireBarAI.inc.c | 2 +- src/world/common/enemy/ai/FlyingAI.inc.c | 2 +- .../common/enemy/ai/FlyingMagikoopaAI.inc.c | 6 +- .../common/enemy/ai/FlyingNoAttackAI.inc.c | 2 +- src/world/common/enemy/ai/GrooveGuyAI.inc.c | 2 +- src/world/common/enemy/ai/GuardAI.inc.c | 7 +- src/world/common/enemy/ai/HoppingAI.inc.c | 2 +- src/world/common/enemy/ai/KoopaPatrolAI.inc.c | 2 +- src/world/common/enemy/ai/MagikoopaAI.inc.c | 10 +- .../common/enemy/ai/MagikoopaSpellAI.inc.c | 14 +- src/world/common/enemy/ai/MeleeHitbox.inc.c | 8 +- src/world/common/enemy/ai/MontyMoleAI.inc.c | 2 +- src/world/common/enemy/ai/ParatroopaAI.inc.c | 2 +- .../common/enemy/ai/PatrolNoAttackAI.inc.c | 2 +- .../common/enemy/ai/ProjectileHitbox.inc.c | 16 +- .../common/enemy/ai/RangedAttackAI.inc.c | 2 +- src/world/common/enemy/ai/SentinelAI.inc.c | 2 +- .../common/enemy/ai/ShyGuyPatrolAI.inc.c | 2 +- .../common/enemy/ai/ShyGuyWanderAI.inc.c | 2 +- src/world/common/enemy/ai/SpinyAI.inc.c | 14 +- src/world/common/enemy/ai/StoneChompAI.inc.c | 2 +- src/world/common/enemy/ai/TackleAI.inc.c | 2 +- src/world/common/npc/BigLanternGhost.h | 7 - src/world/common/npc/Bobomb.h | 7 - src/world/common/npc/Boo.h | 7 - src/world/common/npc/Boo_Patrol.inc.c | 2 +- src/world/common/npc/Bootler.h | 7 - src/world/common/npc/Bow.h | 7 - src/world/common/npc/Bowser.h | 22 + src/world/common/npc/Bowser.inc.c | 7 + src/world/common/npc/Bubulb.h | 7 - src/world/common/npc/Dryite.h | 7 - src/world/common/npc/GateFlower.h | 7 - src/world/common/npc/GoombaFamily.h | 42 - src/world/common/npc/Goombaria.h | 7 - src/world/common/npc/GourmetGuy.h | 22 + src/world/common/npc/GourmetGuy.inc.c | 7 + src/world/common/npc/JrTroopa.h | 7 - src/world/common/npc/Kolorado.h | 7 - src/world/common/npc/KoloradoWife.h | 7 - src/world/common/npc/Koopa.h | 7 - src/world/common/npc/KoopaBros.h | 7 - src/world/common/npc/KoopaKoot.h | 7 - src/world/common/npc/Lily.h | 7 - src/world/common/npc/Luigi.h | 7 - src/world/common/npc/Mouser.h | 7 - src/world/common/npc/Oaklie.h | 7 - src/world/common/npc/Peach.h | 21 + src/world/common/npc/Peach.inc.c | 7 + src/world/common/npc/Penguin.h | 7 - src/world/common/npc/Posie.h | 7 - src/world/common/npc/Rosie.h | 7 - src/world/common/npc/StarRod.h | 22 + src/world/common/npc/StarRod.inc.c | 13 + src/world/common/npc/StarSpirit.h | 63 - src/world/common/npc/Sun.h | 7 - src/world/common/npc/Toad.h | 259 --- src/world/common/npc/ToadGuard.h | 82 + src/world/common/npc/ToadKid.h | 82 + src/world/common/npc/ToadMinister.h | 22 + src/world/common/npc/Toad_Collection.h | 5 + src/world/common/npc/Toad_Guard.inc.c | 2 +- src/world/common/npc/Toad_Patrol.inc.c | 2 +- src/world/common/npc/Toad_Stationary.inc.c | 2 +- src/world/common/npc/Toad_Wander.inc.c | 2 +- src/world/common/npc/Toadette.h | 82 + src/world/common/npc/Tolielup.h | 7 - src/world/common/npc/TrainToad.h | 7 - src/world/common/npc/TubbasHeart.h | 7 - src/world/common/npc/Twink.h | 7 - src/world/common/npc/Yakkey.h | 7 - src/world/common/npc/Yoshi.h | 7 - .../common/todo/AddPlayerHandsOffset.inc.c | 2 +- .../todo/CheckDripCollisionWithNPC.inc.c | 2 +- .../common/todo/CheckPartnerFlags1000.inc.c | 2 +- src/world/common/todo/DeadUnkFunc1.inc.c | 7 - .../todo/GetEncounterEnemyIsOwner.inc.c | 2 +- src/world/common/todo/GetEntityPosition.inc.c | 2 +- src/world/common/todo/GetItemEmptyCount.inc.c | 2 +- src/world/common/todo/GetItemName.inc.c | 9 +- .../common/todo/GetLeftRightPoints.inc.c | 2 +- .../common/todo/GetNpcCollisionHeight.inc.c | 2 +- src/world/common/todo/GetPeachDisguise.inc.c | 2 +- src/world/common/todo/GetPlayerCoins.inc.c | 2 +- .../common/todo/HeartPlant_SpawnHeart.inc.c | 2 +- .../common/todo/IsBerserkerEquipped.inc.c | 2 +- .../common/todo/IsHammerMaxCharged.inc.c | 2 +- src/world/common/todo/IsItemBadge.inc.c | 2 +- src/world/common/todo/IsJumpMaxCharged.inc.c | 2 +- .../todo/ItemChoice_WaitForSelection.inc.c | 2 +- src/world/common/todo/PlayBigSmokePuff.inc.c | 2 +- src/world/common/todo/PlayRisingBubble.inc.c | 2 +- src/world/common/todo/RemovePadlock.inc.c | 2 +- src/world/common/todo/Set80151310_0.inc.c | 2 +- .../common/todo/SetCamera0Flag1000.inc.c | 2 +- .../common/todo/SetCamera0MoveFlag1.inc.c | 2 +- .../common/todo/SetEntityPositionF.inc.c | 2 +- .../common/todo/ShouldMovesAutoSucceed.inc.c | 2 +- .../common/todo/SomeItemEntityFunc.inc.c | 2 +- .../common/todo/SpinyTromp_CheckDist.inc.c | 2 +- .../common/todo/StarSpiritEffectFunc.inc.c | 18 +- src/world/common/todo/StashVars.inc.c | 2 +- src/world/common/todo/SwitchToPartner.inc.c | 2 +- src/world/common/todo/SyncStatusMenu.inc.c | 2 +- src/world/common/todo/UnkAngleFunc005.inc.c | 2 +- src/world/common/todo/UnkFloatFunc001.inc.c | 2 +- src/world/common/todo/UnkFloatFuncAbs.inc.c | 25 - src/world/common/todo/UnkFunc1.inc.c | 2 +- src/world/common/todo/UnkFunc12.inc.c | 2 +- src/world/common/todo/UnkFunc42.inc.c | 2 +- src/world/common/todo/UnkFunc46.inc.c | 2 +- src/world/common/todo/UnkFunc48.inc.c | 2 +- src/world/common/todo/UnkFunc49.inc.c | 2 +- src/world/common/todo/UnkFunc50.inc.c | 2 +- src/world/common/todo/UnkFunc51.inc.c | 2 +- src/world/common/todo/UnkFunc52.inc.c | 2 +- src/world/common/todo/UnkFunc56.inc.c | 2 +- src/world/common/todo/UnkFunc62.inc.c | 2 +- src/world/common/todo/UnkMoveFunc1.inc.c | 2 +- src/world/common/todo/UnkMoveFunc2.inc.c | 2 +- src/world/common/todo/UnkMoveFunc3.inc.c | 2 +- .../common/todo/UnkPartnerPosFuncs.inc.c | 4 +- .../common/todo/UnsetCamera0Flag1000.inc.c | 2 +- .../common/todo/UnsetCamera0MoveFlag1.inc.c | 2 +- .../common/todo/WaitForPlayerToLand.inc.c | 2 +- .../util/CheckPositionRelativeToPlane.inc.c | 2 +- .../common/util/GetDefeatedEnemyCount.inc.c | 2 +- .../common/util/GetKammyBroomEmitterPos.inc.c | 2 +- .../common/util/SetLightningBoltPurple.inc.c | 15 + src/world/dead/area_flo/flo_00/flo_00_3_npc.c | 70 +- .../dead/area_flo/flo_00/flo_00_4_epilogue.c | 20 +- src/world/dead/area_flo/flo_03/flo_03_3_npc.c | 72 +- .../dead/area_flo/flo_07/flo_07_2_main.c | 1 - src/world/dead/area_flo/flo_07/flo_07_3_npc.c | 10 +- src/world/dead/area_flo/flo_08/flo_08_4_npc.c | 78 +- src/world/dead/area_flo/flo_09/flo_09_5_npc.c | 38 +- .../dead/area_flo/flo_10/flo_10_4_fountain.c | 1 - src/world/dead/area_flo/flo_10/flo_10_5_npc.c | 8 +- src/world/dead/area_flo/flo_11/flo_11_3_npc.c | 12 +- src/world/dead/area_flo/flo_12/flo_12_3_npc.c | 12 +- src/world/dead/area_flo/flo_13/flo_13_4_npc.c | 118 +- .../dead/area_flo/flo_14/flo_14_2_main.c | 1 - src/world/dead/area_flo/flo_14/flo_14_4_npc.c | 18 +- src/world/dead/area_flo/flo_15/flo_15_3_npc.c | 14 +- src/world/dead/area_flo/flo_16/flo_16_5_npc.c | 18 +- src/world/dead/area_flo/flo_17/flo_17_4_npc.c | 50 +- .../dead/area_flo/flo_18/flo_18_2_main.c | 1 - src/world/dead/area_flo/flo_18/flo_18_4_npc.c | 30 +- .../dead/area_flo/flo_19/flo_19_3_main.c | 19 +- .../dead/area_flo/flo_19/flo_19_4_clouds.c | 11 + .../dead/area_flo/flo_19/flo_19_5_beanstalk.c | 3 + src/world/dead/area_kzn/kzn_11/kzn_11_3_npc.c | 72 +- src/world/dead/area_kzn/kzn_17/kzn_17_3_npc.c | 28 +- src/world/dead/area_kzn/kzn_18/kzn_18_2_npc.c | 18 +- src/world/dead/area_kzn/kzn_19/kzn_19.h | 1 + .../dead/area_kzn/kzn_19/kzn_19_2_main.c | 1 + .../area_kzn/kzn_19/kzn_19_3_npc_settings.c | 2 +- src/world/dead/area_kzn/kzn_19/kzn_19_4_npc.c | 38 +- .../dead/area_kzn/kzn_20/kzn_20_2_main.c | 1 - src/world/dead/area_kzn/kzn_20/kzn_20_3_npc.c | 16 +- src/world/dead/area_kzn/kzn_22/kzn_22_4_npc.c | 16 +- src/world/dead/area_kzn/kzn_23/kzn_23_3_npc.c | 16 +- src/world/entrances.h | 2 + src/world/partners.c | 6 +- src/world/script_api/enter_exit.c | 456 +++--- src/world/script_api/push_blocks.c | 78 +- src/world/script_api/shops.c | 8 +- src/world/world.c | 95 +- tools/disasm_script.py | 4 +- tools/star_rod_idx_to_c.py | 2 +- .../data/world/area_kkj/kkj_00/ABC250.data.s | 6 - .../data/world/area_kkj/kkj_00/ABC3D0.data.s | 132 -- .../data/world/area_kkj/kkj_00/ABEC70.data.s | 6 - .../data/world/area_kkj/kkj_00/ABEF20.data.s | 141 -- .../data/world/area_kkj/kkj_00/AC40D0.data.s | 9 - .../data/world/area_kkj/kkj_01/AC6000.data.s | 6 - .../data/world/area_kkj/kkj_01/AC6140.data.s | 21 - .../data/world/area_kkj/kkj_01/AC67E0.data.s | 120 -- .../data/world/area_kkj/kkj_02/AC8D20.data.s | 6 - .../data/world/area_kkj/kkj_02/AC8E40.data.s | 15 - .../data/world/area_kkj/kkj_02/AC9160.data.s | 30 - .../data/world/area_kkj/kkj_03/AC9A40.data.s | 6 - .../data/world/area_kkj/kkj_03/AC9C00.data.s | 15 - .../data/world/area_kkj/kkj_03/ACA010.data.s | 9 - .../data/world/area_kkj/kkj_03/ACA250.data.s | 12 - .../data/world/area_kkj/kkj_10/ACBBF0.data.s | 33 - .../data/world/area_kkj/kkj_10/ACC510.data.s | 9 - .../data/world/area_kkj/kkj_10/ACC700.data.s | 57 - .../data/world/area_kkj/kkj_11/ACF210.data.s | 36 - .../data/world/area_kkj/kkj_11/ACFD40.data.s | 9 - .../data/world/area_kkj/kkj_11/ACFF30.data.s | 6 - .../data/world/area_kkj/kkj_11/AD02E0.data.s | 48 - .../data/world/area_kkj/kkj_11/AD27F0.data.s | 54 - .../data/world/area_kkj/kkj_12/AD4940.data.s | 60 - .../data/world/area_kkj/kkj_13/AD6630.data.s | 6 - .../data/world/area_kkj/kkj_13/AD6780.data.s | 6 - .../data/world/area_kkj/kkj_13/AD6820.data.s | 15 - .../data/world/area_kkj/kkj_13/AD6E60.data.s | 60 - .../data/world/area_kkj/kkj_13/AD8650.data.s | 42 - .../data/world/area_kkj/kkj_13/AD9460.data.s | 24 - .../data/world/area_kkj/kkj_14/ADB360.data.s | 6 - .../data/world/area_kkj/kkj_14/ADB5C0.data.s | 24 - .../data/world/area_kkj/kkj_14/ADC0F0.data.s | 42 - .../data/world/area_kkj/kkj_14/ADD870.data.s | 21 - .../data/world/area_kkj/kkj_14/ADE870.data.s | 18 - .../data/world/area_kkj/kkj_14/ADED00.data.s | 18 - .../data/world/area_kkj/kkj_14/ADF190.data.s | 24 - .../data/world/area_kkj/kkj_14/ADFA50.data.s | 15 - .../data/world/area_kkj/kkj_14/AE1B30.data.s | 6 - .../data/world/area_kkj/kkj_14/AE1E80.data.s | 27 - .../data/world/area_kkj/kkj_14/AE3160.data.s | 6 - .../data/world/area_kkj/kkj_14/AE32D0.data.s | 6 - .../data/world/area_kkj/kkj_14/AE3610.data.s | 6 - .../data/world/area_kkj/kkj_14/AE3850.data.s | 33 - .../data/world/area_kkj/kkj_15/AE5BA0.data.s | 6 - .../data/world/area_kkj/kkj_15/AE5CE0.data.s | 6 - .../data/world/area_kkj/kkj_15/AE5D80.data.s | 15 - .../data/world/area_kkj/kkj_15/AE65A0.data.s | 15 - .../data/world/area_kkj/kkj_15/AE6BF0.data.s | 21 - .../data/world/area_kkj/kkj_15/AE8A50.data.s | 24 - .../data/world/area_kkj/kkj_15/AEA0D0.data.s | 6 - .../data/world/area_kkj/kkj_15/AEA230.data.s | 21 - .../data/world/area_kkj/kkj_15/AEB820.data.s | 39 - .../data/world/area_kkj/kkj_15/AECB30.data.s | 24 - .../data/world/area_kkj/kkj_16/AEE490.data.s | 15 - .../data/world/area_kkj/kkj_16/AEE7F0.data.s | 87 - .../data/world/area_kkj/kkj_16/AF09D0.data.s | 21 - .../data/world/area_kkj/kkj_16/AF1B10.data.s | 6 - .../data/world/area_kkj/kkj_17/AF2200.data.s | 15 - .../data/world/area_kkj/kkj_17/AF2440.data.s | 6 - .../data/world/area_kkj/kkj_17/AF2520.data.s | 27 - .../data/world/area_kkj/kkj_18/AF34C0.data.s | 6 - .../data/world/area_kkj/kkj_18/AF3560.data.s | 6 - .../data/world/area_kkj/kkj_18/AF3600.data.s | 15 - .../data/world/area_kkj/kkj_18/AF3CB0.data.s | 39 - .../data/world/area_kkj/kkj_18/AF4BB0.data.s | 54 - .../data/world/area_kkj/kkj_19/AF8660.data.s | 42 - .../data/world/area_kkj/kkj_19/AF8B40.data.s | 21 - .../data/world/area_kkj/kkj_19/AF9050.data.s | 18 - .../data/world/area_kkj/kkj_19/AF9460.data.s | 78 - .../data/world/area_kkj/kkj_20/AFE130.data.s | 6 - .../data/world/area_kkj/kkj_20/AFE1E0.data.s | 9 - .../data/world/area_kkj/kkj_20/AFE3C0.data.s | 12 - .../data/world/area_kkj/kkj_20/AFE610.data.s | 117 -- .../data/world/area_kkj/kkj_21/B022A0.data.s | 15 - .../data/world/area_kkj/kkj_22/B024F0.data.s | 6 - .../data/world/area_kkj/kkj_22/B025A0.data.s | 12 - .../data/world/area_kkj/kkj_23/B03250.data.s | 6 - .../data/world/area_kkj/kkj_23/B03300.data.s | 15 - .../data/world/area_kkj/kkj_23/B036B0.data.s | 45 - .../data/world/area_kkj/kkj_23/B04420.data.s | 36 - .../data/world/area_kkj/kkj_23/B04FB0.data.s | 18 - .../data/world/area_kkj/kkj_24/B06590.data.s | 6 - .../data/world/area_kkj/kkj_24/B06640.data.s | 15 - .../data/world/area_kkj/kkj_24/B069B0.data.s | 6 - .../data/world/area_kkj/kkj_25/B07940.data.s | 21 - .../data/world/area_kkj/kkj_25/B081C0.data.s | 192 --- .../data/world/area_kkj/kkj_25/B0B310.data.s | 93 -- .../data/world/area_kkj/kkj_25/B0E3A0.data.s | 9 - .../data/world/area_kkj/kkj_25/B0F280.data.s | 24 - .../data/world/area_kkj/kkj_26/B13150.data.s | 18 - .../data/world/area_kkj/kkj_26/B13500.data.s | 6 - .../data/world/area_kkj/kkj_26/B13A40.data.s | 9 - .../data/world/area_kkj/kkj_27/B14210.data.s | 6 - .../data/world/area_kkj/kkj_27/B14340.data.s | 6 - .../data/world/area_kkj/kkj_27/B143E0.data.s | 30 - .../data/world/area_kkj/kkj_28/B14EA0.data.s | 15 - .../data/world/area_kkj/kkj_29/B15120.data.s | 15 - .../data/world/area_kkj/kkj_29/B15410.data.s | 33 - .../data/world/area_kkj/kkj_29/B15DA0.data.s | 99 -- ver/us/splat.yaml | 362 ++--- ver/us/symbol_addrs.txt | 56 +- 1243 files changed, 30558 insertions(+), 14649 deletions(-) delete mode 100644 src/EFEB00.c delete mode 100644 src/common/UnkLightningFXFunc.inc.c rename src/world/{common/todo/UnkGooberFunc.inc.c => area_kkj/common/ApproachPlayer100Units.inc.c} (58%) rename src/world/{common/todo/UnkGooberFunc50.inc.c => area_kkj/common/ApproachPlayer50Units.inc.c} (85%) create mode 100644 src/world/area_kkj/common/RestoreFromPeachState.inc.c rename src/world/{common/atomic/UnkPhysicsFuncs.inc.c => area_kkj/common/Searchlights.inc.c} (53%) create mode 100644 src/world/area_kkj/common/SetAvailableDisguise.inc.c create mode 100644 src/world/area_kkj/common/SetPeachFlag8.inc.c delete mode 100644 src/world/area_kkj/kkj_00/ABB290.c delete mode 100644 src/world/area_kkj/kkj_00/ABB340.c create mode 100644 src/world/area_kkj/kkj_00/kkj_00_0_header.c create mode 100644 src/world/area_kkj/kkj_00/kkj_00_1_music.c create mode 100644 src/world/area_kkj/kkj_00/kkj_00_2_main.c create mode 100644 src/world/area_kkj/kkj_00/kkj_00_3_npc_intro.c create mode 100644 src/world/area_kkj/kkj_00/kkj_00_4_scene_intro.c create mode 100644 src/world/area_kkj/kkj_00/kkj_00_5_npc_ending.c create mode 100644 src/world/area_kkj/kkj_00/kkj_00_6_scene_ending.c delete mode 100644 src/world/area_kkj/kkj_01/AC5170.c create mode 100644 src/world/area_kkj/kkj_01/kkj_01_0_header.c create mode 100644 src/world/area_kkj/kkj_01/kkj_01_1_music.c create mode 100644 src/world/area_kkj/kkj_01/kkj_01_2_main.c create mode 100644 src/world/area_kkj/kkj_01/kkj_01_3_npc.c delete mode 100644 src/world/area_kkj/kkj_02/AC8D20.c create mode 100644 src/world/area_kkj/kkj_02/kkj_02_0_header.c create mode 100644 src/world/area_kkj/kkj_02/kkj_02_1_music.c create mode 100644 src/world/area_kkj/kkj_02/kkj_02_2_main.c create mode 100644 src/world/area_kkj/kkj_02/kkj_02_3_npc.c delete mode 100644 src/world/area_kkj/kkj_03/AC9710.c delete mode 100644 src/world/area_kkj/kkj_03/AC9730.c create mode 100644 src/world/area_kkj/kkj_03/kkj_03_0_header.c create mode 100644 src/world/area_kkj/kkj_03/kkj_03_1_music.c create mode 100644 src/world/area_kkj/kkj_03/kkj_03_2_main.c create mode 100644 src/world/area_kkj/kkj_03/kkj_03_3_npc.c create mode 100644 src/world/area_kkj/kkj_03/kkj_03_4_scenes.c delete mode 100644 src/world/area_kkj/kkj_10/ACAB20.c delete mode 100644 src/world/area_kkj/kkj_10/ACAB90.c delete mode 100644 src/world/area_kkj/kkj_10/ACABD0.c delete mode 100644 src/world/area_kkj/kkj_10/ACB3C0.c create mode 100644 src/world/area_kkj/kkj_10/kkj_10_0_header.c create mode 100644 src/world/area_kkj/kkj_10/kkj_10_1_main.c create mode 100644 src/world/area_kkj/kkj_10/kkj_10_2_entity.c create mode 100644 src/world/area_kkj/kkj_10/kkj_10_3_npcs_early.c create mode 100644 src/world/area_kkj/kkj_10/kkj_10_4_npcs_later.c delete mode 100644 src/world/area_kkj/kkj_11/ACE140.c delete mode 100644 src/world/area_kkj/kkj_11/ACE1B0.c delete mode 100644 src/world/area_kkj/kkj_11/ACE1F0.c delete mode 100644 src/world/area_kkj/kkj_11/ACE9E0.c create mode 100644 src/world/area_kkj/kkj_11/kkj_11_0_header.c create mode 100644 src/world/area_kkj/kkj_11/kkj_11_1_main.c create mode 100644 src/world/area_kkj/kkj_11/kkj_11_2_entity.c create mode 100644 src/world/area_kkj/kkj_11/kkj_11_3_scene.c create mode 100644 src/world/area_kkj/kkj_11/kkj_11_4_demo.c create mode 100644 src/world/area_kkj/kkj_11/kkj_11_5_npcs_early.c create mode 100644 src/world/area_kkj/kkj_11/kkj_11_6_npcs_later.c delete mode 100644 src/world/area_kkj/kkj_12/AD4090.c delete mode 100644 src/world/area_kkj/kkj_12/AD4100.c create mode 100644 src/world/area_kkj/kkj_12/kkj_12_0_header.c create mode 100644 src/world/area_kkj/kkj_12/kkj_12_1_main.c create mode 100644 src/world/area_kkj/kkj_12/kkj_12_2_npc.c delete mode 100644 src/world/area_kkj/kkj_13/AD5ED0.c delete mode 100644 src/world/area_kkj/kkj_13/AD5EF0.c delete mode 100644 src/world/area_kkj/kkj_13/AD6200.c create mode 100644 src/world/area_kkj/kkj_13/kkj_13_0_header.c create mode 100644 src/world/area_kkj/kkj_13/kkj_13_1_music.c create mode 100644 src/world/area_kkj/kkj_13/kkj_13_2_main.c create mode 100644 src/world/area_kkj/kkj_13/kkj_13_3_npcs_finale.c create mode 100644 src/world/area_kkj/kkj_13/kkj_13_4_npcs_intro.c create mode 100644 src/world/area_kkj/kkj_13/kkj_13_5_intro_scenes.c delete mode 100644 src/world/area_kkj/kkj_14/ADAEA0.c delete mode 100644 src/world/area_kkj/kkj_14/ADAEF0.c create mode 100644 src/world/area_kkj/kkj_14/kkj_14_0_header.c create mode 100644 src/world/area_kkj/kkj_14/kkj_14_10_chapter2.c create mode 100644 src/world/area_kkj/kkj_14/kkj_14_11_chapter3.c create mode 100644 src/world/area_kkj/kkj_14/kkj_14_12_chapter4.c create mode 100644 src/world/area_kkj/kkj_14/kkj_14_13_chapter5.c create mode 100644 src/world/area_kkj/kkj_14/kkj_14_14_chapter6.c create mode 100644 src/world/area_kkj/kkj_14/kkj_14_15_chapter7.c create mode 100644 src/world/area_kkj/kkj_14/kkj_14_1_music.c create mode 100644 src/world/area_kkj/kkj_14/kkj_14_2_main.c create mode 100644 src/world/area_kkj/kkj_14/kkj_14_3_interactables.c create mode 100644 src/world/area_kkj/kkj_14/kkj_14_4_npc_guards.c create mode 100644 src/world/area_kkj/kkj_14/kkj_14_5_npc_ch0.c create mode 100644 src/world/area_kkj/kkj_14/kkj_14_6_npc_ch2.c create mode 100644 src/world/area_kkj/kkj_14/kkj_14_7_npc_ch7.c create mode 100644 src/world/area_kkj/kkj_14/kkj_14_8_chapter0.c create mode 100644 src/world/area_kkj/kkj_14/kkj_14_9_chapter1.c delete mode 100644 src/world/area_kkj/kkj_15/AE5590.c delete mode 100644 src/world/area_kkj/kkj_15/AE58D0.c delete mode 100644 src/world/area_kkj/kkj_15/AE5A90.c delete mode 100644 src/world/area_kkj/kkj_15/AE5B60.c create mode 100644 src/world/area_kkj/kkj_15/kkj_15_0_header.c create mode 100644 src/world/area_kkj/kkj_15/kkj_15_10_npc_chapter3.c create mode 100644 src/world/area_kkj/kkj_15/kkj_15_1_music.c create mode 100644 src/world/area_kkj/kkj_15/kkj_15_2_main.c create mode 100644 src/world/area_kkj/kkj_15/kkj_15_3_rotating_wall.c create mode 100644 src/world/area_kkj/kkj_15/kkj_15_4_chapter0.c create mode 100644 src/world/area_kkj/kkj_15/kkj_15_5_chapter1.c create mode 100644 src/world/area_kkj/kkj_15/kkj_15_6_chapter2.c create mode 100644 src/world/area_kkj/kkj_15/kkj_15_7_chapter3.c create mode 100644 src/world/area_kkj/kkj_15/kkj_15_8_npc_chapter0.c create mode 100644 src/world/area_kkj/kkj_15/kkj_15_9_npc_chapter1.c delete mode 100644 src/world/area_kkj/kkj_16/AED410.c delete mode 100644 src/world/area_kkj/kkj_16/AEDC60.c create mode 100644 src/world/area_kkj/kkj_16/kkj_16_0_header.c create mode 100644 src/world/area_kkj/kkj_16/kkj_16_1_main.c create mode 100644 src/world/area_kkj/kkj_16/kkj_16_2_npcs_early.c create mode 100644 src/world/area_kkj/kkj_16/kkj_16_3_npcs_later.c create mode 100644 src/world/area_kkj/kkj_16/kkj_16_4_stealth.c create mode 100644 src/world/area_kkj/kkj_16/kkj_16_5_entity.c delete mode 100644 src/world/area_kkj/kkj_17/AF1C60.c create mode 100644 src/world/area_kkj/kkj_17/kkj_17_0_header.c create mode 100644 src/world/area_kkj/kkj_17/kkj_17_1_main.c create mode 100644 src/world/area_kkj/kkj_17/kkj_17_2_entity.c create mode 100644 src/world/area_kkj/kkj_17/kkj_17_3_chest.c delete mode 100644 src/world/area_kkj/kkj_18/AF2CA0.c delete mode 100644 src/world/area_kkj/kkj_18/AF2FE0.c create mode 100644 src/world/area_kkj/kkj_18/kkj_18_0_header.c create mode 100644 src/world/area_kkj/kkj_18/kkj_18_1_music.c create mode 100644 src/world/area_kkj/kkj_18/kkj_18_2_main.c create mode 100644 src/world/area_kkj/kkj_18/kkj_18_3_npc.c create mode 100644 src/world/area_kkj/kkj_18/kkj_18_4_gourmet.c delete mode 100644 src/world/area_kkj/kkj_19/AF7950.c delete mode 100644 src/world/area_kkj/kkj_19/AF7C00.c create mode 100644 src/world/area_kkj/kkj_19/kkj_19_0_header.c create mode 100644 src/world/area_kkj/kkj_19/kkj_19_1_music.c create mode 100644 src/world/area_kkj/kkj_19/kkj_19_2_main.c create mode 100644 src/world/area_kkj/kkj_19/kkj_19_3_npcs_intro.c create mode 100644 src/world/area_kkj/kkj_19/kkj_19_4_npcs_peach.c create mode 100644 src/world/area_kkj/kkj_19/kkj_19_5_baking.c delete mode 100644 src/world/area_kkj/kkj_20/AFDB40.c delete mode 100644 src/world/area_kkj/kkj_20/AFDE00.c create mode 100644 src/world/area_kkj/kkj_20/kkj_20_0_header.c create mode 100644 src/world/area_kkj/kkj_20/kkj_20_1_music.c create mode 100644 src/world/area_kkj/kkj_20/kkj_20_2_main.c create mode 100644 src/world/area_kkj/kkj_20/kkj_20_3_entity.c create mode 100644 src/world/area_kkj/kkj_20/kkj_20_4_npc.c delete mode 100644 src/world/area_kkj/kkj_21/B022A0.c create mode 100644 src/world/area_kkj/kkj_21/kkj_21_0_header.c create mode 100644 src/world/area_kkj/kkj_21/kkj_21_1_main.c delete mode 100644 src/world/area_kkj/kkj_22/B024F0.c create mode 100644 src/world/area_kkj/kkj_22/kkj_22_0_header.c create mode 100644 src/world/area_kkj/kkj_22/kkj_22_1_music.c create mode 100644 src/world/area_kkj/kkj_22/kkj_22_2_main.c delete mode 100644 src/world/area_kkj/kkj_23/B02880.c delete mode 100644 src/world/area_kkj/kkj_23/B028A0.c delete mode 100644 src/world/area_kkj/kkj_23/B03190.c create mode 100644 src/world/area_kkj/kkj_23/kkj_23_0_header.c create mode 100644 src/world/area_kkj/kkj_23/kkj_23_1_music.c create mode 100644 src/world/area_kkj/kkj_23/kkj_23_2_main.c create mode 100644 src/world/area_kkj/kkj_23/kkj_23_3_npcs_finale.c create mode 100644 src/world/area_kkj/kkj_23/kkj_23_4_npcs_peach.c create mode 100644 src/world/area_kkj/kkj_23/kkj_23_5_scene.c delete mode 100644 src/world/area_kkj/kkj_24/B06570.c create mode 100644 src/world/area_kkj/kkj_24/kkj_24_0_header.c create mode 100644 src/world/area_kkj/kkj_24/kkj_24_1_music.c create mode 100644 src/world/area_kkj/kkj_24/kkj_24_2_main.c create mode 100644 src/world/area_kkj/kkj_24/kkj_24_3_entity.c delete mode 100644 src/world/area_kkj/kkj_25/B06A00.c delete mode 100644 src/world/area_kkj/kkj_25/B06A20.c delete mode 100644 src/world/area_kkj/kkj_25/B06A50.c delete mode 100644 src/world/area_kkj/kkj_25/B06A80.c delete mode 100644 src/world/area_kkj/kkj_25/B06D10.c create mode 100644 src/world/area_kkj/kkj_25/kkj_25_0_header.c create mode 100644 src/world/area_kkj/kkj_25/kkj_25_1_main.c create mode 100644 src/world/area_kkj/kkj_25/kkj_25_2_npc_initial.c create mode 100644 src/world/area_kkj/kkj_25/kkj_25_3_npc_midpoint.c create mode 100644 src/world/area_kkj/kkj_25/kkj_25_4_npc_final.c create mode 100644 src/world/area_kkj/kkj_25/kkj_25_5_arena.c create mode 100644 src/world/area_kkj/kkj_25/kkj_25_6_peach_free.c create mode 100644 src/world/area_kkj/kkj_25/kkj_25_7_kammy_defeated.c create mode 100644 src/world/area_kkj/kkj_25/kkj_25_8_bowser_defeated.c create mode 100644 src/world/area_kkj/kkj_25/kkj_25_9_entity.c delete mode 100644 src/world/area_kkj/kkj_26/B13120.c create mode 100644 src/world/area_kkj/kkj_26/kkj_26_0_header.c create mode 100644 src/world/area_kkj/kkj_26/kkj_26_1_main.c create mode 100644 src/world/area_kkj/kkj_26/kkj_26_2_scenes.c create mode 100644 src/world/area_kkj/kkj_26/kkj_26_3_demo.c delete mode 100644 src/world/area_kkj/kkj_27/B13D70.c delete mode 100644 src/world/area_kkj/kkj_27/B14080.c create mode 100644 src/world/area_kkj/kkj_27/kkj_27_0_header.c create mode 100644 src/world/area_kkj/kkj_27/kkj_27_1_music.c create mode 100644 src/world/area_kkj/kkj_27/kkj_27_2_main.c create mode 100644 src/world/area_kkj/kkj_27/kkj_27_3_rotating_wall.c delete mode 100644 src/world/area_kkj/kkj_28/B14EA0.c create mode 100644 src/world/area_kkj/kkj_28/kkj_28_0_header.c create mode 100644 src/world/area_kkj/kkj_28/kkj_28_1_main.c delete mode 100644 src/world/area_kkj/kkj_29/B150B0.c delete mode 100644 src/world/area_kkj/kkj_29/B150E0.c create mode 100644 src/world/area_kkj/kkj_29/kkj_29_0_header.c create mode 100644 src/world/area_kkj/kkj_29/kkj_29_1_main.c create mode 100644 src/world/area_kkj/kkj_29/kkj_29_2_npc.c create mode 100644 src/world/area_kkj/kkj_29/kkj_29_3_quiz.c create mode 100644 src/world/area_sbk/sbk_00/sbk_00_0_header.c rename src/world/common/atomic/{TexturePan.data.inc.c => TexturePan.h} (58%) rename src/world/common/enemy/{complete => }/AlbinoDino.h (100%) rename src/world/common/enemy/{complete => }/AlbinoDino.inc.c (100%) rename src/world/common/enemy/{complete => }/AmazyDayzee.h (100%) rename src/world/common/enemy/{complete => }/AmazyDayzee.inc.c (100%) rename src/world/common/enemy/{complete => }/Bandit.h (100%) rename src/world/common/enemy/{complete => }/Bandit.inc.c (100%) rename src/world/common/enemy/{complete => }/Blooper.h (83%) rename src/world/common/enemy/{complete => }/Blooper.inc.c (100%) rename src/world/common/enemy/{complete => }/Bobomb.h (100%) rename src/world/common/enemy/{complete => }/Bobomb_Guard.inc.c (100%) rename src/world/common/enemy/{complete => }/Bobomb_Wander.inc.c (100%) rename src/world/common/enemy/{complete => }/Bombette.h (100%) rename src/world/common/enemy/{complete => }/Bombette.inc.c (100%) rename src/world/common/enemy/{complete => }/BombshellBill.h (95%) rename src/world/common/enemy/{complete => }/BulletBill.h (95%) rename src/world/common/enemy/{complete => }/Bzzap.h (88%) rename src/world/common/enemy/{complete => }/Bzzap.inc.c (100%) rename src/world/common/enemy/{complete => }/Cleft.h (100%) rename src/world/common/enemy/{complete => }/Cleft.inc.c (100%) rename src/world/common/enemy/{complete => }/Clubba.h (98%) rename src/world/common/enemy/{complete => }/Clubba.inc.c (100%) rename src/world/common/enemy/{complete => }/Clubba_Multi.inc.c (97%) rename src/world/common/enemy/{complete => }/CrazyDayzee.h (100%) rename src/world/common/enemy/{complete => }/CrazyDayzee.inc.c (100%) rename src/world/common/enemy/{complete => }/CrystalKing.h (100%) rename src/world/common/enemy/{complete => }/CrystalKing.inc.c (100%) rename src/world/common/enemy/{complete => }/DarkTroopa.h (100%) rename src/world/common/enemy/{complete => }/DarkTroopa_Wander.inc.c (100%) rename src/world/common/enemy/{complete => }/DryBones.h (94%) rename src/world/common/enemy/{complete => }/DryBones.inc.c (100%) rename src/world/common/enemy/{complete => }/Duplighost.h (100%) rename src/world/common/enemy/{complete => }/Duplighost_Patrol.inc.c (100%) rename src/world/common/enemy/{complete => }/Duplighost_Wander.inc.c (100%) rename src/world/common/enemy/{complete => }/Ember.h (100%) rename src/world/common/enemy/{complete => }/Ember.inc.c (100%) rename src/world/common/enemy/{complete => }/FlyingMagikoopa.h (93%) rename src/world/common/enemy/{complete => }/FlyingMagikoopa.inc.c (98%) rename src/world/common/enemy/{complete => }/ForestFuzzy.h (100%) rename src/world/common/enemy/{complete => }/ForestFuzzy_Wander.inc.c (100%) rename src/world/common/enemy/{complete => }/FrostClubba.h (98%) rename src/world/common/enemy/{complete => }/FrostClubba_Multi.inc.c (97%) rename src/world/common/enemy/{complete => }/FrostPiranha.h (98%) rename src/world/common/enemy/{complete => }/FrostPiranha.inc.c (94%) rename src/world/common/enemy/{complete => }/Fuzzy.h (100%) rename src/world/common/enemy/{complete => }/Fuzzy.inc.c (100%) rename src/world/common/enemy/{complete => }/Fuzzy_Wander.inc.c (100%) rename src/world/common/enemy/{complete => }/Gloomba.h (100%) rename src/world/common/enemy/{complete => }/Gloomba_Wander.inc.c (100%) rename src/world/common/enemy/{complete => }/Goomba.h (100%) rename src/world/common/enemy/{complete => }/Goomba.inc.c (100%) rename src/world/common/enemy/{complete => }/GoombaBros.h (91%) rename src/world/common/enemy/{complete => }/GoombaBros_Guard.inc.c (100%) rename src/world/common/enemy/{complete => }/Goomba_Wander.inc.c (100%) rename src/world/common/enemy/{complete => }/GrooveGuy.h (100%) rename src/world/common/enemy/{complete => }/GrooveGuy.inc.c (100%) rename src/world/common/enemy/{complete => }/Gulpit.h (97%) rename src/world/common/enemy/{complete => }/Gulpit.inc.c (93%) rename src/world/common/enemy/{complete => }/HammerBros.h (94%) create mode 100644 src/world/common/enemy/HammerBros.inc.c rename src/world/common/enemy/{complete/HammerBros.inc.c => HammerBros_Wander.inc.c} (96%) rename src/world/common/enemy/{complete => }/HeartPlant.h (100%) rename src/world/common/enemy/{complete => }/HeartPlant.inc.c (98%) rename src/world/common/enemy/{complete => }/HuffNPuff.h (83%) rename src/world/common/enemy/{complete => }/HurtPlant.h (100%) rename src/world/common/enemy/{complete => }/HurtPlant.inc.c (97%) rename src/world/common/enemy/{complete => }/HyperCleft.h (100%) rename src/world/common/enemy/{complete => }/HyperCleft.inc.c (100%) rename src/world/common/enemy/{complete => }/HyperGoomba.h (100%) rename src/world/common/enemy/{complete => }/HyperGoomba_Patrol.inc.c (100%) rename src/world/common/enemy/{complete => }/HyperGoomba_Wander.inc.c (100%) rename src/world/common/enemy/{complete => }/HyperParagoomba.h (100%) rename src/world/common/enemy/{complete => }/HyperParagoomba.inc.c (100%) rename src/world/common/enemy/{complete => }/JungleFuzzy.h (100%) rename src/world/common/enemy/{complete => }/JungleFuzzy.inc.c (100%) rename src/world/common/enemy/{complete => }/JungleFuzzy_Wander.inc.c (100%) rename src/world/common/enemy/{complete => }/Kammy.h (100%) rename src/world/common/enemy/{complete => }/Kammy.inc.c (79%) create mode 100644 src/world/common/enemy/Kammy_Flying.inc.c create mode 100644 src/world/common/enemy/Kammy_Guard.inc.c rename src/world/common/enemy/{complete => }/KentCKoopa.h (84%) rename src/world/common/enemy/{complete => }/KentCKoopa.inc.c (100%) rename src/world/common/enemy/{complete => }/KoopaTroopa.h (100%) rename src/world/common/enemy/{complete => }/KoopaTroopa_Patrol.inc.c (100%) rename src/world/common/enemy/{complete => }/KoopaTroopa_Stationary.inc.c (100%) rename src/world/common/enemy/{complete => }/KoopaTroopa_Wander.inc.c (100%) rename src/world/common/enemy/{complete => }/Koopatrol.h (89%) rename src/world/common/enemy/{complete => }/Koopatrol_Patrol.inc.c (100%) rename src/world/common/enemy/{complete => }/Koopatrol_Stationary.inc.c (100%) rename src/world/common/enemy/{complete => }/Koopatrol_Wander.inc.c (100%) rename src/world/common/enemy/{complete => }/Lakitu.h (100%) rename src/world/common/enemy/{complete => }/Lakitu_SpinySpawner.inc.c (100%) rename src/world/common/enemy/{complete => }/Lakitu_Stationary.inc.c (100%) rename src/world/common/enemy/{complete => }/LavaBubble.h (100%) rename src/world/common/enemy/{complete => }/LavaBubble.inc.c (100%) rename src/world/common/enemy/{complete => }/LavaPiranha.h (92%) rename src/world/common/enemy/{complete => }/LavaPiranha.inc.c (100%) rename src/world/common/enemy/{complete => }/MBush.h (100%) rename src/world/common/enemy/{complete => }/MBush.inc.c (100%) rename src/world/common/enemy/{complete => }/Magikoopa.h (92%) rename src/world/common/enemy/{complete => }/Magikoopa.inc.c (98%) rename src/world/common/enemy/{complete => }/MontyMole.h (100%) rename src/world/common/enemy/{complete => }/MontyMole.inc.c (100%) rename src/world/common/enemy/{complete => }/MontyMole_GroundAmbush.inc.c (100%) rename src/world/common/enemy/{complete => }/MontyMole_StoneThrower.inc.c (97%) rename src/world/common/enemy/{complete => }/MontyMole_WallAmbush.inc.c (100%) rename src/world/common/enemy/{complete => }/Paragloomba.h (100%) rename src/world/common/enemy/{complete => }/Paragloomba_Wander.inc.c (100%) rename src/world/common/enemy/{complete => }/Paragoomba.h (100%) rename src/world/common/enemy/{complete => }/Paragoomba_Wander.inc.c (100%) rename src/world/common/enemy/{complete => }/Paratroopa.h (100%) rename src/world/common/enemy/{complete => }/Paratroopa.inc.c (100%) rename src/world/common/enemy/{complete => }/PiranhaPlant.h (93%) rename src/world/common/enemy/{complete => }/PiranhaPlant.inc.c (100%) rename src/world/common/enemy/{complete => }/Pokey.h (100%) rename src/world/common/enemy/{complete => }/Pokey.inc.c (100%) rename src/world/common/enemy/{complete => }/PokeyMummy.h (100%) rename src/world/common/enemy/{complete => }/PokeyMummy.inc.c (100%) rename src/world/common/enemy/{complete => }/PutridPiranha.h (92%) rename src/world/common/enemy/{complete => }/PutridPiranha.inc.c (100%) rename src/world/common/enemy/{complete => }/PutridPiranhaSentinel.h (97%) rename src/world/common/enemy/{complete => }/PutridPiranhaSentinel.inc.c (100%) rename src/world/common/enemy/{complete => }/PyroGuy.h (100%) rename src/world/common/enemy/{complete => }/PyroGuy.inc.c (100%) rename src/world/common/enemy/{complete => }/Sentinel.h (84%) rename src/world/common/enemy/{complete => }/Sentinel.inc.c (100%) rename src/world/common/enemy/{complete => }/ShyGuy.h (98%) rename src/world/common/enemy/{complete => }/ShyGuy_AvoidPlayer.inc.c (100%) rename src/world/common/enemy/{complete => }/ShyGuy_Guard.inc.c (100%) rename src/world/common/enemy/{complete => }/ShyGuy_Patrol.inc.c (100%) rename src/world/common/enemy/{complete => }/ShyGuy_Stationary.inc.c (100%) rename src/world/common/enemy/{complete => }/ShyGuy_Wander.inc.c (100%) rename src/world/common/enemy/{complete => }/SkyGuy.h (100%) rename src/world/common/enemy/{complete => }/SkyGuy.inc.c (100%) rename src/world/common/enemy/{complete => }/SpearGuy.h (97%) rename src/world/common/enemy/{complete => }/SpearGuy_Patrol.inc.c (100%) rename src/world/common/enemy/{complete => }/SpearGuy_Wander.inc.c (96%) rename src/world/common/enemy/{complete => }/SpikeTop.h (100%) rename src/world/common/enemy/{complete => }/SpikeTop.inc.c (100%) rename src/world/common/enemy/{complete => }/SpikedGloomba.h (100%) rename src/world/common/enemy/{complete => }/SpikedGloomba_Wander.inc.c (100%) rename src/world/common/enemy/{complete => }/SpikedGoomba.h (100%) rename src/world/common/enemy/{complete => }/SpikedGoomba_Patrol.inc.c (100%) rename src/world/common/enemy/{complete => }/SpikedGoomba_Wander.inc.c (100%) rename src/world/common/enemy/{complete => }/Spiny.h (100%) rename src/world/common/enemy/{complete => }/Spiny.inc.c (100%) rename src/world/common/enemy/{complete => }/SpyGuy.h (98%) rename src/world/common/enemy/{complete => }/SpyGuy.inc.c (100%) rename src/world/common/enemy/{complete => }/StoneChomp.h (100%) rename src/world/common/enemy/{complete => }/StoneChomp.inc.c (100%) rename src/world/common/enemy/{complete => }/Swooper.h (100%) rename src/world/common/enemy/{complete => }/Swooper.inc.c (100%) rename src/world/common/enemy/{complete => }/TubbaBlubba.h (91%) rename src/world/common/enemy/{complete => }/TubbaBlubba.inc.c (100%) rename src/world/common/enemy/{complete => }/TubbaBlubba_Patrol.inc.c (100%) rename src/world/common/enemy/{complete => }/TuffPuff.h (87%) rename src/world/common/enemy/{complete => }/TuffPuff.inc.c (100%) rename src/world/common/enemy/{complete => }/Whacka.h (82%) rename src/world/common/enemy/{complete => }/Whacka.inc.c (100%) rename src/world/common/enemy/{complete => }/YMagikoopa.h (98%) create mode 100644 src/world/common/npc/Bowser.h create mode 100644 src/world/common/npc/Bowser.inc.c create mode 100644 src/world/common/npc/GourmetGuy.h create mode 100644 src/world/common/npc/GourmetGuy.inc.c create mode 100644 src/world/common/npc/Peach.h create mode 100644 src/world/common/npc/Peach.inc.c create mode 100644 src/world/common/npc/StarRod.h create mode 100644 src/world/common/npc/StarRod.inc.c create mode 100644 src/world/common/npc/ToadGuard.h create mode 100644 src/world/common/npc/ToadKid.h create mode 100644 src/world/common/npc/ToadMinister.h create mode 100644 src/world/common/npc/Toad_Collection.h create mode 100644 src/world/common/npc/Toadette.h delete mode 100644 src/world/common/todo/DeadUnkFunc1.inc.c delete mode 100644 src/world/common/todo/UnkFloatFuncAbs.inc.c create mode 100644 src/world/common/util/SetLightningBoltPurple.inc.c delete mode 100644 ver/us/asm/data/world/area_kkj/kkj_00/ABC250.data.s delete mode 100644 ver/us/asm/data/world/area_kkj/kkj_00/ABC3D0.data.s delete mode 100644 ver/us/asm/data/world/area_kkj/kkj_00/ABEC70.data.s delete mode 100644 ver/us/asm/data/world/area_kkj/kkj_00/ABEF20.data.s delete mode 100644 ver/us/asm/data/world/area_kkj/kkj_00/AC40D0.data.s delete mode 100644 ver/us/asm/data/world/area_kkj/kkj_01/AC6000.data.s delete mode 100644 ver/us/asm/data/world/area_kkj/kkj_01/AC6140.data.s delete mode 100644 ver/us/asm/data/world/area_kkj/kkj_01/AC67E0.data.s delete mode 100644 ver/us/asm/data/world/area_kkj/kkj_02/AC8D20.data.s delete mode 100644 ver/us/asm/data/world/area_kkj/kkj_02/AC8E40.data.s delete mode 100644 ver/us/asm/data/world/area_kkj/kkj_02/AC9160.data.s delete mode 100644 ver/us/asm/data/world/area_kkj/kkj_03/AC9A40.data.s delete mode 100644 ver/us/asm/data/world/area_kkj/kkj_03/AC9C00.data.s delete mode 100644 ver/us/asm/data/world/area_kkj/kkj_03/ACA010.data.s delete mode 100644 ver/us/asm/data/world/area_kkj/kkj_03/ACA250.data.s delete mode 100644 ver/us/asm/data/world/area_kkj/kkj_10/ACBBF0.data.s delete mode 100644 ver/us/asm/data/world/area_kkj/kkj_10/ACC510.data.s delete mode 100644 ver/us/asm/data/world/area_kkj/kkj_10/ACC700.data.s delete mode 100644 ver/us/asm/data/world/area_kkj/kkj_11/ACF210.data.s delete mode 100644 ver/us/asm/data/world/area_kkj/kkj_11/ACFD40.data.s delete mode 100644 ver/us/asm/data/world/area_kkj/kkj_11/ACFF30.data.s delete mode 100644 ver/us/asm/data/world/area_kkj/kkj_11/AD02E0.data.s delete mode 100644 ver/us/asm/data/world/area_kkj/kkj_11/AD27F0.data.s delete mode 100644 ver/us/asm/data/world/area_kkj/kkj_12/AD4940.data.s delete mode 100644 ver/us/asm/data/world/area_kkj/kkj_13/AD6630.data.s delete mode 100644 ver/us/asm/data/world/area_kkj/kkj_13/AD6780.data.s delete mode 100644 ver/us/asm/data/world/area_kkj/kkj_13/AD6820.data.s delete mode 100644 ver/us/asm/data/world/area_kkj/kkj_13/AD6E60.data.s delete mode 100644 ver/us/asm/data/world/area_kkj/kkj_13/AD8650.data.s delete mode 100644 ver/us/asm/data/world/area_kkj/kkj_13/AD9460.data.s delete mode 100644 ver/us/asm/data/world/area_kkj/kkj_14/ADB360.data.s delete mode 100644 ver/us/asm/data/world/area_kkj/kkj_14/ADB5C0.data.s delete mode 100644 ver/us/asm/data/world/area_kkj/kkj_14/ADC0F0.data.s delete mode 100644 ver/us/asm/data/world/area_kkj/kkj_14/ADD870.data.s delete mode 100644 ver/us/asm/data/world/area_kkj/kkj_14/ADE870.data.s delete mode 100644 ver/us/asm/data/world/area_kkj/kkj_14/ADED00.data.s delete mode 100644 ver/us/asm/data/world/area_kkj/kkj_14/ADF190.data.s delete mode 100644 ver/us/asm/data/world/area_kkj/kkj_14/ADFA50.data.s delete mode 100644 ver/us/asm/data/world/area_kkj/kkj_14/AE1B30.data.s delete mode 100644 ver/us/asm/data/world/area_kkj/kkj_14/AE1E80.data.s delete mode 100644 ver/us/asm/data/world/area_kkj/kkj_14/AE3160.data.s delete mode 100644 ver/us/asm/data/world/area_kkj/kkj_14/AE32D0.data.s delete mode 100644 ver/us/asm/data/world/area_kkj/kkj_14/AE3610.data.s delete mode 100644 ver/us/asm/data/world/area_kkj/kkj_14/AE3850.data.s delete mode 100644 ver/us/asm/data/world/area_kkj/kkj_15/AE5BA0.data.s delete mode 100644 ver/us/asm/data/world/area_kkj/kkj_15/AE5CE0.data.s delete mode 100644 ver/us/asm/data/world/area_kkj/kkj_15/AE5D80.data.s delete mode 100644 ver/us/asm/data/world/area_kkj/kkj_15/AE65A0.data.s delete mode 100644 ver/us/asm/data/world/area_kkj/kkj_15/AE6BF0.data.s delete mode 100644 ver/us/asm/data/world/area_kkj/kkj_15/AE8A50.data.s delete mode 100644 ver/us/asm/data/world/area_kkj/kkj_15/AEA0D0.data.s delete mode 100644 ver/us/asm/data/world/area_kkj/kkj_15/AEA230.data.s delete mode 100644 ver/us/asm/data/world/area_kkj/kkj_15/AEB820.data.s delete mode 100644 ver/us/asm/data/world/area_kkj/kkj_15/AECB30.data.s delete mode 100644 ver/us/asm/data/world/area_kkj/kkj_16/AEE490.data.s delete mode 100644 ver/us/asm/data/world/area_kkj/kkj_16/AEE7F0.data.s delete mode 100644 ver/us/asm/data/world/area_kkj/kkj_16/AF09D0.data.s delete mode 100644 ver/us/asm/data/world/area_kkj/kkj_16/AF1B10.data.s delete mode 100644 ver/us/asm/data/world/area_kkj/kkj_17/AF2200.data.s delete mode 100644 ver/us/asm/data/world/area_kkj/kkj_17/AF2440.data.s delete mode 100644 ver/us/asm/data/world/area_kkj/kkj_17/AF2520.data.s delete mode 100644 ver/us/asm/data/world/area_kkj/kkj_18/AF34C0.data.s delete mode 100644 ver/us/asm/data/world/area_kkj/kkj_18/AF3560.data.s delete mode 100644 ver/us/asm/data/world/area_kkj/kkj_18/AF3600.data.s delete mode 100644 ver/us/asm/data/world/area_kkj/kkj_18/AF3CB0.data.s delete mode 100644 ver/us/asm/data/world/area_kkj/kkj_18/AF4BB0.data.s delete mode 100644 ver/us/asm/data/world/area_kkj/kkj_19/AF8660.data.s delete mode 100644 ver/us/asm/data/world/area_kkj/kkj_19/AF8B40.data.s delete mode 100644 ver/us/asm/data/world/area_kkj/kkj_19/AF9050.data.s delete mode 100644 ver/us/asm/data/world/area_kkj/kkj_19/AF9460.data.s delete mode 100644 ver/us/asm/data/world/area_kkj/kkj_20/AFE130.data.s delete mode 100644 ver/us/asm/data/world/area_kkj/kkj_20/AFE1E0.data.s delete mode 100644 ver/us/asm/data/world/area_kkj/kkj_20/AFE3C0.data.s delete mode 100644 ver/us/asm/data/world/area_kkj/kkj_20/AFE610.data.s delete mode 100644 ver/us/asm/data/world/area_kkj/kkj_21/B022A0.data.s delete mode 100644 ver/us/asm/data/world/area_kkj/kkj_22/B024F0.data.s delete mode 100644 ver/us/asm/data/world/area_kkj/kkj_22/B025A0.data.s delete mode 100644 ver/us/asm/data/world/area_kkj/kkj_23/B03250.data.s delete mode 100644 ver/us/asm/data/world/area_kkj/kkj_23/B03300.data.s delete mode 100644 ver/us/asm/data/world/area_kkj/kkj_23/B036B0.data.s delete mode 100644 ver/us/asm/data/world/area_kkj/kkj_23/B04420.data.s delete mode 100644 ver/us/asm/data/world/area_kkj/kkj_23/B04FB0.data.s delete mode 100644 ver/us/asm/data/world/area_kkj/kkj_24/B06590.data.s delete mode 100644 ver/us/asm/data/world/area_kkj/kkj_24/B06640.data.s delete mode 100644 ver/us/asm/data/world/area_kkj/kkj_24/B069B0.data.s delete mode 100644 ver/us/asm/data/world/area_kkj/kkj_25/B07940.data.s delete mode 100644 ver/us/asm/data/world/area_kkj/kkj_25/B081C0.data.s delete mode 100644 ver/us/asm/data/world/area_kkj/kkj_25/B0B310.data.s delete mode 100644 ver/us/asm/data/world/area_kkj/kkj_25/B0E3A0.data.s delete mode 100644 ver/us/asm/data/world/area_kkj/kkj_25/B0F280.data.s delete mode 100644 ver/us/asm/data/world/area_kkj/kkj_26/B13150.data.s delete mode 100644 ver/us/asm/data/world/area_kkj/kkj_26/B13500.data.s delete mode 100644 ver/us/asm/data/world/area_kkj/kkj_26/B13A40.data.s delete mode 100644 ver/us/asm/data/world/area_kkj/kkj_27/B14210.data.s delete mode 100644 ver/us/asm/data/world/area_kkj/kkj_27/B14340.data.s delete mode 100644 ver/us/asm/data/world/area_kkj/kkj_27/B143E0.data.s delete mode 100644 ver/us/asm/data/world/area_kkj/kkj_28/B14EA0.data.s delete mode 100644 ver/us/asm/data/world/area_kkj/kkj_29/B15120.data.s delete mode 100644 ver/us/asm/data/world/area_kkj/kkj_29/B15410.data.s delete mode 100644 ver/us/asm/data/world/area_kkj/kkj_29/B15DA0.data.s diff --git a/include/common_structs.h b/include/common_structs.h index f4a0a26845..dc14e0565d 100644 --- a/include/common_structs.h +++ b/include/common_structs.h @@ -1400,7 +1400,7 @@ typedef struct GameStatus { /* 0x07D */ s8 keepUsingPartnerOnMapChange; /* 0x07E */ u8 peachFlags; /* (1 = isPeach, 2 = isTransformed, 4 = hasUmbrella) */ /* 0x07F */ s8 peachDisguise; /* (1 = koopatrol, 2 = hammer bros, 3 = clubba) */ - /* 0x080 */ u8 peachCookingIngredient; ///< @see enum CookingIngredient + /* 0x080 */ u8 peachBakingIngredient; ///< @see enum PeachBakingItems /* 0x081 */ s8 multiplayerEnabled; /* 0x082 */ s8 unk_82; /* 0x083 */ s8 unk_83; @@ -2174,11 +2174,14 @@ typedef struct MenuWindowBP { /* 0x06 */ s16 width; /* 0x08 */ s16 height; /* 0x0A */ u8 priority; + /* 0x0B */ char unk_0B; /* 0x0C */ void (*fpDrawContents)(MenuPanel* menu, s32 baseX, s32 baseY, s32 width, s32 height, s32 opacity, s32 darkening); /* 0x10 */ MenuPanel* tab; /* 0x14 */ s8 parentID; + /* 0x15 */ char unk_15[3]; /* 0x18 */ WindowUpdateFunc fpUpdate; /* 0x1C */ u8 extraFlags; + /* 0x1D */ char unk_1D[3]; /* 0x20 */ WindowStyle style; } MenuWindowBP; // size = 0x24; diff --git a/include/effects.h b/include/effects.h index 2053d145c6..6b5e45dcf8 100644 --- a/include/effects.h +++ b/include/effects.h @@ -835,15 +835,15 @@ typedef struct SteamBurstFXData { } SteamBurstFXData; // size = 0x34 typedef struct StarsOrbitingFXData { - /* 0x00 */ s32 unk_00; + /* 0x00 */ s32 type; /* 0x04 */ Vec3f pos; - /* 0x10 */ f32 unk_10; - /* 0x14 */ f32 unk_14; - /* 0x18 */ f32 unk_18; - /* 0x1C */ f32 unk_1C; - /* 0x20 */ f32 unk_20; - /* 0x24 */ s32 unk_24; - /* 0x28 */ s32 unk_28; + /* 0x10 */ f32 orbitRadius; + /* 0x14 */ f32 targetRadius; + /* 0x18 */ f32 roll; + /* 0x1C */ f32 rollSpinRate; + /* 0x20 */ f32 pitch; + /* 0x24 */ s32 yaw; + /* 0x28 */ s32 enabled; } StarsOrbitingFXData; // size = 0x2C typedef struct BigSnowflakesFXData { diff --git a/include/enums.h b/include/enums.h index fb5d1e968d..b23af95ea0 100644 --- a/include/enums.h +++ b/include/enums.h @@ -2943,6 +2943,13 @@ enum DoorSounds { #include "sprite/sprite_shading_profiles.h" #endif +enum LightSourceFlags { + LIGHT_SOURCE_DISABLED = 0, + LIGHT_SOURCE_ENABLED = 1, + LIGHT_SOURCE_LINEAR_FALLOFF = 4, + LIGHT_SOURCE_QUADRATIC_FALLOFF = 8, +}; + enum ActionStates { ACTION_STATE_IDLE = 0x00000000, ACTION_STATE_WALK = 0x00000001, @@ -2998,41 +3005,41 @@ enum LandOnSwitchSubstate { LANDING_ON_SWITCH_SUBSTATE_2 = 2, }; -/* (1 = isPeach, 2 = isTransformed, 4 = hasUmbrella) */ enum PeachStatusFlags { PEACH_STATUS_FLAG_IS_PEACH = 0x01, PEACH_STATUS_FLAG_DISGUISED = 0x02, PEACH_STATUS_FLAG_HAS_PARASOL = 0x04, PEACH_STATUS_FLAG_8 = 0x08, - PEACH_STATUS_FLAG_HAS_INGREDIENT = 0x10 + PEACH_STATUS_FLAG_DEPRESSED = 0x10 }; -enum CookingIngredients { - PEACH_COOKING_NONE = 0x00, - PEACH_COOKING_CREAM = 0x01, - PEACH_COOKING_STRAWBERRY = 0x02, - PEACH_COOKING_BUTTER = 0x03, - PEACH_COOKING_CLEANSER = 0x04, - PEACH_COOKING_WATER = 0x05, - PEACH_COOKING_MILK = 0x06, - PEACH_COOKING_FLOUR = 0x07, - PEACH_COOKING_EGG = 0x08, - PEACH_COOKING_COMPLETE_CAKE = 0x09, - PEACH_COOKING_CAKE_BOWL = 0x0A, - PEACH_COOKING_CAKE_MIXED = 0x0B, - PEACH_COOKING_CAKE_PAN = 0x0C, - PEACH_COOKING_CAKE_BATTER = 0x0D, - PEACH_COOKING_CAKE_BARE = 0x0E, - PEACH_COOKING_SALT = 0x0F, - PEACH_COOKING_SUGAR = 0x10, - PEACH_COOKING_CAKE_WITH_ICING = 0x11, - PEACH_COOKING_CAKE_WITH_BERRIES = 0x12, +enum PeachBakingItems { + PEACH_BAKING_NONE = 0, + PEACH_BAKING_CREAM = 1, + PEACH_BAKING_STRAWBERRY = 2, + PEACH_BAKING_BUTTER = 3, + PEACH_BAKING_CLEANSER = 4, + PEACH_BAKING_WATER = 5, + PEACH_BAKING_MILK = 6, + PEACH_BAKING_FLOUR = 7, + PEACH_BAKING_EGG = 8, + PEACH_BAKING_COMPLETE_CAKE = 9, + PEACH_BAKING_CAKE_BOWL = 10, + PEACH_BAKING_CAKE_MIXED = 11, + PEACH_BAKING_CAKE_PAN = 12, + PEACH_BAKING_CAKE_BATTER = 13, + PEACH_BAKING_CAKE_BARE = 14, + PEACH_BAKING_SALT = 15, + PEACH_BAKING_SUGAR = 16, + PEACH_BAKING_CAKE_WITH_ICING = 17, + PEACH_BAKING_CAKE_WITH_BERRIES = 18, }; enum PeachDisguises { - PEACH_DISGUISE_1 = 1, - PEACH_DISGUISE_2 = 2, - PEACH_DISGUISE_CLUBBA = 3, + PEACH_DISGUISE_NONE = 0, + PEACH_DISGUISE_KOOPATROL = 1, + PEACH_DISGUISE_HAMMER_BROS = 2, + PEACH_DISGUISE_CLUBBA = 3, }; // Requires decimals @@ -5183,6 +5190,7 @@ enum TempColliderFlagsModifyMode { }; enum CollisionChannels { + COLLISION_CHANNEL_8000 = 0x00008000, COLLISION_CHANNEL_10000 = 0x00010000, COLLISION_CHANNEL_20000 = 0x00020000, COLLISION_IGNORE_ENTITIES = 0x00040000, @@ -5870,8 +5878,8 @@ enum WindowId { WINDOW_ID_7 = 7, WINDOW_ID_8 = 8, WINDOW_ID_9 = 9, - WINDOW_ID_10 = 10, - WINDOW_ID_11 = 11, + WINDOW_ID_ITEM_INFO_NAME = 10, + WINDOW_ID_ITEM_INFO_DESC = 11, WINDOW_ID_12 = 12, WINDOW_ID_13 = 13, WINDOW_ID_14 = 14, diff --git a/include/npc.h b/include/npc.h index c290eabb3a..c089b87866 100644 --- a/include/npc.h +++ b/include/npc.h @@ -7,23 +7,19 @@ // battle and stage are optional in overloaded NPC_GROUP macros #define NPC_GROUP(args...) VFUNC(NPC_GROUP, args) -#define NPC_GROUP1(npcs) { sizeof(npcs) / sizeof(StaticNpc), (StaticNpc*) &npcs, 0, 0 } -#define NPC_GROUP2(npcs, battle) { sizeof(npcs) / sizeof(StaticNpc), (StaticNpc*) &npcs, battle, 0 } -#define NPC_GROUP3(npcs, battle, stage) { sizeof(npcs) / sizeof(StaticNpc), (StaticNpc*) &npcs, battle, stage + 1 } +#define NPC_GROUP1(npcs) { sizeof(npcs) / sizeof(NpcData), (NpcData*) &npcs, 0, 0 } +#define NPC_GROUP2(npcs, battle) { sizeof(npcs) / sizeof(NpcData), (NpcData*) &npcs, battle, 0 } +#define NPC_GROUP3(npcs, battle, stage) { sizeof(npcs) / sizeof(NpcData), (NpcData*) &npcs, battle, stage + 1 } #define NPC_GROUP_EXPLICIT_SIZE(args...) VFUNC(NPC_GROUP_EXPLICIT_SIZE, args) -#define NPC_GROUP_EXPLICIT_SIZE3(npcs, start, count) { count, (StaticNpc*) &npcs[start], 0, 0 } -#define NPC_GROUP_EXPLICIT_SIZE4(npcs, start, count, battle) { count, (StaticNpc*) &npcs[start], battle, 0 } -#define NPC_GROUP_EXPLICIT_SIZE5(npcs, start, count, battle, stage) { count, (StaticNpc*) &npcs[start], battle, stage + 1 } +#define NPC_GROUP_EXPLICIT_SIZE3(npcs, start, count) { count, (NpcData*) &npcs[start], 0, 0 } +#define NPC_GROUP_EXPLICIT_SIZE4(npcs, start, count, battle) { count, (NpcData*) &npcs[start], battle, 0 } +#define NPC_GROUP_EXPLICIT_SIZE5(npcs, start, count, battle, stage) { count, (NpcData*) &npcs[start], battle, stage + 1 } - -#define NO_DROPS { { F16(100), F16(0), 0, F16(0) }, } - -// rename this to NO_DROPS and the above to NO_STAT_DROPS after all map data done -#define NPC_NO_DROPS { \ +#define NO_DROPS { \ .dropFlags = NPC_DROP_FLAG_80, \ - .heartDrops = NO_DROPS, \ - .flowerDrops = NO_DROPS, \ + .heartDrops = { { F16(100), F16(0), 0, F16(0) }, }, \ + .flowerDrops = { { F16(100), F16(0), 0, F16(0) }, }, \ } #define STANDARD_HEART_DROPS(attempts) { \ @@ -169,7 +165,7 @@ typedef struct ItemDrop { /// - Roll generalChance. If it fails, drop 0. /// - Roll chancePerAttempt attempts times. For each success, drop a heart/flower. /// -/// StaticNpc holds a table of StatDrops for each stat (hearts, flowers). All are checked together +/// NpcData holds a table of StatDrops for each stat (hearts, flowers). All are checked together /// and the number of hearts/flowers to drop is the total number of successful attempts for each stat. /// /// Each heart/flower is worth 1 HP and 1 FP respectively, if picked up. @@ -253,7 +249,7 @@ typedef union NpcInitialVars { /* 0x0 */ s32* array; } NpcInitialVars; -typedef struct StaticNpc { +typedef struct NpcData { /* 0x000 */ s32 id; /* 0x004 */ NpcSettings* settings; /* 0x008 */ Vec3f pos; @@ -289,12 +285,12 @@ typedef struct StaticNpc { /* 0x1E4 */ u32 aiFlags; /* 0x1E8 */ s32* extraAnimations; /* 0x1EC */ s32 tattle; -} StaticNpc; // size = 0x1F0 +} NpcData; // size = 0x1F0 /// Zero-terminated. typedef struct NpcGroup { /* 0x00 */ s32 npcCount; - /* 0x04 */ StaticNpc* npcs; + /* 0x04 */ NpcData* npcs; /* 0x08 */ s16 battle; /* 0x0A */ s16 stage; } NpcGroup; // size = 0x0C diff --git a/include/script_api/common.h b/include/script_api/common.h index c922c99f49..4c2c402371 100644 --- a/include/script_api/common.h +++ b/include/script_api/common.h @@ -333,6 +333,7 @@ ApiStatus MakeLocalVertexCopy(Evt* script, s32 isInitialCall); ApiStatus SetCustomGfx(Evt* script, s32 isInitialCall); ApiStatus SetCustomGfxBuilders(Evt* script, s32 isInitialCall); ApiStatus SetModelCustomGfx(Evt* script, s32 isInitialCall); +ApiStatus SetModelTexVariant(Evt* script, s32 isInitialCall); ApiStatus SetNpcPaletteSwapMode(Evt* script, s32 isInitialCall); ApiStatus SetNpcPaletteSwapLower(Evt* script, s32 isInitialCall); ApiStatus SetNpcPaletteSwapping(Evt* script, s32 isInitialCall); diff --git a/include/script_api/macros.h b/include/script_api/macros.h index 392fc9e5b7..9df0f158a5 100644 --- a/include/script_api/macros.h +++ b/include/script_api/macros.h @@ -546,7 +546,7 @@ /// /// EVT_CHILD_THREAD /// EVT_WAIT_SECONDS(1) // child thread will be killed whilst waiting -/// EVT_CALL(SetPlayerPos, 0, -1000, 0) // will not be executed +/// EVT_CALL(SetPlayerPos, NPC_DISPOSE_LOCATION) // will not be executed /// EVT_END_CHILD_THREAD /// EVT_RETURN // parent thread dies /// diff --git a/src/16c8e0.c b/src/16c8e0.c index a61ba939cf..f254767bb8 100644 --- a/src/16c8e0.c +++ b/src/16c8e0.c @@ -1073,9 +1073,9 @@ void btl_save_world_cameras(void) { D_8029EFB0 = playerStatus->position.x; D_8029EFB4 = playerStatus->position.y; D_8029EFB8 = playerStatus->position.z; - playerStatus->position.x = 0.0f; - playerStatus->position.y = -1000.0f; - playerStatus->position.z = 0.0f; + playerStatus->position.x = NPC_DISPOSE_POS_X; + playerStatus->position.y = NPC_DISPOSE_POS_Y; + playerStatus->position.z = NPC_DISPOSE_POS_Z; } void btl_restore_world_cameras(void) { diff --git a/src/182B30.c b/src/182B30.c index c09be0cfc3..bbd0bdbaaf 100644 --- a/src/182B30.c +++ b/src/182B30.c @@ -763,12 +763,12 @@ void appendGfx_npc_actor(s32 isPartner, s32 actorIndex) { if (!(gBattleStatus.flags1 & ACTOR_PART_FLAG_4) && (actor->flags & ACTOR_FLAG_8000000)) { if (actor->disableDismissTimer != 0) { actor->disableDismissTimer--; - actor->disableEffect->data.disableX->pos.y = -1000.0f; + actor->disableEffect->data.disableX->pos.y = NPC_DISPOSE_POS_Y; } else { actor->disableEffect->data.disableX->scale = (actor->scalingFactor * 0.75); } } else { - actor->disableEffect->data.disableX->pos.y = -1000.0f; + actor->disableEffect->data.disableX->pos.y = NPC_DISPOSE_POS_Y; actor->disableDismissTimer = 10; } if (actor->debuff == STATUS_FROZEN) { @@ -780,9 +780,9 @@ void appendGfx_npc_actor(s32 isPartner, s32 actorIndex) { effect->data.icePillar->pos.z = actorPosZ; effect->data.icePillar->scale = actor->size.y / 24.0; } else { - effect->data.icePillar->pos.x = 0.0f; - effect->data.icePillar->pos.y = -1000.0f; - effect->data.icePillar->pos.z = 0.0f; + effect->data.icePillar->pos.x = NPC_DISPOSE_POS_X; + effect->data.icePillar->pos.y = NPC_DISPOSE_POS_Y; + effect->data.icePillar->pos.z = NPC_DISPOSE_POS_Z; } } } else { @@ -1374,12 +1374,12 @@ void appendGfx_player_actor(void* arg0) { if (!(gBattleStatus.flags1 & BS_FLAGS1_4) && (player->flags & ACTOR_FLAG_8000000)) { if (player->disableDismissTimer != 0) { player->disableDismissTimer--; - player->disableEffect->data.disableX->pos.y = -1000.0f; + player->disableEffect->data.disableX->pos.y = NPC_DISPOSE_POS_Y; } else { player->disableEffect->data.disableX->scale = player->scalingFactor * 0.75; } } else { - player->disableEffect->data.disableX->pos.y = -1000.0f; + player->disableEffect->data.disableX->pos.y = NPC_DISPOSE_POS_Y; player->disableDismissTimer = 10; } @@ -1394,7 +1394,7 @@ void appendGfx_player_actor(void* arg0) { } else { effect = battleStatus->waterBlockEffect; effect->data.waterBlock->pos.x = playerPosX; - effect->data.waterBlock->pos.y = -1000.0f; + effect->data.waterBlock->pos.y = NPC_DISPOSE_POS_Y; effect->data.waterBlock->pos.z = playerPosZ; } } @@ -1410,7 +1410,7 @@ void appendGfx_player_actor(void* arg0) { } else { effect = battleStatus->cloudNineEffect; effect->data.endingDecals->pos.x = playerPosX; - effect->data.endingDecals->pos.y = -1000.0f; + effect->data.endingDecals->pos.y = NPC_DISPOSE_POS_Y; effect->data.endingDecals->pos.z = playerPosZ; } } @@ -1425,14 +1425,14 @@ void appendGfx_player_actor(void* arg0) { effect->data.icePillar->pos.z = playerPosZ; effect->data.icePillar->scale = player->size.y / 24.0; } else { - effect->data.icePillar->pos.x = 0.0f; - effect->data.icePillar->pos.y = -1000.0f; - effect->data.icePillar->pos.z = 0.0f; + effect->data.icePillar->pos.x = NPC_DISPOSE_POS_X; + effect->data.icePillar->pos.y = NPC_DISPOSE_POS_Y; + effect->data.icePillar->pos.z = NPC_DISPOSE_POS_Z; } } else { - effect->data.icePillar->pos.x = 0.0f; - effect->data.icePillar->pos.y = -1000.0f; - effect->data.icePillar->pos.z = 0.0f; + effect->data.icePillar->pos.x = NPC_DISPOSE_POS_X; + effect->data.icePillar->pos.y = NPC_DISPOSE_POS_Y; + effect->data.icePillar->pos.z = NPC_DISPOSE_POS_Z; } } else { effect = player->icePillarEffect; diff --git a/src/7B440.c b/src/7B440.c index ae44959bbe..490fdcd820 100644 --- a/src/7B440.c +++ b/src/7B440.c @@ -60,7 +60,7 @@ void reset_player_status(void) { playerStatus->alpha1 = 255; playerStatus->alpha2 = 255; gGameStatusPtr->peachFlags &= ~PEACH_STATUS_FLAG_8; - gGameStatusPtr->peachFlags &= ~PEACH_STATUS_FLAG_HAS_INGREDIENT; + gGameStatusPtr->peachFlags &= ~PEACH_STATUS_FLAG_DEPRESSED; one = 1.0f; @@ -76,7 +76,7 @@ void reset_player_status(void) { } else { playerStatus->colliderHeight = 37; playerStatus->colliderDiameter = 26; - gGameStatusPtr->peachCookingIngredient = 0; + gGameStatusPtr->peachBakingIngredient = 0; } // TODO required to match diff --git a/src/7E9D0.c b/src/7E9D0.c index 1845073e28..10ed607083 100644 --- a/src/7E9D0.c +++ b/src/7E9D0.c @@ -564,7 +564,7 @@ void peach_force_disguise_action(s32 useParasol) { } else { playerStatus->animFlags &= ~PA_FLAG_INVISIBLE; gGameStatusPtr->peachFlags &= ~PEACH_STATUS_FLAG_DISGUISED; - playerStatus->peachDisguise = 0; + playerStatus->peachDisguise = PEACH_DISGUISE_NONE; free_npc_by_index(PeachDisguiseNpcIndex); set_action_state(ACTION_STATE_IDLE); playerStatus->colliderHeight = 55; @@ -622,7 +622,7 @@ Npc* peach_make_disguise_npc(s32 peachDisguise) { Npc* npc; f32 yaw; - if (peachDisguise == 0) { + if (peachDisguise == PEACH_DISGUISE_NONE) { return NULL; } diff --git a/src/EFEB00.c b/src/EFEB00.c deleted file mode 100644 index 4ff4891ede..0000000000 --- a/src/EFEB00.c +++ /dev/null @@ -1,60 +0,0 @@ -#include "dead.h" -#include "common.h" - -// Copy of flo_19 (CE36F0.c) - -#define NAMESPACE EFEB00 - -#include "world/common/atomic/TexturePan.inc.c" - -#include "world/common/todo/DeadUnkFunc1.inc.c" - -#include "world/common/todo/UnkFloatFuncAbs.inc.c" - -ApiStatus func_802404D0_EFEFD0(Evt* script, s32 isInitialCall) { - Bytecode* args = script->ptrReadPos; - s32 var1 = *args++; - s32 var2 = *args++; - - evt_set_variable(script, var1, gPlayerStatus.spriteFacingAngle); - evt_set_variable(script, var2, gPlayerStatus.targetYaw); - - return ApiStatus_DONE2; -} - -ApiStatus func_80240540_EFF040(Evt* script, s32 isInitialCall) { - f32 temp_f20 = evt_get_variable(NULL, script->varTable[2]); - f32 dist = dist2D(0.0f, 0.0f, script->varTable[9], script->varTable[11]); - f32 temp_f22 = clamp_angle(atan2(0.0f, 0.0f, script->varTable[9], script->varTable[11]) - temp_f20); - - temp_f20 = sin_deg(temp_f22); - gPlayerStatus.position.x = (dist * temp_f20) + 0.0f; - gPlayerStatus.position.y = evt_get_variable(NULL, script->varTable[10]) + evt_get_variable(NULL, script->varTable[3]); - temp_f20 = cos_deg(temp_f22); - gPlayerStatus.position.z = 0.0f - (dist * temp_f20); - - return ApiStatus_DONE2; -} - -ApiStatus func_80240660_EFF160(Evt* script, s32 isInitialCall) { - Npc* npc = get_npc_by_index(0); - f32 temp_f20 = evt_get_variable(NULL, script->varTable[2]); - f32 dist = dist2D(0.0f, 0.0f, script->varTable[12], script->varTable[14]); - f32 clamped = clamp_angle(atan2(0.0f, 0.0f, script->varTable[12], script->varTable[14]) - temp_f20); - - temp_f20 = sin_deg(clamped); - npc->pos.x = (dist * temp_f20) + 0.0f; - npc->pos.y = evt_get_variable(NULL, script->varTable[13]) + evt_get_variable(NULL, script->varTable[3]); - temp_f20 = cos_deg(clamped); - npc->pos.z = 0.0f - (dist * temp_f20); - - return ApiStatus_DONE2; -} - -ApiStatus func_80240784_EFF284(Evt* script, s32 isInitialCall) { - set_screen_overlay_params_back(1, script->varTable[0]); - return ApiStatus_DONE2; -} - -#include "common/CosInterpMinMax.inc.c" - diff --git a/src/battle/area_flo/actor/lakitu.c b/src/battle/area_flo/actor/lakitu.c index 4d683808aa..abb73f4f23 100644 --- a/src/battle/area_flo/actor/lakitu.c +++ b/src/battle/area_flo/actor/lakitu.c @@ -377,7 +377,7 @@ EvtScript N(attackSpinyFlip) = { EVT_END }; -Vec3i N(spiny_pos) = { 0, -1000, 0 }; +Vec3i N(spiny_pos) = { NPC_DISPOSE_LOCATION }; Formation N(formation_spiny) = { { .actor = &b_area_flo_spiny, .home = { .vec = &N(spiny_pos) }, .priority = 100, .var0 = 0x00000001, }, diff --git a/src/battle/area_flo2/actor/huff_n_puff.c b/src/battle/area_flo2/actor/huff_n_puff.c index 6fc41ae5c3..cf7d384634 100644 --- a/src/battle/area_flo2/actor/huff_n_puff.c +++ b/src/battle/area_flo2/actor/huff_n_puff.c @@ -542,7 +542,7 @@ EvtScript N(idle) = { EVT_END }; -Vec3i N(tuff_puff_pos) = { 0, -1000, 0 }; +Vec3i N(tuff_puff_pos) = { NPC_DISPOSE_LOCATION }; Formation N(formation_tuff_puff_small) = { { .actor = &b_area_flo2_tuff_puff, .home = { .vec = &N(tuff_puff_pos) }, .priority = 0, }, diff --git a/src/battle/area_flo2/actor/monty_mole_boss.c b/src/battle/area_flo2/actor/monty_mole_boss.c index ca65ee41c1..4a7860d7d3 100644 --- a/src/battle/area_flo2/actor/monty_mole_boss.c +++ b/src/battle/area_flo2/actor/monty_mole_boss.c @@ -186,7 +186,7 @@ ActorBlueprint N(hole) = { .statusMessageOffset = { 10, 20 }, }; -Vec3i N(hole_pos) = { 0, -1000, 0 }; +Vec3i N(hole_pos) = { NPC_DISPOSE_LOCATION }; Formation N(formation_hole_1) = { { .actor = &N(hole), .home = { .vec = &N(hole_pos) }, .priority = 0, }, diff --git a/src/battle/area_jan/actor/jungle_fuzzy.c b/src/battle/area_jan/actor/jungle_fuzzy.c index f34b849518..107eb38222 100644 --- a/src/battle/area_jan/actor/jungle_fuzzy.c +++ b/src/battle/area_jan/actor/jungle_fuzzy.c @@ -827,7 +827,7 @@ EvtScript N(takeTurn_80221628) = { EVT_END }; -Vec3i N(vector3D_80221800) = { 0, -1000, 0 }; +Vec3i N(vector3D_80221800) = { NPC_DISPOSE_LOCATION }; Formation N(specialFormation_8022180C) = { { .actor = &NAMESPACE, .home = { .vec = &N(vector3D_80221800) } }, diff --git a/src/battle/area_jan/actor/spear_guy.c b/src/battle/area_jan/actor/spear_guy.c index 87a09afb0d..f86b1a3398 100644 --- a/src/battle/area_jan/actor/spear_guy.c +++ b/src/battle/area_jan/actor/spear_guy.c @@ -725,7 +725,7 @@ EvtScript N(summonBackup) = { EVT_END }; -Vec3i N(vector3D_8021A8B4) = { 0, -1000, 0 }; +Vec3i N(vector3D_8021A8B4) = { NPC_DISPOSE_LOCATION }; Formation N(specialFormation_8021A8C0) = { { .actor = &NAMESPACE, .home = { .vec = &N(vector3D_8021A8B4) }, .priority = 100, .var0 = 0 }, diff --git a/src/battle/area_kkj/stage/kpa_05.c b/src/battle/area_kkj/stage/kpa_05.c index 0ceaae591e..123a67abb5 100644 --- a/src/battle/area_kkj/stage/kpa_05.c +++ b/src/battle/area_kkj/stage/kpa_05.c @@ -3,7 +3,7 @@ #define NAMESPACE b_area_kkj_kpa_05 -#include "common/UnkLightningFXFunc.inc.c" +#include "world/common/util/SetLightningBoltPurple.inc.c" s32 N(lightningsSettings1)[] = { 0xFFFFFFEA, 0x000000BE, 0xFFFFFFA5, 0xFFFFFFA8, 0x00000015, 0xFFFFFFA5, 0x0000003C, @@ -19,7 +19,7 @@ EvtScript N(createLightnings1) = { EVT_BUF_READ3(LVar0, LVar1, LVar2) EVT_BUF_READ3(LVar3, LVar4, LVar5) EVT_CALL(PlayEffect, EFFECT_LIGHTNING_BOLT, 0, LVar0, LVar1, LVar2, LVar3, LVar4, LVar5, 1, 8, 0, 0, 0, 0) - EVT_CALL(N(UnkLightningFXFunc)) + EVT_CALL(N(SetLightningBoltPurple)) EVT_BUF_READ1(LVar0) EVT_WAIT(LVar0) EVT_END_LOOP @@ -42,7 +42,7 @@ EvtScript N(createLightnings2) = { EVT_BUF_READ3(LVar0, LVar1, LVar2) EVT_BUF_READ3(LVar3, LVar4, LVar5) EVT_CALL(PlayEffect, EFFECT_LIGHTNING_BOLT, 0, LVar0, LVar1, LVar2, LVar3, LVar4, LVar5, 1, 5, 0, 0, 0, 0) - EVT_CALL(N(UnkLightningFXFunc)) + EVT_CALL(N(SetLightningBoltPurple)) EVT_BUF_READ1(LVar0) EVT_WAIT(LVar0) EVT_END_LOOP diff --git a/src/battle/area_kpa2/stage/kpa_03.c b/src/battle/area_kpa2/stage/kpa_03.c index bd5b758038..4505946e52 100644 --- a/src/battle/area_kpa2/stage/kpa_03.c +++ b/src/battle/area_kpa2/stage/kpa_03.c @@ -3,7 +3,7 @@ #define NAMESPACE b_area_kpa2_kpa_03 -#include "common/UnkLightningFXFunc.inc.c" +#include "world/common/util/SetLightningBoltPurple.inc.c" s32 N(lightningsSettings1)[] = { 0xFFFFFFEA, 0x000000BE, 0xFFFFFFA5, 0xFFFFFFA8, 0x00000015, 0xFFFFFFA5, 0x0000003C, @@ -19,7 +19,7 @@ EvtScript N(createLightnings1) = { EVT_BUF_READ3(LVar0, LVar1, LVar2) EVT_BUF_READ3(LVar3, LVar4, LVar5) EVT_CALL(PlayEffect, EFFECT_LIGHTNING_BOLT, 0, LVar0, LVar1, LVar2, LVar3, LVar4, LVar5, 1, 8, 0, 0, 0, 0) - EVT_CALL(N(UnkLightningFXFunc)) + EVT_CALL(N(SetLightningBoltPurple)) EVT_BUF_READ1(LVar0) EVT_WAIT(LVar0) EVT_END_LOOP @@ -42,7 +42,7 @@ EvtScript N(createLightnings2) = { EVT_BUF_READ3(LVar0, LVar1, LVar2) EVT_BUF_READ3(LVar3, LVar4, LVar5) EVT_CALL(PlayEffect, EFFECT_LIGHTNING_BOLT, 0, LVar0, LVar1, LVar2, LVar3, LVar4, LVar5, 1, 5, 0, 0, 0, 0) - EVT_CALL(N(UnkLightningFXFunc)) + EVT_CALL(N(SetLightningBoltPurple)) EVT_BUF_READ1(LVar0) EVT_WAIT(LVar0) EVT_END_LOOP diff --git a/src/battle/area_kpa4/actor/bombshell_bill_blaster.c b/src/battle/area_kpa4/actor/bombshell_bill_blaster.c index 2132a8c526..417615862d 100644 --- a/src/battle/area_kpa4/actor/bombshell_bill_blaster.c +++ b/src/battle/area_kpa4/actor/bombshell_bill_blaster.c @@ -230,7 +230,7 @@ EvtScript N(wait) = { extern ActorBlueprint A(bombshell_bill); -Vec3i N(bill_pos) = { 0, -1000, 0 }; +Vec3i N(bill_pos) = { NPC_DISPOSE_LOCATION }; Formation N(formation_bill) = { { .actor = &A(bombshell_bill), .home = { .vec = &N(bill_pos) }, .priority = 100, }, diff --git a/src/battle/area_mac/actor/lee.c b/src/battle/area_mac/actor/lee.c index d76e22d386..1a20b2e708 100644 --- a/src/battle/area_mac/actor/lee.c +++ b/src/battle/area_mac/actor/lee.c @@ -394,8 +394,8 @@ EvtScript N(8021E118) = { EVT_CALL(HPBarToHome, LVarA) EVT_CALL(SetIdleAnimations, LVarA, 1, EVT_PTR(N(idleAnimations_8021D360))) EVT_CALL(SetAnimation, LVarA, 1, 0xA40002) - EVT_CALL(SetActorPos, ACTOR_SELF, 0, -1000, 0) - EVT_CALL(ForceHomePos, ACTOR_SELF, 0, -1000, 0) + EVT_CALL(SetActorPos, ACTOR_SELF, NPC_DISPOSE_LOCATION) + EVT_CALL(ForceHomePos, ACTOR_SELF, NPC_DISPOSE_LOCATION) EVT_CALL(HPBarToHome, ACTOR_SELF) EVT_CALL(RemoveActor, -127) EVT_RETURN @@ -448,7 +448,7 @@ EvtScript N(8021E5DC) = { EVT_END }; -Vec3i N(vector3D_8021E940) = { 0, -1000, 0 }; +Vec3i N(vector3D_8021E940) = { NPC_DISPOSE_LOCATION }; s32 N(idleAnimations_8021E94C)[] = { STATUS_NORMAL, ANIM_BattleGoombario_Idle, @@ -980,7 +980,7 @@ ApiStatus func_80218DF4_465284(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; EffectInstance* tattleEffect = (EffectInstance*) evt_get_variable(script, *args++); - tattleEffect->data.tattleWindow->pos.y = -1000.0f; + tattleEffect->data.tattleWindow->pos.y = NPC_DISPOSE_POS_Y; return ApiStatus_DONE2; } @@ -4269,8 +4269,8 @@ EvtScript N(copyPartner) = { EVT_CALL(HPBarToHome, LVarA) EVT_CALL(ResetActorSounds, LVarA, 2) EVT_WAIT(20) - EVT_CALL(SetActorPos, ACTOR_SELF, 0, -1000, 0) - EVT_CALL(ForceHomePos, ACTOR_SELF, 0, -1000, 0) + EVT_CALL(SetActorPos, ACTOR_SELF, NPC_DISPOSE_LOCATION) + EVT_CALL(ForceHomePos, ACTOR_SELF, NPC_DISPOSE_LOCATION) EVT_CALL(HPBarToHome, ACTOR_SELF) EVT_CALL(SetActorVar, -127, 8, 1) EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) diff --git a/src/battle/area_mim/actor/forest_fuzzy.c b/src/battle/area_mim/actor/forest_fuzzy.c index f4b11d79d5..f76aa32b52 100644 --- a/src/battle/area_mim/actor/forest_fuzzy.c +++ b/src/battle/area_mim/actor/forest_fuzzy.c @@ -654,7 +654,7 @@ EvtScript N(takeTurn_8021A61C) = { EVT_END }; -Vec3i N(vector3D_8021A7F4) = { 0, -1000, 0 }; +Vec3i N(vector3D_8021A7F4) = { NPC_DISPOSE_LOCATION }; Formation N(specialFormation_8021A800) = { { .actor = &NAMESPACE, .home = { .vec = &N(vector3D_8021A7F4) }}, diff --git a/src/battle/area_pra2/actor/crystal_bit.c b/src/battle/area_pra2/actor/crystal_bit.c index 363b078b25..ead3e8804e 100644 --- a/src/battle/area_pra2/actor/crystal_bit.c +++ b/src/battle/area_pra2/actor/crystal_bit.c @@ -234,7 +234,7 @@ ApiStatus UpdateCrystalBitEffect(Evt* script, s32 isInitialCall) { effect->data.miscParticles->scaleY = actorPart->scale.y * 24.0f; if (actorPart->flags & ACTOR_PART_FLAG_INVISIBLE) { effect->data.miscParticles->pos.x = actor->currentPos.x; - effect->data.miscParticles->pos.y = -1000.0f; + effect->data.miscParticles->pos.y = NPC_DISPOSE_POS_Y; effect->data.miscParticles->pos.z = actor->currentPos.z; } else { effect->data.miscParticles->pos.x = actor->currentPos.x; @@ -246,7 +246,7 @@ ApiStatus UpdateCrystalBitEffect(Evt* script, s32 isInitialCall) { } EvtScript N(idle) = { - EVT_CALL(PlayEffect, EFFECT_MISC_PARTICLES, 1, 0, -1000, 0, 24, 24, EVT_FLOAT(1.0), 5, 0, 0, 0, 0, 0) + EVT_CALL(PlayEffect, EFFECT_MISC_PARTICLES, 1, NPC_DISPOSE_LOCATION, 24, 24, EVT_FLOAT(1.0), 5, 0, 0, 0, 0, 0) EVT_CALL(SetActorVar, ACTOR_SELF, 0, LVarF) EVT_CHILD_THREAD EVT_CALL(UpdateCrystalBitEffect, LVarF) diff --git a/src/battle/area_pra2/actor/crystal_king.c b/src/battle/area_pra2/actor/crystal_king.c index 5710696081..e654c17e97 100644 --- a/src/battle/area_pra2/actor/crystal_king.c +++ b/src/battle/area_pra2/actor/crystal_king.c @@ -1214,7 +1214,7 @@ ActorBlueprint N(clone) = { .statusMessageOffset = { 15, 40 }, }; -Vec3i N(pos_crystal_clone) = { 0, -1000, 0 }; +Vec3i N(pos_crystal_clone) = { NPC_DISPOSE_LOCATION }; Formation N(clone_formation) = { { .actor = &N(clone), .home = { .vec = &N(pos_crystal_clone) }, .priority = 0 }, diff --git a/src/battle/area_tik/stage/tik_05.c b/src/battle/area_tik/stage/tik_05.c index e1039a19f8..637eafaa3c 100644 --- a/src/battle/area_tik/stage/tik_05.c +++ b/src/battle/area_tik/stage/tik_05.c @@ -5,7 +5,6 @@ #define NAMESPACE b_area_tik_tik_05 #include "world/common/atomic/TexturePan.inc.c" -#include "world/common/atomic/TexturePan.data.inc.c" EvtScript N(beforeBattle) = { EVT_CALL(SetSpriteShading, SHADING_NONE) diff --git a/src/battle/area_tik2/stage/tik_05.c b/src/battle/area_tik2/stage/tik_05.c index 1651aeaf2e..f3fa4ba794 100644 --- a/src/battle/area_tik2/stage/tik_05.c +++ b/src/battle/area_tik2/stage/tik_05.c @@ -5,7 +5,6 @@ #define NAMESPACE b_area_tik2_tik_05 #include "world/common/atomic/TexturePan.inc.c" -#include "world/common/atomic/TexturePan.data.inc.c" EvtScript N(beforeBattle) = { EVT_CALL(SetSpriteShading, SHADING_NONE) diff --git a/src/battle/area_tik3/stage/tik_05.c b/src/battle/area_tik3/stage/tik_05.c index 51db9a9ef5..b4473819f3 100644 --- a/src/battle/area_tik3/stage/tik_05.c +++ b/src/battle/area_tik3/stage/tik_05.c @@ -5,7 +5,6 @@ #define NAMESPACE b_area_tik3_tik_05 #include "world/common/atomic/TexturePan.inc.c" -#include "world/common/atomic/TexturePan.data.inc.c" EvtScript N(beforeBattle) = { EVT_CALL(SetSpriteShading, SHADING_NONE) diff --git a/src/battle/area_trd_part_1/actor/bill_blaster.c b/src/battle/area_trd_part_1/actor/bill_blaster.c index 51ab12c335..9b457a7304 100644 --- a/src/battle/area_trd_part_1/actor/bill_blaster.c +++ b/src/battle/area_trd_part_1/actor/bill_blaster.c @@ -243,7 +243,7 @@ EvtScript N(8021A470) = { extern ActorBlueprint A(bullet_bill); -Vec3i N(vector3D_8021A4DC) = { 0, -1000, 0, }; +Vec3i N(vector3D_8021A4DC) = { NPC_DISPOSE_LOCATION, }; Formation N(specialFormation_8021A4E8) = { { .actor = &A(bullet_bill), .home = { .vec = &N(vector3D_8021A4DC) }, .priority = 100 }, diff --git a/src/battle/area_trd_part_2/actor/blue_ninja_koopa.c b/src/battle/area_trd_part_2/actor/blue_ninja_koopa.c index 2507f471cd..dc644e51af 100644 --- a/src/battle/area_trd_part_2/actor/blue_ninja_koopa.c +++ b/src/battle/area_trd_part_2/actor/blue_ninja_koopa.c @@ -675,8 +675,8 @@ EvtScript N(init_8022DC2C) = { EVT_CALL(BindIdle, ACTOR_SELF, EVT_PTR(N(idle_8022DD20))) EVT_CALL(BindHandleEvent, ACTOR_SELF, EVT_PTR(N(handleEvent_8022DD88))) EVT_CALL(BindNextTurn, ACTOR_SELF, EVT_PTR(N(nextTurn_8022E424))) - EVT_CALL(SetActorPos, ACTOR_SELF, 0, -1000, 0) - EVT_CALL(ForceHomePos, ACTOR_SELF, 0, -1000, 0) + EVT_CALL(SetActorPos, ACTOR_SELF, NPC_DISPOSE_LOCATION) + EVT_CALL(ForceHomePos, ACTOR_SELF, NPC_DISPOSE_LOCATION) EVT_CALL(HPBarToHome, ACTOR_SELF) EVT_CALL(SetPartFlagBits, ACTOR_SELF, 1, ACTOR_PART_FLAG_NO_TARGET, 1) EVT_CALL(SetActorVar, ACTOR_SELF, 1, 0) diff --git a/src/battle/area_trd_part_2/actor/green_ninja_koopa.c b/src/battle/area_trd_part_2/actor/green_ninja_koopa.c index 735dd49d6b..6b849827ce 100644 --- a/src/battle/area_trd_part_2/actor/green_ninja_koopa.c +++ b/src/battle/area_trd_part_2/actor/green_ninja_koopa.c @@ -675,8 +675,8 @@ EvtScript N(init_80227CEC) = { EVT_CALL(BindIdle, ACTOR_SELF, EVT_PTR(N(idle_80227DE0))) EVT_CALL(BindHandleEvent, ACTOR_SELF, EVT_PTR(N(handleEvent_80227E48))) EVT_CALL(BindNextTurn, ACTOR_SELF, EVT_PTR(N(nextTurn_802284E4))) - EVT_CALL(SetActorPos, ACTOR_SELF, 0, -1000, 0) - EVT_CALL(ForceHomePos, ACTOR_SELF, 0, -1000, 0) + EVT_CALL(SetActorPos, ACTOR_SELF, NPC_DISPOSE_LOCATION) + EVT_CALL(ForceHomePos, ACTOR_SELF, NPC_DISPOSE_LOCATION) EVT_CALL(HPBarToHome, ACTOR_SELF) EVT_CALL(SetPartFlagBits, ACTOR_SELF, 1, ACTOR_PART_FLAG_NO_TARGET, 1) EVT_CALL(SetActorVar, ACTOR_SELF, 1, 0) diff --git a/src/battle/area_trd_part_2/actor/red_ninja_koopa.c b/src/battle/area_trd_part_2/actor/red_ninja_koopa.c index 658a9fbb12..b2d39d194d 100644 --- a/src/battle/area_trd_part_2/actor/red_ninja_koopa.c +++ b/src/battle/area_trd_part_2/actor/red_ninja_koopa.c @@ -675,8 +675,8 @@ EvtScript N(init_8022AC8C) = { EVT_CALL(BindIdle, ACTOR_SELF, EVT_PTR(N(idle_8022AD80))) EVT_CALL(BindHandleEvent, ACTOR_SELF, EVT_PTR(N(handleEvent_8022ADE8))) EVT_CALL(BindNextTurn, ACTOR_SELF, EVT_PTR(N(nextTurn_8022B484))) - EVT_CALL(SetActorPos, ACTOR_SELF, 0, -1000, 0) - EVT_CALL(ForceHomePos, ACTOR_SELF, 0, -1000, 0) + EVT_CALL(SetActorPos, ACTOR_SELF, NPC_DISPOSE_LOCATION) + EVT_CALL(ForceHomePos, ACTOR_SELF, NPC_DISPOSE_LOCATION) EVT_CALL(HPBarToHome, ACTOR_SELF) EVT_CALL(SetPartFlagBits, ACTOR_SELF, 1, ACTOR_PART_FLAG_NO_TARGET, 1) EVT_CALL(SetActorVar, ACTOR_SELF, 1, 0) diff --git a/src/battle/area_trd_part_2/actor/yellow_ninja_koopa.c b/src/battle/area_trd_part_2/actor/yellow_ninja_koopa.c index 36e11735c5..4b4fad2919 100644 --- a/src/battle/area_trd_part_2/actor/yellow_ninja_koopa.c +++ b/src/battle/area_trd_part_2/actor/yellow_ninja_koopa.c @@ -675,8 +675,8 @@ EvtScript N(init_80230BCC) = { EVT_CALL(BindIdle, ACTOR_SELF, EVT_PTR(N(idle_80230CC0))) EVT_CALL(BindHandleEvent, ACTOR_SELF, EVT_PTR(N(handleEvent_80230D28))) EVT_CALL(BindNextTurn, ACTOR_SELF, EVT_PTR(N(nextTurn_802313C4))) - EVT_CALL(SetActorPos, ACTOR_SELF, 0, -1000, 0) - EVT_CALL(ForceHomePos, ACTOR_SELF, 0, -1000, 0) + EVT_CALL(SetActorPos, ACTOR_SELF, NPC_DISPOSE_LOCATION) + EVT_CALL(ForceHomePos, ACTOR_SELF, NPC_DISPOSE_LOCATION) EVT_CALL(HPBarToHome, ACTOR_SELF) EVT_CALL(SetPartFlagBits, ACTOR_SELF, 1, ACTOR_PART_FLAG_NO_TARGET, 1) EVT_CALL(SetActorVar, ACTOR_SELF, 1, 0) diff --git a/src/battle/common/actor/bandit.inc.c b/src/battle/common/actor/bandit.inc.c index e1e21af49e..dc6c88ca37 100644 --- a/src/battle/common/actor/bandit.inc.c +++ b/src/battle/common/actor/bandit.inc.c @@ -162,7 +162,7 @@ ActorBlueprint N(coin) = { .statusMessageOffset = { 10, 25 }, }; -Vec3i N(coin_pos) = { 0, -1000, 0 }; +Vec3i N(coin_pos) = { NPC_DISPOSE_LOCATION }; Formation N(formation_coin) = { { .actor = &N(coin), .home = { .vec = &N(coin_pos) }}, diff --git a/src/battle/common/actor/duplighost.inc.c b/src/battle/common/actor/duplighost.inc.c index 228dc04a46..cc2880a2cb 100644 --- a/src/battle/common/actor/duplighost.inc.c +++ b/src/battle/common/actor/duplighost.inc.c @@ -375,8 +375,8 @@ EvtScript N(OnHitElectric) = { EVT_CALL(HPBarToHome, LVarA) EVT_CALL(SetIdleAnimations, LVarA, 1, EVT_PTR(N(idleAnimations))) EVT_CALL(SetAnimation, LVarA, 1, ANIM_Duplighost_Anim02) - EVT_CALL(SetActorPos, ACTOR_SELF, 0, -1000, 0) - EVT_CALL(ForceHomePos, ACTOR_SELF, 0, -1000, 0) + EVT_CALL(SetActorPos, ACTOR_SELF, NPC_DISPOSE_LOCATION) + EVT_CALL(ForceHomePos, ACTOR_SELF, NPC_DISPOSE_LOCATION) EVT_CALL(HPBarToHome, ACTOR_SELF) EVT_CALL(RemoveActor, ACTOR_SELF) EVT_RETURN @@ -455,8 +455,8 @@ EvtScript N(OnShockHit) = { EVT_CALL(SetIdleAnimations, LVarA, 1, EVT_PTR(N(idleAnimations))) EVT_CALL(ForceHomePos, LVarA, LVarB, 0, LVarD) EVT_CALL(HPBarToHome, LVarA) - EVT_CALL(SetActorPos, ACTOR_SELF, 0, -1000, 0) - EVT_CALL(ForceHomePos, ACTOR_SELF, 0, -1000, 0) + EVT_CALL(SetActorPos, ACTOR_SELF, NPC_DISPOSE_LOCATION) + EVT_CALL(ForceHomePos, ACTOR_SELF, NPC_DISPOSE_LOCATION) EVT_CALL(HPBarToHome, ACTOR_SELF) EVT_CALL(RemoveActor, ACTOR_SELF) EVT_RETURN @@ -509,7 +509,7 @@ EvtScript N(OnShockDeath) = { EVT_END }; -Vec3i N(pos_summon) = { 0, -1000, 0 }; +Vec3i N(pos_summon) = { NPC_DISPOSE_LOCATION }; #include "ghost_goombario.inc.c" @@ -712,8 +712,8 @@ EvtScript N(copyPartner) = { EVT_CALL(HPBarToHome, LVarA) EVT_CALL(ResetActorSounds, LVarA, 2) EVT_WAIT(20) - EVT_CALL(SetActorPos, ACTOR_SELF, 0, -1000, 0) - EVT_CALL(ForceHomePos, ACTOR_SELF, 0, -1000, 0) + EVT_CALL(SetActorPos, ACTOR_SELF, NPC_DISPOSE_LOCATION) + EVT_CALL(ForceHomePos, ACTOR_SELF, NPC_DISPOSE_LOCATION) EVT_CALL(HPBarToHome, ACTOR_SELF) EVT_CALL(SetActorVar, ACTOR_SELF, 8, 1) EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) diff --git a/src/battle/common/actor/ember.inc.c b/src/battle/common/actor/ember.inc.c index 0510d8379b..8f1053004e 100644 --- a/src/battle/common/actor/ember.inc.c +++ b/src/battle/common/actor/ember.inc.c @@ -281,7 +281,7 @@ EvtScript N(8021B398) = { EVT_END }; -Vec3i N(vector3D_8021B594) = { 0, -1000, 0, }; +Vec3i N(vector3D_8021B594) = { NPC_DISPOSE_LOCATION, }; Formation N(specialFormation_8021B5A0) = { { .actor = &NAMESPACE, .home = { .vec = &N(vector3D_8021B594) }}, diff --git a/src/battle/common/actor/ghost_goombario.inc.c b/src/battle/common/actor/ghost_goombario.inc.c index f895a06afc..74c455bfad 100644 --- a/src/battle/common/actor/ghost_goombario.inc.c +++ b/src/battle/common/actor/ghost_goombario.inc.c @@ -14,7 +14,7 @@ ApiStatus N(UnkTattleEffectFunc1)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; EffectInstance* effect = (EffectInstance*)evt_get_variable(script, *args++); - effect->data.tattleWindow->pos.y = -1000.0f; + effect->data.tattleWindow->pos.y = NPC_DISPOSE_POS_Y; return ApiStatus_DONE2; } diff --git a/src/battle/common/actor/koopatrol.inc.c b/src/battle/common/actor/koopatrol.inc.c index 6e3f48f6a9..00ddac7bc9 100644 --- a/src/battle/common/actor/koopatrol.inc.c +++ b/src/battle/common/actor/koopatrol.inc.c @@ -1043,7 +1043,7 @@ EvtScript N(findTarget) = { EVT_END }; -Vec3i N(summon_pos) = { 0, -1000, 0 }; +Vec3i N(summon_pos) = { NPC_DISPOSE_LOCATION }; Formation N(summon_formation) = { { .actor = &NAMESPACE, .home = { .vec = &N(summon_pos) }, .priority = 100, } diff --git a/src/battle/common/actor/magikoopa.inc.c b/src/battle/common/actor/magikoopa.inc.c index 3b05f9f461..d6e975491b 100644 --- a/src/battle/common/actor/magikoopa.inc.c +++ b/src/battle/common/actor/magikoopa.inc.c @@ -1394,7 +1394,7 @@ ActorBlueprint N(clone_flying) = { .statusMessageOffset = { 1, 34 }, }; -Vec3i N(clone_pos) = { 0, -1000, 0 }; +Vec3i N(clone_pos) = { NPC_DISPOSE_LOCATION }; Formation N(formation_clone) = { { .actor = &N(clone), .home = { .vec = &N(clone_pos) }, .priority = 0, }, diff --git a/src/battle/common/actor/monty_mole.inc.c b/src/battle/common/actor/monty_mole.inc.c index e4f8299a64..d848c96694 100644 --- a/src/battle/common/actor/monty_mole.inc.c +++ b/src/battle/common/actor/monty_mole.inc.c @@ -178,7 +178,7 @@ ActorBlueprint N(hole) = { .statusMessageOffset = { 10, 20 }, }; -Vec3i N(hole_pos) = { 0, -1000, 0, }; +Vec3i N(hole_pos) = { NPC_DISPOSE_LOCATION, }; Formation N(formation_hole_1) = { { .actor = &N(hole), .home = { .vec = &N(hole_pos) },}, diff --git a/src/battle/partner/lakilester.c b/src/battle/partner/lakilester.c index 282da03ad7..faef104d71 100644 --- a/src/battle/partner/lakilester.c +++ b/src/battle/partner/lakilester.c @@ -1461,9 +1461,9 @@ ApiStatus N(ProcessHurricane)(Evt* script, s32 isInitialCall) { sHuffPuffBreathEffect->data.huffPuffBreath->speedX = -2.0f; // looks like this was breath inhale phase, but then the devs removed it - sHuffPuffBreathEffect->data.huffPuffBreath->pos.x = 0.0f; - sHuffPuffBreathEffect->data.huffPuffBreath->pos.y = -1000.0f; - sHuffPuffBreathEffect->data.huffPuffBreath->pos.z = 0.0f; + sHuffPuffBreathEffect->data.huffPuffBreath->pos.x = NPC_DISPOSE_POS_X; + sHuffPuffBreathEffect->data.huffPuffBreath->pos.y = NPC_DISPOSE_POS_Y; + sHuffPuffBreathEffect->data.huffPuffBreath->pos.z = NPC_DISPOSE_POS_Z; if (script->functionTemp[2] != 0) { sfx_play_sound_at_position(SOUND_201E, SOUND_SPACE_MODE_0, partner->currentPos.x, partner->currentPos.y, partner->currentPos.z); @@ -1474,9 +1474,9 @@ ApiStatus N(ProcessHurricane)(Evt* script, s32 isInitialCall) { set_animation(ACTOR_PARTNER, -1, ANIM_BattleLakilester_HurricaneInhale); break; case STATE_DISABLED: - sHuffPuffBreathEffect->data.huffPuffBreath->pos.x = 0.0f; - sHuffPuffBreathEffect->data.huffPuffBreath->pos.y = -1000.0f; - sHuffPuffBreathEffect->data.huffPuffBreath->pos.z = 0.0f; + sHuffPuffBreathEffect->data.huffPuffBreath->pos.x = NPC_DISPOSE_POS_X; + sHuffPuffBreathEffect->data.huffPuffBreath->pos.y = NPC_DISPOSE_POS_Y; + sHuffPuffBreathEffect->data.huffPuffBreath->pos.z = NPC_DISPOSE_POS_Z; break; case STATE_EXHALE: x = partner->currentPos.x; diff --git a/src/battle/partner/watt.c b/src/battle/partner/watt.c index 0fed4d889c..b48d4a604e 100644 --- a/src/battle/partner/watt.c +++ b/src/battle/partner/watt.c @@ -49,7 +49,7 @@ ApiStatus N(WattFXUpdate)(Evt* script, s32 isInitialCall) { sWattEffectData_isActive = TRUE; sWattEffectData_currentEffectIndex = 0; sWattEffectData_effect1 = fx_static_status(0, partner->currentPos.x, partner->currentPos.y, partner->currentPos.z, 1.0f, 5, 0); - sWattEffectData_effect2 = fx_static_status(1, partner->currentPos.x, -1000.0f, partner->currentPos.z, 1.0f, 5, 0); + sWattEffectData_effect2 = fx_static_status(1, partner->currentPos.x, NPC_DISPOSE_POS_Y, partner->currentPos.z, 1.0f, 5, 0); sWattEffectData_initialized = TRUE; } @@ -67,7 +67,7 @@ ApiStatus N(WattFXUpdate)(Evt* script, s32 isInitialCall) { y = partner->currentPos.y + partner->headOffset.y + partner->unk_19A + 12.0f; z = partner->currentPos.z + partner->headOffset.z; if ((gBattleStatus.flags2 & (BS_FLAGS2_10 | BS_FLAGS2_4)) == BS_FLAGS2_4) { - y = -1000.0f; + y = NPC_DISPOSE_POS_Y; } if (sWattEffectData_isActive) { diff --git a/src/battle/star/up_and_away/7952E0.c b/src/battle/star/up_and_away/7952E0.c index b448790101..a7c16b9834 100644 --- a/src/battle/star/up_and_away/7952E0.c +++ b/src/battle/star/up_and_away/7952E0.c @@ -383,7 +383,7 @@ EvtScript N(usePower) = { EVT_CALL(SetActorScale, LVarA, LVar0, LVar0, LVar0) EVT_WAIT(1) EVT_END_LOOP - EVT_CALL(SetActorPos, LVarA, 0, -1000, 0) + EVT_CALL(SetActorPos, LVarA, NPC_DISPOSE_LOCATION) EVT_CALL(GetActorPos, LVarA, LVar0, LVar1, LVar2) EVT_LOOP(10) EVT_CALL(PlayEffect, 0x11, 1, LVar0, LVar1, LVar2, 20, 0, 0, 0, 0, 0, 0, 0, 0) diff --git a/src/collision.c b/src/collision.c index f76e70887a..abe4e70024 100644 --- a/src/collision.c +++ b/src/collision.c @@ -32,13 +32,7 @@ typedef struct HitAssetCollider { /* 0x08 */ s32 trianglesOffset; } HitAssetCollider; // size = 0x0C -typedef struct VertexIndexStruct { - /* 0x00 */ s16 i1; - /* 0x02 */ s16 i2; - /* 0x04 */ s16 i3; -} VertexIndexStruct; // size = 0x06 - -extern VertexIndexStruct gEntityColliderFaces[]; +extern Vec3s gEntityColliderFaces[]; extern Vec3f gEntityColliderNormals[]; extern f32 gCollisionRayStartX; extern f32 gCollisionRayStartY; @@ -1017,9 +1011,9 @@ s32 test_ray_entities(f32 startX, f32 startY, f32 startZ, f32 dirX, f32 dirY, f3 startZ - entity->position.z, &gCollisionRayStartX, &gCollisionRayStartY, &gCollisionRayStartZ); for (j = 0; j < 12; j++) { - Vec3f* v1 = triangle->v1 = &boxVertices[gEntityColliderFaces[j].i1]; - Vec3f* v2 = triangle->v2 = &boxVertices[gEntityColliderFaces[j].i2]; - Vec3f* v3 = triangle->v3 = &boxVertices[gEntityColliderFaces[j].i3]; + Vec3f* v1 = triangle->v1 = &boxVertices[gEntityColliderFaces[j].x]; + Vec3f* v2 = triangle->v2 = &boxVertices[gEntityColliderFaces[j].y]; + Vec3f* v3 = triangle->v3 = &boxVertices[gEntityColliderFaces[j].z]; triangle->e13.x = v3->x - v1->x; triangle->e13.y = v3->y - v1->y; triangle->e13.z = v3->z - v1->z; diff --git a/src/common/ActorJumpToPos.inc.c b/src/common/ActorJumpToPos.inc.c index ec63aa4e5c..9f6088ed65 100644 --- a/src/common/ActorJumpToPos.inc.c +++ b/src/common/ActorJumpToPos.inc.c @@ -1,6 +1,6 @@ #include "common.h" -ApiStatus N(ActorJumpToPos)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(ActorJumpToPos)) { Actor* actor = get_actor(script->owner1.actorID); Vec3f* temp_f0 = &actor->state.currentPos; diff --git a/src/common/AddFP.inc.c b/src/common/AddFP.inc.c index 4e3b8f59a0..390a1986ac 100644 --- a/src/common/AddFP.inc.c +++ b/src/common/AddFP.inc.c @@ -1,6 +1,6 @@ #include "common.h" -ApiStatus N(AddFP)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(AddFP)) { PlayerData* playerData = &gPlayerData; s32 amt = evt_get_variable(script, *script->ptrReadPos); diff --git a/src/common/AddHP.inc.c b/src/common/AddHP.inc.c index d8d8a93d92..c9ab190896 100644 --- a/src/common/AddHP.inc.c +++ b/src/common/AddHP.inc.c @@ -1,6 +1,6 @@ #include "common.h" -ApiStatus N(AddHP)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(AddHP)) { PlayerData* playerData = &gPlayerData; s32 amt = evt_get_variable(script, *script->ptrReadPos); diff --git a/src/common/CalculateArcsinDeg.inc.c b/src/common/CalculateArcsinDeg.inc.c index 958da5a9ff..8d7314e9d9 100644 --- a/src/common/CalculateArcsinDeg.inc.c +++ b/src/common/CalculateArcsinDeg.inc.c @@ -53,7 +53,7 @@ u32 N(ArcsinDeg)(f32 x, f32 y) { return ret; } -ApiStatus N(CalculateArcsinDeg)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(CalculateArcsinDeg)) { Bytecode* args = script->ptrReadPos; s32 x1 = evt_get_variable(script, *args++); s32 y1 = evt_get_variable(script, *args++); diff --git a/src/common/CanPlayerLoseAction.inc.c b/src/common/CanPlayerLoseAction.inc.c index 9a8e9e6f56..8b6e05eeda 100644 --- a/src/common/CanPlayerLoseAction.inc.c +++ b/src/common/CanPlayerLoseAction.inc.c @@ -1,6 +1,6 @@ #include "common.h" -ApiStatus N(CanPlayerLoseAction)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(CanPlayerLoseAction)) { BattleStatus* battleStatus = &gBattleStatus; Bytecode* args = script->ptrReadPos; diff --git a/src/common/ChompChainInit.inc.c b/src/common/ChompChainInit.inc.c index 0fc2b4d6e6..eadbea4b99 100644 --- a/src/common/ChompChainInit.inc.c +++ b/src/common/ChompChainInit.inc.c @@ -1,6 +1,6 @@ #include "common.h" -ApiStatus N(ChompChainInit)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(ChompChainInit)) { Actor* actor = get_actor(script->owner1.actorID); ActorPart* actorPart; ChompChainAnimationState* it; diff --git a/src/common/CompareFloats.inc.c b/src/common/CompareFloats.inc.c index f42789cc82..5104264c64 100644 --- a/src/common/CompareFloats.inc.c +++ b/src/common/CompareFloats.inc.c @@ -1,6 +1,6 @@ #include "common.h" -ApiStatus N(CompareFloats)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(CompareFloats)) { Bytecode* args = script->ptrReadPos; f32 temp_f20 = evt_get_float_variable(script, *args++); f32 temp = evt_get_float_variable(script, *args++); diff --git a/src/common/CosInterpMinMax.inc.c b/src/common/CosInterpMinMax.inc.c index efa0086a01..736cd274a0 100644 --- a/src/common/CosInterpMinMax.inc.c +++ b/src/common/CosInterpMinMax.inc.c @@ -1,7 +1,7 @@ #include "common.h" #include "npc.h" -ApiStatus N(CosInterpMinMax)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(CosInterpMinMax)) { Bytecode* args = script->ptrReadPos; s32 outVarTime = *args++; s32 time = evt_get_variable(script, outVarTime); diff --git a/src/common/DisableRandomAbility.inc.c b/src/common/DisableRandomAbility.inc.c index 5e46a1b2da..d45fdd4beb 100644 --- a/src/common/DisableRandomAbility.inc.c +++ b/src/common/DisableRandomAbility.inc.c @@ -8,7 +8,7 @@ s32 N(jump_icons)[] = { ITEM_BOOTS1_ICON, ITEM_BOOTS2_ICON, ITEM_BOOTS3_ICON }; s32 N(jump_text)[] = { 76, 77, 78 }; -ApiStatus N(DisableRandomAbility)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(DisableRandomAbility)) { Bytecode* args = script->ptrReadPos; BattleStatus* battleStatus = &gBattleStatus; PlayerData* playerData = &gPlayerData; diff --git a/src/common/Dist3D.inc.c b/src/common/Dist3D.inc.c index 6eb1c5aa23..4ef5e18312 100644 --- a/src/common/Dist3D.inc.c +++ b/src/common/Dist3D.inc.c @@ -1,6 +1,6 @@ #include "common.h" -ApiStatus N(Dist3D)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(Dist3D)) { Bytecode* args = script->ptrReadPos; s32 var1 = evt_get_variable(script, *args++); s32 var2 = evt_get_variable(script, *args++); diff --git a/src/common/DivActorLevel4.inc.c b/src/common/DivActorLevel4.inc.c index 862398a93a..efa37cc146 100644 --- a/src/common/DivActorLevel4.inc.c +++ b/src/common/DivActorLevel4.inc.c @@ -1,7 +1,7 @@ #include "common.h" #include "battle/battle.h" -ApiStatus N(DivActorLevel4)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(DivActorLevel4)) { ActorBlueprint* actorData = get_actor(script->owner1.actorID)->actorBlueprint; actorData->level /= 4; diff --git a/src/common/FadeBackgroundToBlack.inc.c b/src/common/FadeBackgroundToBlack.inc.c index a61ef9b874..0c7fa9d771 100644 --- a/src/common/FadeBackgroundToBlack.inc.c +++ b/src/common/FadeBackgroundToBlack.inc.c @@ -2,7 +2,7 @@ #include "model.h" #include "npc.h" -ApiStatus N(FadeBackgroundToBlack)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(FadeBackgroundToBlack)) { if (isInitialCall) { mdl_set_all_fog_mode(FOG_MODE_1); *gBackgroundFogModePtr = FOG_MODE_1; diff --git a/src/common/FoliageTransform.inc.c b/src/common/FoliageTransform.inc.c index d1b08821b9..577b5421e4 100644 --- a/src/common/FoliageTransform.inc.c +++ b/src/common/FoliageTransform.inc.c @@ -50,7 +50,7 @@ void N(foliage_setup_shear_mtx)(Matrix4f mtx, f32 scale, f32 xAmount, f32 zAmoun /// @apiparam float dx /// @apiparam float dy /// @apiparam float dz -ApiStatus N(TransformFoliage)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(TransformFoliage)) { Bytecode* args = script->ptrReadPos; s32 modelListIndex = get_model_list_index_from_tree_index(evt_get_variable(script, *args++)); f32 scale = evt_get_float_variable(script, *args++); diff --git a/src/common/FreeIcon.inc.c b/src/common/FreeIcon.inc.c index 0113b07435..46ea2d2723 100644 --- a/src/common/FreeIcon.inc.c +++ b/src/common/FreeIcon.inc.c @@ -1,7 +1,7 @@ #include "common.h" #include "npc.h" -ApiStatus N(FreeIcon)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(FreeIcon)) { hud_element_free(evt_get_variable(script, *script->ptrReadPos)); return ApiStatus_DONE2; } diff --git a/src/common/GetBootsHammerLevel.inc.c b/src/common/GetBootsHammerLevel.inc.c index 3c681c9964..b742588d82 100644 --- a/src/common/GetBootsHammerLevel.inc.c +++ b/src/common/GetBootsHammerLevel.inc.c @@ -1,6 +1,6 @@ #include "common.h" -ApiStatus N(GetBootsHammerLevel)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(GetBootsHammerLevel)) { Bytecode* args = script->ptrReadPos; evt_set_variable(script, *args++, gPlayerData.bootsLevel); diff --git a/src/common/GetItemEntityPosition.inc.c b/src/common/GetItemEntityPosition.inc.c index f600cf4768..ddecfe1f24 100644 --- a/src/common/GetItemEntityPosition.inc.c +++ b/src/common/GetItemEntityPosition.inc.c @@ -1,7 +1,7 @@ #include "common.h" #include "npc.h" -ApiStatus N(GetItemEntityPosition)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(GetItemEntityPosition)) { Bytecode* args = script->ptrReadPos; ItemEntity* entity = get_item_entity(evt_get_variable(script, *args++)); diff --git a/src/common/GetJumpHammerCharge.inc.c b/src/common/GetJumpHammerCharge.inc.c index 958d457d71..f31e5e2721 100644 --- a/src/common/GetJumpHammerCharge.inc.c +++ b/src/common/GetJumpHammerCharge.inc.c @@ -1,6 +1,6 @@ #include "common.h" -ApiStatus N(GetJumpHammerCharge)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(GetJumpHammerCharge)) { Bytecode* args = script->ptrReadPos; evt_set_variable(script, *args++, gBattleStatus.jumpCharge); diff --git a/src/common/GetLastActorEventType.inc.c b/src/common/GetLastActorEventType.inc.c index 973ca8a899..1b35f7a812 100644 --- a/src/common/GetLastActorEventType.inc.c +++ b/src/common/GetLastActorEventType.inc.c @@ -1,7 +1,7 @@ #include "common.h" #include "npc.h" -ApiStatus N(GetLastActorEventType)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(GetLastActorEventType)) { Bytecode* args = script->ptrReadPos; Actor* actor = get_actor(script->owner1.actorID); diff --git a/src/common/GetLastEventType.inc.c b/src/common/GetLastEventType.inc.c index c881671374..c959a24eb9 100644 --- a/src/common/GetLastEventType.inc.c +++ b/src/common/GetLastEventType.inc.c @@ -1,6 +1,6 @@ #include "common.h" -ApiStatus N(GetLastEventType)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(GetLastEventType)) { Bytecode* args = script->ptrReadPos; Actor* actor = get_actor(script->owner1.actorID); diff --git a/src/common/GetModelPos.inc.c b/src/common/GetModelPos.inc.c index bfd59c602b..d647d579cc 100644 --- a/src/common/GetModelPos.inc.c +++ b/src/common/GetModelPos.inc.c @@ -1,7 +1,7 @@ #include "common.h" #include "model.h" -ApiStatus N(GetModelPos)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(GetModelPos)) { Model* model = get_model_from_list_index(get_model_list_index_from_tree_index(script->varTable[10])); script->varTable[11] = (s32) model->center.x; diff --git a/src/common/GetPlayerHpPercent.inc.c b/src/common/GetPlayerHpPercent.inc.c index 57f1a512d5..6ce7181ef8 100644 --- a/src/common/GetPlayerHpPercent.inc.c +++ b/src/common/GetPlayerHpPercent.inc.c @@ -1,6 +1,6 @@ #include "common.h" -ApiStatus N(GetPlayerHpPercent)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(GetPlayerHpPercent)) { evt_set_variable(script, *script->ptrReadPos, (gPlayerData.curHP * 100) / gPlayerData.curMaxHP); return ApiStatus_DONE2; } diff --git a/src/common/GetSelectedMoveID.inc.c b/src/common/GetSelectedMoveID.inc.c index 7d46af3fe1..23369ee76b 100644 --- a/src/common/GetSelectedMoveID.inc.c +++ b/src/common/GetSelectedMoveID.inc.c @@ -1,7 +1,7 @@ #include "common.h" #include "npc.h" -ApiStatus N(GetSelectedMoveID)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(GetSelectedMoveID)) { evt_set_variable(script, *script->ptrReadPos, gBattleStatus.selectedMoveID); return ApiStatus_DONE2; } diff --git a/src/common/IsAOrBPressed.inc.c b/src/common/IsAOrBPressed.inc.c index a773961d30..bca75ff966 100644 --- a/src/common/IsAOrBPressed.inc.c +++ b/src/common/IsAOrBPressed.inc.c @@ -1,6 +1,6 @@ #include "common.h" -ApiStatus N(IsAOrBPressed)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(IsAOrBPressed)) { script->varTable[0] = FALSE; if (gGameStatusPtr->pressedButtons[0] & BUTTON_A) { script->varTable[0] = TRUE; diff --git a/src/common/ItemEntityJumpToPos.inc.c b/src/common/ItemEntityJumpToPos.inc.c index 6e9a734cd9..6323ceda9a 100644 --- a/src/common/ItemEntityJumpToPos.inc.c +++ b/src/common/ItemEntityJumpToPos.inc.c @@ -1,6 +1,6 @@ #include "common.h" -ApiStatus N(ItemEntityJumpToPos)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(ItemEntityJumpToPos)) { struct { /* 0x00 */ Vec3f pos; /* 0x0C */ f32 moveAngle; diff --git a/src/common/MediGuySpriteRotationFunc.inc.c b/src/common/MediGuySpriteRotationFunc.inc.c index 0adb5affa9..5d71eb7a12 100644 --- a/src/common/MediGuySpriteRotationFunc.inc.c +++ b/src/common/MediGuySpriteRotationFunc.inc.c @@ -1,5 +1,5 @@ // outputs z sprite rotation -ApiStatus N(MediGuySpriteRotationFunc)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(MediGuySpriteRotationFunc)) { Bytecode* args = script->ptrReadPos; s32 angle = evt_get_variable(script, *args++); diff --git a/src/common/RemoveChillOut.inc.c b/src/common/RemoveChillOut.inc.c index aa6d9af4d2..788854bc9d 100644 --- a/src/common/RemoveChillOut.inc.c +++ b/src/common/RemoveChillOut.inc.c @@ -1,7 +1,7 @@ #include "common.h" #include "map.h" -ApiStatus N(RemoveChillOut)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(RemoveChillOut)) { Actor* actor = get_actor(script->owner1.actorID); s32 hudElementDataIndex = actor->hudElementDataIndex; diff --git a/src/common/Set80071270_0_16.inc.c b/src/common/Set80071270_0_16.inc.c index 483567c26e..eceb8b6322 100644 --- a/src/common/Set80071270_0_16.inc.c +++ b/src/common/Set80071270_0_16.inc.c @@ -1,7 +1,7 @@ #include "common.h" #include "effects.h" -ApiStatus N(Set80071270_0_16)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(Set80071270_0_16)) { fx_snowfall(0, 0x10); return ApiStatus_DONE2; } diff --git a/src/common/Set80218630_Var0.inc.c b/src/common/Set80218630_Var0.inc.c index 8d1e4eebb9..57639ccd66 100644 --- a/src/common/Set80218630_Var0.inc.c +++ b/src/common/Set80218630_Var0.inc.c @@ -3,7 +3,7 @@ extern s16 D_802809F8; -ApiStatus N(Set80218630_Var0)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(Set80218630_Var0)) { D_802809F8 = script->varTable[0]; return ApiStatus_DONE2; } diff --git a/src/common/SetAngleClamped.inc.c b/src/common/SetAngleClamped.inc.c index 100a03b986..9ac922f726 100644 --- a/src/common/SetAngleClamped.inc.c +++ b/src/common/SetAngleClamped.inc.c @@ -1,6 +1,6 @@ #include "common.h" -ApiStatus N(SetAngleClamped)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(SetAngleClamped)) { Bytecode* args = script->ptrReadPos; s32 var = *args++; f32 x1 = evt_get_float_variable(script, *args++); diff --git a/src/common/SetBackgroundAlpha.inc.c b/src/common/SetBackgroundAlpha.inc.c index 15afa04659..56a7be1198 100644 --- a/src/common/SetBackgroundAlpha.inc.c +++ b/src/common/SetBackgroundAlpha.inc.c @@ -1,7 +1,7 @@ #include "common.h" #include "model.h" -ApiStatus N(SetBackgroundAlpha)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(SetBackgroundAlpha)) { Bytecode* args = script->ptrReadPos; set_background_color_blend(0, 0, 0, evt_get_variable(script, *args++)); diff --git a/src/common/SetNpcCollision32.inc.c b/src/common/SetNpcCollision32.inc.c index 9a340ec650..1f42a84348 100644 --- a/src/common/SetNpcCollision32.inc.c +++ b/src/common/SetNpcCollision32.inc.c @@ -1,6 +1,6 @@ #include "common.h" -ApiStatus N(SetNpcCollision32)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(SetNpcCollision32)) { Npc* npc = get_npc_unsafe(100); npc->collisionHeight = 32; diff --git a/src/common/SetNpcPosYaw.inc.c b/src/common/SetNpcPosYaw.inc.c index 489425f1bc..9544ec10ea 100644 --- a/src/common/SetNpcPosYaw.inc.c +++ b/src/common/SetNpcPosYaw.inc.c @@ -1,6 +1,6 @@ #include "common.h" -ApiStatus N(SetNpcPosYaw)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(SetNpcPosYaw)) { Bytecode* args = script->ptrReadPos; s32 npcID = evt_get_variable(script, *args++); f32 x = evt_get_float_variable(script, *args++); diff --git a/src/common/SetPlayerStatusPosYaw.inc.c b/src/common/SetPlayerStatusPosYaw.inc.c index 70d3e860fa..78b45f020b 100644 --- a/src/common/SetPlayerStatusPosYaw.inc.c +++ b/src/common/SetPlayerStatusPosYaw.inc.c @@ -1,6 +1,6 @@ #include "common.h" -ApiStatus N(SetPlayerStatusPosYaw)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(SetPlayerStatusPosYaw)) { Bytecode* args = script->ptrReadPos; f32 x = evt_get_float_variable(script, *args++); f32 y = evt_get_float_variable(script, *args++); diff --git a/src/common/SetSpinSmashable.inc.c b/src/common/SetSpinSmashable.inc.c index ef748a92e6..09519db455 100644 --- a/src/common/SetSpinSmashable.inc.c +++ b/src/common/SetSpinSmashable.inc.c @@ -1,7 +1,7 @@ #include "common.h" #include "battle/battle.h" -ApiStatus N(SetSpinSmashable)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(SetSpinSmashable)) { s32 canSpinSmash = evt_get_variable(script, *script->ptrReadPos); Actor* actor = get_actor(script->owner1.actorID); diff --git a/src/common/ShrinkActor.inc.c b/src/common/ShrinkActor.inc.c index 38d08a08a8..56487875c3 100644 --- a/src/common/ShrinkActor.inc.c +++ b/src/common/ShrinkActor.inc.c @@ -1,7 +1,7 @@ #include "common.h" #include "effects.h" -ApiStatus N(ShrinkActor)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(ShrinkActor)) { Bytecode* args = script->ptrReadPos; f32 var1 = evt_get_float_variable(script, *args++); f32 var2 = evt_get_float_variable(script, *args++); diff --git a/src/common/SpitInk.inc.c b/src/common/SpitInk.inc.c index bef0edfdf3..3ecc72989b 100644 --- a/src/common/SpitInk.inc.c +++ b/src/common/SpitInk.inc.c @@ -1,7 +1,7 @@ #include "common.h" #include "effects.h" -ApiStatus N(SpitInk)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(SpitInk)) { Bytecode* args = script->ptrReadPos; EffectInstance* effect; f32 temp_f28; diff --git a/src/common/SpyGuyActionFunc.inc.c b/src/common/SpyGuyActionFunc.inc.c index 2f648307f8..7a1fa78c1b 100644 --- a/src/common/SpyGuyActionFunc.inc.c +++ b/src/common/SpyGuyActionFunc.inc.c @@ -1,6 +1,6 @@ #include "common.h" -ApiStatus N(SpyGuyActionFunc)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(SpyGuyActionFunc)) { BattleStatus* status = &gBattleStatus; Bytecode* args = script->ptrReadPos; diff --git a/src/common/StarPower.inc.c b/src/common/StarPower.inc.c index e1832ce4dc..aaf88afa4b 100644 --- a/src/common/StarPower.inc.c +++ b/src/common/StarPower.inc.c @@ -1,7 +1,7 @@ #include "common.h" #include "effects.h" -ApiStatus N(UnkStarFunc1)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(UnkStarFunc1)) { Bytecode* args = script->ptrReadPos; s32 a = evt_get_variable(script, *args++); s32 b = evt_get_variable(script, *args++); @@ -11,7 +11,7 @@ ApiStatus N(UnkStarFunc1)(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -ApiStatus N(UnkStarFunc2)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(UnkStarFunc2)) { Bytecode* args = script->ptrReadPos; s32 a = evt_get_variable(script, *args++); s32 b = evt_get_variable(script, *args++); @@ -21,7 +21,7 @@ ApiStatus N(UnkStarFunc2)(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -ApiStatus N(UnkStarFunc3)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(UnkStarFunc3)) { Bytecode* args = script->ptrReadPos; s32 a = evt_get_variable(script, *args++); s32 b = evt_get_variable(script, *args++); @@ -31,7 +31,7 @@ ApiStatus N(UnkStarFunc3)(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -ApiStatus N(UnkStarFunc4)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(UnkStarFunc4)) { Bytecode* args = script->ptrReadPos; s32 var1 = evt_get_variable(script, *args++); s32 var2 = evt_get_variable(script, *args++); diff --git a/src/common/StarRodAppearEffect.inc.c b/src/common/StarRodAppearEffect.inc.c index bdf8f3e324..1ed08c0d0f 100644 --- a/src/common/StarRodAppearEffect.inc.c +++ b/src/common/StarRodAppearEffect.inc.c @@ -17,7 +17,7 @@ typedef struct StarOutlineState { /* 0x38 */ s32 effectEnded; } StarOutlineState; // size = 0x3C -ApiStatus N(StarRodAppearEffect)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(StarRodAppearEffect)) { Bytecode* args = script->ptrReadPos; Actor* actor = get_actor(script->owner1.actorID); s32 i; diff --git a/src/common/StarRodPowerUpEffect.inc.c b/src/common/StarRodPowerUpEffect.inc.c index a379d79af2..26e2d12621 100644 --- a/src/common/StarRodPowerUpEffect.inc.c +++ b/src/common/StarRodPowerUpEffect.inc.c @@ -15,7 +15,7 @@ typedef struct StarOutlineState2 { /* 0x30 */ s32 effectEnded; } StarOutlineState2; // size = 0x34 -ApiStatus N(StarRodPowerUpEffect)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(StarRodPowerUpEffect)) { Bytecode* args = script->ptrReadPos; Actor* actor = get_actor(script->owner1.actorID); s32 i; diff --git a/src/common/StartRumbleWithParams.inc.c b/src/common/StartRumbleWithParams.inc.c index 46a40a6a28..091385fa9b 100644 --- a/src/common/StartRumbleWithParams.inc.c +++ b/src/common/StartRumbleWithParams.inc.c @@ -1,7 +1,7 @@ #include "common.h" #include "npc.h" -ApiStatus N(StartRumbleWithParams)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(StartRumbleWithParams)) { Bytecode* args = script->ptrReadPos; start_rumble(evt_get_variable(script, *args++), evt_get_variable(script, *args++)); diff --git a/src/common/UnfadeBackgroundToBlack.inc.c b/src/common/UnfadeBackgroundToBlack.inc.c index 11d69c345c..9f2f98c93b 100644 --- a/src/common/UnfadeBackgroundToBlack.inc.c +++ b/src/common/UnfadeBackgroundToBlack.inc.c @@ -2,7 +2,7 @@ #include "model.h" #include "map.h" -ApiStatus N(UnfadeBackgroundToBlack)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(UnfadeBackgroundToBlack)) { if (isInitialCall) { script->functionTemp[0] = 20; } diff --git a/src/common/UnkActorPosFunc.inc.c b/src/common/UnkActorPosFunc.inc.c index 6f423ba161..dc72e0a093 100644 --- a/src/common/UnkActorPosFunc.inc.c +++ b/src/common/UnkActorPosFunc.inc.c @@ -1,6 +1,6 @@ #include "battle/battle.h" -ApiStatus N(UnkActorPosFunc)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(UnkActorPosFunc)) { Actor* actor = get_actor(script->owner1.actorID); ActorState* actorState = &actor->state; diff --git a/src/common/UnkActorSizeFunc.inc.c b/src/common/UnkActorSizeFunc.inc.c index dfc84f8379..b321952c86 100644 --- a/src/common/UnkActorSizeFunc.inc.c +++ b/src/common/UnkActorSizeFunc.inc.c @@ -1,6 +1,6 @@ #include "battle/battle.h" -ApiStatus N(UnkActorSizeFunc)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(UnkActorSizeFunc)) { Actor* actor = get_actor(script->owner1.actorID); Actor* targetActor = get_actor(actor->targetActorID); s16 targetActorSizeX; diff --git a/src/common/UnkAngleFunc2.inc.c b/src/common/UnkAngleFunc2.inc.c index 2b20bc125b..78d2ec018f 100644 --- a/src/common/UnkAngleFunc2.inc.c +++ b/src/common/UnkAngleFunc2.inc.c @@ -2,7 +2,7 @@ // TODO: this include should have some scripts; see area_kmr_part_1/stage/kmr_03.c -ApiStatus N(UnkAngleFunc2)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(UnkAngleFunc2)) { Bytecode* args = script->ptrReadPos; f32 var0 = evt_get_variable(script, *args++) / 10.0; s32 a3 = *args++; diff --git a/src/common/UnkBackgroundFunc.inc.c b/src/common/UnkBackgroundFunc.inc.c index 8d7367a0ee..908070fffe 100644 --- a/src/common/UnkBackgroundFunc.inc.c +++ b/src/common/UnkBackgroundFunc.inc.c @@ -1,7 +1,7 @@ #include "common.h" #include "model.h" -ApiStatus N(UnkBackgroundFunc)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(UnkBackgroundFunc)) { if (isInitialCall) { script->functionTemp[0] = 20; } diff --git a/src/common/UnkBackgroundFunc2.inc.c b/src/common/UnkBackgroundFunc2.inc.c index bd19dcad94..7617594c07 100644 --- a/src/common/UnkBackgroundFunc2.inc.c +++ b/src/common/UnkBackgroundFunc2.inc.c @@ -1,7 +1,7 @@ #include "common.h" #include "model.h" -ApiStatus N(UnkBackgroundFunc2)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(UnkBackgroundFunc2)) { if (isInitialCall) { mdl_set_all_fog_mode(FOG_MODE_1); *gBackgroundFogModePtr = FOG_MODE_1; diff --git a/src/common/UnkBackgroundFunc3.inc.c b/src/common/UnkBackgroundFunc3.inc.c index 87a797dcff..0cd37ab62c 100644 --- a/src/common/UnkBackgroundFunc3.inc.c +++ b/src/common/UnkBackgroundFunc3.inc.c @@ -1,7 +1,7 @@ #include "common.h" #include "model.h" -ApiStatus N(UnkBackgroundFunc3)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(UnkBackgroundFunc3)) { mdl_set_all_fog_mode(FOG_MODE_1); *gBackgroundFogModePtr = FOG_MODE_1; set_background_color_blend(0, 0, 0, 0); diff --git a/src/common/UnkBattleFunc1.inc.c b/src/common/UnkBattleFunc1.inc.c index 4a6065b130..5471fdfe8f 100644 --- a/src/common/UnkBattleFunc1.inc.c +++ b/src/common/UnkBattleFunc1.inc.c @@ -1,6 +1,6 @@ #include "battle/battle.h" -ApiStatus N(UnkBattleFunc1)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(UnkBattleFunc1)) { Bytecode* args = script->ptrReadPos; s32 var0 = evt_get_variable(script, *args++); s32 var1 = evt_get_variable(script, *args++); diff --git a/src/common/UnkBattleFunc2.inc.c b/src/common/UnkBattleFunc2.inc.c index b3a705c220..aa6bd04b40 100644 --- a/src/common/UnkBattleFunc2.inc.c +++ b/src/common/UnkBattleFunc2.inc.c @@ -1,7 +1,7 @@ #include "common.h" #include "npc.h" -ApiStatus N(UnkBattleFunc2)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(UnkBattleFunc2)) { Bytecode* args = script->ptrReadPos; s32 x = evt_get_variable(script, *args++); s32 y = evt_get_variable(script, *args++); @@ -12,7 +12,7 @@ ApiStatus N(UnkBattleFunc2)(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -ApiStatus N(UnkBattleFunc2_2)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(UnkBattleFunc2_2)) { Bytecode* args = script->ptrReadPos; s32 x = evt_get_variable(script, *args++); s32 y = evt_get_variable(script, *args++); diff --git a/src/common/UnkBattleFunc5.inc.c b/src/common/UnkBattleFunc5.inc.c index 1e5b2b0b9d..2dc497b257 100644 --- a/src/common/UnkBattleFunc5.inc.c +++ b/src/common/UnkBattleFunc5.inc.c @@ -1,6 +1,6 @@ #include "common.h" -ApiStatus N(UnkBattleFunc5)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(UnkBattleFunc5)) { Bytecode* args = script->ptrReadPos; s32 actorID = evt_get_variable(script, *args++); s32 partID = evt_get_variable(script, *args++); diff --git a/src/common/UnkBowserFunc1.inc.c b/src/common/UnkBowserFunc1.inc.c index a561e414e7..9661e5e831 100644 --- a/src/common/UnkBowserFunc1.inc.c +++ b/src/common/UnkBowserFunc1.inc.c @@ -7,7 +7,7 @@ #define BOWSER_FLAG_TOCHECK ACTOR_EVENT_FLAG_80000 #endif -ApiStatus N(UnkBowserFunc1)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(UnkBowserFunc1)) { Actor* actor = get_actor(script->owner1.actorID); ActorPart* part; s32 i, j; diff --git a/src/common/UnkEffect6CFunc.inc.c b/src/common/UnkEffect6CFunc.inc.c index 837001caf9..28f0a6b189 100644 --- a/src/common/UnkEffect6CFunc.inc.c +++ b/src/common/UnkEffect6CFunc.inc.c @@ -1,7 +1,7 @@ #include "battle/battle.h" #include "effects.h" -ApiStatus N(UnkEffect6CFunc)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(UnkEffect6CFunc)) { Bytecode* args = script->ptrReadPos; evt_set_variable(script, *args++, (s32) fx_tattle_window(0, 106.0f, 144.0f, 0, 1.0f, 0)); diff --git a/src/common/UnkEffect6FFunc.inc.c b/src/common/UnkEffect6FFunc.inc.c index 182db24c4b..9ef388b4e9 100644 --- a/src/common/UnkEffect6FFunc.inc.c +++ b/src/common/UnkEffect6FFunc.inc.c @@ -1,7 +1,7 @@ #include "battle/battle.h" #include "effects.h" -ApiStatus N(UnkEffect6FFunc)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(UnkEffect6FFunc)) { Bytecode* args = script->ptrReadPos; EffectInstance* effect; s32 unused_var = evt_get_variable(script, *args++); diff --git a/src/common/UnkEnemyPosFunc.inc.c b/src/common/UnkEnemyPosFunc.inc.c index a8955dfdf4..a05e0596b3 100644 --- a/src/common/UnkEnemyPosFunc.inc.c +++ b/src/common/UnkEnemyPosFunc.inc.c @@ -1,6 +1,6 @@ #include "common.h" -ApiStatus N(UnkEnemyPosFunc)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(UnkEnemyPosFunc)) { Bytecode* args = script->ptrReadPos; Vec3f temp; Vec3f homePoses[4]; diff --git a/src/common/UnkFireBreathFXFunc.inc.c b/src/common/UnkFireBreathFXFunc.inc.c index 08edd54fab..91c2ec8e2b 100644 --- a/src/common/UnkFireBreathFXFunc.inc.c +++ b/src/common/UnkFireBreathFXFunc.inc.c @@ -1,7 +1,7 @@ #include "common.h" #include "effects.h" -ApiStatus N(UnkFireBreathFXFunc)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(UnkFireBreathFXFunc)) { Bytecode* args = script->ptrReadPos; EffectInstance* effect = (EffectInstance*) evt_get_variable(script, *args++); FireBreathFXData* data = effect->data.fireBreath; diff --git a/src/common/UnkFloatFunc005.inc.c b/src/common/UnkFloatFunc005.inc.c index d91c1d034d..dd50b91545 100644 --- a/src/common/UnkFloatFunc005.inc.c +++ b/src/common/UnkFloatFunc005.inc.c @@ -1,7 +1,7 @@ #include "common.h" #include "battle/battle.h" -ApiStatus N(UnkFloatFunc005)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(UnkFloatFunc005)) { Bytecode* args = script->ptrReadPos; #ifdef AVOID_UB f32 vt0 = 0.0f; diff --git a/src/common/UnkFloatFunc2.inc.c b/src/common/UnkFloatFunc2.inc.c index 8f8f6ff568..1d70b62c4d 100644 --- a/src/common/UnkFloatFunc2.inc.c +++ b/src/common/UnkFloatFunc2.inc.c @@ -1,7 +1,7 @@ #include "common.h" #include "npc.h" -ApiStatus N(UnkFloatFunc2)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(UnkFloatFunc2)) { Bytecode* args = script->ptrReadPos; s32 var0 = evt_get_variable(script, *args++); s32 a1 = *args++; diff --git a/src/common/UnkFloatFunc3.inc.c b/src/common/UnkFloatFunc3.inc.c index 8c5e7a617d..5977969641 100644 --- a/src/common/UnkFloatFunc3.inc.c +++ b/src/common/UnkFloatFunc3.inc.c @@ -1,7 +1,7 @@ #include "common.h" #include "battle/battle.h" -ApiStatus N(UnkFloatFunc3)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(UnkFloatFunc3)) { Bytecode* args = script->ptrReadPos; s32 destBytecode1; s32 destBytecode2; diff --git a/src/common/UnkFogFunc.inc.c b/src/common/UnkFogFunc.inc.c index cadbb68c7d..c5d293be3b 100644 --- a/src/common/UnkFogFunc.inc.c +++ b/src/common/UnkFogFunc.inc.c @@ -1,6 +1,6 @@ #include "common.h" -ApiStatus N(UnkFogFunc)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(UnkFogFunc)) { set_world_fog_dist(980, 1000); set_world_fog_color(15, 5, 55, 255); enable_world_fog(); diff --git a/src/common/UnkFogFunc2.inc.c b/src/common/UnkFogFunc2.inc.c index 1d5d5ebc62..03e751530c 100644 --- a/src/common/UnkFogFunc2.inc.c +++ b/src/common/UnkFogFunc2.inc.c @@ -1,6 +1,6 @@ #include "common.h" -ApiStatus N(UnkFogFunc2)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(UnkFogFunc2)) { enable_world_fog(); set_world_fog_dist(950, 1000); set_world_fog_color(16, 16, 16, 255); diff --git a/src/common/UnkLightningBoltFxFunc1.inc.c b/src/common/UnkLightningBoltFxFunc1.inc.c index 78cb9787e8..8723f373ed 100644 --- a/src/common/UnkLightningBoltFxFunc1.inc.c +++ b/src/common/UnkLightningBoltFxFunc1.inc.c @@ -10,7 +10,7 @@ typedef struct FxLightningBoltState { /* 0x1C */ s32 duration; } FxLightningBoltState; // size = 0x20 -ApiStatus N(UnkLightningBoltFxFunc1)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(UnkLightningBoltFxFunc1)) { Bytecode* args = script->ptrReadPos; Actor* actor = get_actor(script->owner1.actorID); s32 i; diff --git a/src/common/UnkLightningFXFunc.inc.c b/src/common/UnkLightningFXFunc.inc.c deleted file mode 100644 index a2f7131236..0000000000 --- a/src/common/UnkLightningFXFunc.inc.c +++ /dev/null @@ -1,15 +0,0 @@ -#include "common.h" -#include "effects.h" - -ApiStatus N(UnkLightningFXFunc)(Evt* script, s32 isInitialCall) { - EffectInstance* effect = (EffectInstance*)script->varTable[15]; - - effect->data.any[12] = 85; - effect->data.any[13] = 42; - effect->data.any[14] = 255; - effect->data.any[16] = 255; - effect->data.any[17] = 175; - effect->data.any[18] = 239; - - return ApiStatus_DONE2; -} diff --git a/src/common/UnkModelStuff2.inc.c b/src/common/UnkModelStuff2.inc.c index ded54a7044..2f59d9a314 100644 --- a/src/common/UnkModelStuff2.inc.c +++ b/src/common/UnkModelStuff2.inc.c @@ -1,6 +1,6 @@ #include "common.h" -ApiStatus N(UnkFloatFunc005)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(UnkFloatFunc005)) { Bytecode* args = script->ptrReadPos; #ifdef AVOID_UB f32 vt0 = 0.0f; diff --git a/src/common/UnkSfxFunc.inc.c b/src/common/UnkSfxFunc.inc.c index 3676942f34..fe64116623 100644 --- a/src/common/UnkSfxFunc.inc.c +++ b/src/common/UnkSfxFunc.inc.c @@ -1,6 +1,6 @@ #include "common.h" -ApiStatus N(UnkSfxFunc)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(UnkSfxFunc)) { Actor* actor = get_actor(script->owner1.actorID); f32 distX; f32 distY; diff --git a/src/common/UnkStarFunc.inc.c b/src/common/UnkStarFunc.inc.c index 52659fe5d9..6d1c11085a 100644 --- a/src/common/UnkStarFunc.inc.c +++ b/src/common/UnkStarFunc.inc.c @@ -1,6 +1,6 @@ #include "common.h" -ApiStatus N(UnkStarFunc)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(UnkStarFunc)) { PlayerData* playerData = &gPlayerData; Bytecode* args = script->ptrReadPos; diff --git a/src/common/UnkWhirlwindEffectFunc.inc.c b/src/common/UnkWhirlwindEffectFunc.inc.c index abd03a7a58..f0574085a1 100644 --- a/src/common/UnkWhirlwindEffectFunc.inc.c +++ b/src/common/UnkWhirlwindEffectFunc.inc.c @@ -3,7 +3,7 @@ BSS PlayerStatus N(effectUnk); -ApiStatus N(UnkWhirlwindEffectFunc)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(UnkWhirlwindEffectFunc)) { Bytecode* args = script->ptrReadPos; s32 var1 = evt_get_variable(script, *args++); s32 var2 = evt_get_variable(script, *args++); diff --git a/src/de740_len_23f0.c b/src/de740_len_23f0.c index 4e81e68d40..8bcd08ae76 100644 --- a/src/de740_len_23f0.c +++ b/src/de740_len_23f0.c @@ -26,8 +26,8 @@ void clear_sprite_shading_data(void) { init_sprite_shading_data(); for (i = 0; i < ARRAY_COUNT(D_80151328->sources); i++) { - D_80151328->sources[i].flags = 0; - D_801512B0->sources[i].flags = 0; + D_80151328->sources[i].flags = LIGHT_SOURCE_DISABLED; + D_801512B0->sources[i].flags = LIGHT_SOURCE_DISABLED; } D_80151328->flags = 0; @@ -80,12 +80,12 @@ void create_shading_palette(Matrix4f mtx, s32 uls, s32 ult, s32 lrs, s32 lrt, s3 f32 temp_f10; f32 temp_f12; f32 temp_f16; - f32 temp_f20; - f32 temp_f26, temp_f24, temp_f22; + f32 distSq; + f32 dx, dy, dz; f32 temp_f6; f32 var_f0_2; - f32 var_f2; - f32 var_f8; + f32 dist; + f32 intensityScale; f32 temp3; f32 qx, qy, qz; f32 wx, wy, wz; @@ -128,51 +128,51 @@ void create_shading_palette(Matrix4f mtx, s32 uls, s32 ult, s32 lrs, s32 lrt, s3 for (i = 0; i < ARRAY_COUNT(D_80151328->sources); i++) { lightSource = &D_80151328->sources[i]; - if (lightSource->flags & 1) { - temp_f26 = sp54 - lightSource->pos.x; - temp_f24 = sp58 - lightSource->pos.y; - temp_f22 = sp5C - lightSource->pos.z; + if (lightSource->flags & LIGHT_SOURCE_ENABLED) { + dx = sp54 - lightSource->pos.x; + dy = sp58 - lightSource->pos.y; + dz = sp5C - lightSource->pos.z; - temp_f20 = SQ(temp_f26) + SQ(temp_f24) + SQ(temp_f22); + distSq = SQ(dx) + SQ(dy) + SQ(dz); - if (temp_f20 != 0.0f) { - var_f2 = sqrtf(temp_f20); - var_f0_2 = 1.0f / var_f2; + if (distSq != 0.0f) { + dist = sqrtf(distSq); + var_f0_2 = 1.0f / dist; } else { - var_f2 = 0.0f; + dist = 0.0f; var_f0_2 = 0.0f; } - temp_f26 *= var_f0_2; - temp_f24 *= var_f0_2; - temp_f22 *= var_f0_2; + dx *= var_f0_2; + dy *= var_f0_2; + dz *= var_f0_2; - if ((lightSource->flags & 4)) { - if ((var_f2 == 0.0f) && (lightSource->falloff == 0.0f)) { - var_f8 = 1.0f; + if ((lightSource->flags & LIGHT_SOURCE_LINEAR_FALLOFF)) { + if ((dist == 0.0f) && (lightSource->falloff == 0.0f)) { + intensityScale = 1.0f; } else { - var_f8 = 1.0f / (var_f2 * lightSource->falloff); - temp_f26 *= var_f8; - temp_f24 *= var_f8; - temp_f22 *= var_f8; + intensityScale = 1.0f / (dist * lightSource->falloff); + dx *= intensityScale; + dy *= intensityScale; + dz *= intensityScale; } } else { - if ((lightSource->flags & 8) && (temp_f20 != 0.0f || lightSource->falloff != 0.0f)) { - var_f8 = 1.0f / (temp_f20 * lightSource->falloff); - temp_f26 *= var_f8; - temp_f24 *= var_f8; - temp_f22 *= var_f8; + if ((lightSource->flags & LIGHT_SOURCE_QUADRATIC_FALLOFF) && (distSq != 0.0f || lightSource->falloff != 0.0f)) { + intensityScale = 1.0f / (distSq * lightSource->falloff); + dx *= intensityScale; + dy *= intensityScale; + dz *= intensityScale; } else { - var_f8 = 1.0f; + intensityScale = 1.0f; } } - if (var_f8 > 1.0f) { - var_f8 = 1.0f; + if (intensityScale > 1.0f) { + intensityScale = 1.0f; } - shadowX += temp_f26; - shadowY += temp_f24; - shadowZ += temp_f22; + shadowX += dx; + shadowY += dy; + shadowZ += dz; if (sp60 < 0.0f) { ex = sp64; @@ -183,7 +183,7 @@ void create_shading_palette(Matrix4f mtx, s32 uls, s32 ult, s32 lrs, s32 lrt, s3 ey = var_f30; ez = sp68; } - temp_f10 = ex * temp_f26 + ey * temp_f24 + ez * temp_f22; + temp_f10 = ex * dx + ey * dy + ez * dz; if (sp60 < 0.0f) { wx = sp68; @@ -194,11 +194,11 @@ void create_shading_palette(Matrix4f mtx, s32 uls, s32 ult, s32 lrs, s32 lrt, s3 wy = var_f30; wz = -sp64; } - temp3 = wx * temp_f26 + wy * temp_f24 + wz * temp_f22; + temp3 = wx * dx + wy * dy + wz * dz; temp_f16 = temp3; - temp_f12 = var_f8 * fabsf(temp_f10); - temp_f6 = var_f8 * fabsf(temp_f16); + temp_f12 = intensityScale * fabsf(temp_f10); + temp_f6 = intensityScale * fabsf(temp_f16); if (temp_f10 > 0.0f) { sp78 += lightSource->rgb.r * temp_f12; sp7C += lightSource->rgb.g * temp_f12; diff --git a/src/effects/firework_rocket.c b/src/effects/firework_rocket.c index 3de5599e40..a4969b9911 100644 --- a/src/effects/firework_rocket.c +++ b/src/effects/firework_rocket.c @@ -197,7 +197,7 @@ void firework_rocket_update(EffectInstance* effect) { data->rocketZ[i] += data->rocketVelocityZ[i]; data->rocketVelocityY[i] -= 0.15; if (lifeTime >= 27) { - data->rocketY[i] = -1000.0f; + data->rocketY[i] = NPC_DISPOSE_POS_Y; } } diff --git a/src/effects/stars_orbiting.c b/src/effects/stars_orbiting.c index a6941c7e60..5bceb691c9 100644 --- a/src/effects/stars_orbiting.c +++ b/src/effects/stars_orbiting.c @@ -14,12 +14,12 @@ void func_E005E318(EffectInstance* effect); void func_E005E334(EffectInstance* effect); void stars_orbiting_main( - s32 arg0, - f32 arg1, - f32 arg2, - f32 arg3, - f32 arg4, - s32 arg5, + s32 type, + f32 posX, + f32 posY, + f32 posZ, + f32 radius, + s32 numStars, EffectInstance** outEffect ) { EffectBlueprint bp; @@ -27,7 +27,7 @@ void stars_orbiting_main( StarsOrbitingFXData* part; s32 i; - arg5++; + numStars++; bp.init = stars_orbiting_init; bp.update = stars_orbiting_update; @@ -37,30 +37,30 @@ void stars_orbiting_main( bp.effectID = EFFECT_STARS_ORBITING; effect = shim_create_effect_instance(&bp); - effect->numParts = arg5; - part = effect->data.starsOrbiting = shim_general_heap_malloc(arg5 * sizeof(*part)); + effect->numParts = numStars; + part = effect->data.starsOrbiting = shim_general_heap_malloc(numStars * sizeof(*part)); ASSERT(effect->data.starsOrbiting != NULL); - shim_mem_clear(part, arg5 * sizeof(*part)); + shim_mem_clear(part, numStars * sizeof(*part)); - part->unk_00 = arg0; - part->pos.x = arg1; - part->pos.y = arg2; - part->pos.z = arg3; - part->unk_10 = 0; - part->unk_24 = 0; - part->unk_14 = arg4; - part->unk_28 = 1; + part->type = type; + part->pos.x = posX; + part->pos.y = posY; + part->pos.z = posZ; + part->orbitRadius = 0; + part->yaw = 0; + part->targetRadius = radius; + part->enabled = TRUE; part++; - for (i = 1; i < arg5; i++, part++) { + for (i = 1; i < numStars; i++, part++) { part->pos.x = 0; part->pos.y = 0; part->pos.z = 0; - part->unk_18 = (i - 1) * 360 / (arg5 - 1); - part->unk_1C = 20.0f; - part->unk_20 = 0; - part->unk_24 = (i - 1) * 360 / (arg5 - 1); + part->roll = (i - 1) * 360 / (numStars - 1); + part->rollSpinRate = 20.0f; + part->pitch = 0; + part->yaw = (i - 1) * 360 / (numStars - 1); } *outEffect = effect; @@ -71,24 +71,24 @@ void stars_orbiting_init(EffectInstance* effect) { void stars_orbiting_update(EffectInstance* effect) { StarsOrbitingFXData* part = effect->data.starsOrbiting; - f32 unk_10; + f32 radius; s32 i; - if (part->unk_28 != 0) { - part->unk_24++; - part->unk_10 += (part->unk_14 - part->unk_10) * 0.1; - unk_10 = part->unk_10; + if (part->enabled) { + part->yaw++; + part->orbitRadius += (part->targetRadius - part->orbitRadius) * 0.1; + radius = part->orbitRadius; part++; for (i = 1; i < effect->numParts; i++, part++) { - part->pos.x = unk_10 * shim_sin_deg(part->unk_24); - part->pos.z = unk_10 * shim_cos_deg(part->unk_24) * shim_cos_deg(part->unk_20); - part->pos.y = unk_10 * shim_cos_deg(part->unk_24) * shim_sin_deg(part->unk_20); - part->unk_18 += part->unk_1C; - part->unk_20 = 0.0f; - part->unk_24 += 16; - if (part->unk_24 > 360) { - part->unk_24 -= 360; + part->pos.x = radius * shim_sin_deg(part->yaw); + part->pos.z = radius * shim_cos_deg(part->yaw) * shim_cos_deg(part->pitch); + part->pos.y = radius * shim_cos_deg(part->yaw) * shim_sin_deg(part->pitch); + part->roll += part->rollSpinRate; + part->pitch = 0.0f; + part->yaw += 16; + if (part->yaw > 360) { + part->yaw -= 360; } } } @@ -108,7 +108,7 @@ void func_E005E334(EffectInstance* effect) { Matrix4f sp98; s32 i; - if (part->unk_28 != 0) { + if (part->enabled) { Gfx* dlist = D_E005E670[0]; Gfx* dlist2 = D_E005E674[0]; @@ -127,7 +127,7 @@ void func_E005E334(EffectInstance* effect) { part++; for (i = 1; i < effect->numParts; i++, part++) { shim_guTranslateF(sp18, part->pos.x, part->pos.y, part->pos.z); - shim_guRotateF(sp58, part->unk_18, 0.0f, 0.0f, 1.0f); + shim_guRotateF(sp58, part->roll, 0.0f, 0.0f, 1.0f); shim_guMtxCatF(sp58, sp18, sp18); shim_guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); diff --git a/src/encounter.c b/src/encounter.c index 9c7715fb66..fd749b3e2d 100644 --- a/src/encounter.c +++ b/src/encounter.c @@ -2390,7 +2390,7 @@ void create_encounters(void) { s32 npcCount; NpcSettings* npcSettings; - StaticNpc* npcData; + NpcData* npcData; Enemy* enemy; Encounter* encounter; Evt* script; diff --git a/src/evt/map_api.c b/src/evt/map_api.c index 6e1070ba6e..f035f448d1 100644 --- a/src/evt/map_api.c +++ b/src/evt/map_api.c @@ -170,18 +170,21 @@ ApiStatus SetModelCustomGfx(Evt* script, s32 isInitialCall) { ApiStatus SetModelTexVariant(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - Bytecode treeIndex = evt_get_variable(script, *args++); - Bytecode var2 = evt_get_variable(script, *args++); + Bytecode modelID = evt_get_variable(script, *args++); + Bytecode variation = evt_get_variable(script, *args++); + s32 modelIndex = get_model_list_index_from_tree_index(modelID); + Model* model = get_model_from_list_index(modelIndex); - get_model_from_list_index(get_model_list_index_from_tree_index(treeIndex))->textureVariation = var2; + model->textureVariation = variation; return ApiStatus_DONE2; } ApiStatus EnableTexPanning(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - s32 treeIndex = evt_get_variable(script, *args++); + s32 modelID = evt_get_variable(script, *args++); s32 flag = evt_get_variable(script, *args++); - Model* model = get_model_from_list_index(get_model_list_index_from_tree_index(treeIndex)); + s32 modelIndex = get_model_list_index_from_tree_index(modelID); + Model* model = get_model_from_list_index(modelIndex); if (flag) { model->flags |= MODEL_FLAG_HAS_TEX_PANNER; @@ -193,9 +196,9 @@ ApiStatus EnableTexPanning(Evt* script, s32 isInitialCall) { ApiStatus EnableModel(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - s32 listIndex = get_model_list_index_from_tree_index(evt_get_variable(script, *args++)); + s32 modelIndex = get_model_list_index_from_tree_index(evt_get_variable(script, *args++)); Bytecode flag = evt_get_variable(script, *args++); - Model* model = get_model_from_list_index(listIndex); + Model* model = get_model_from_list_index(modelIndex); if (flag != 0) { model->flags &= ~MODEL_FLAG_ENABLED; diff --git a/src/world/action/idle.c b/src/world/action/idle.c index db1fba304c..1e5782c21e 100644 --- a/src/world/action/idle.c +++ b/src/world/action/idle.c @@ -111,8 +111,8 @@ void action_update_idle_peach(void) { playerStatus->flags &= ~PS_FLAG_AIRBORNE; if (!(playerStatus->animFlags & PA_FLAG_INVISIBLE)) { - if (!(gGameStatusPtr->peachFlags & PEACH_STATUS_FLAG_HAS_INGREDIENT)) { - suggest_player_anim_clearUnkFlag(IdlePeachAnims[gGameStatusPtr->peachCookingIngredient]); + if (!(gGameStatusPtr->peachFlags & PEACH_STATUS_FLAG_DEPRESSED)) { + suggest_player_anim_clearUnkFlag(IdlePeachAnims[gGameStatusPtr->peachBakingIngredient]); } else { suggest_player_anim_clearUnkFlag(ANIM_Peach_C000E); } diff --git a/src/world/action/sneaky_parasol.c b/src/world/action/sneaky_parasol.c index a50a26e0a3..d97ea2a744 100644 --- a/src/world/action/sneaky_parasol.c +++ b/src/world/action/sneaky_parasol.c @@ -46,7 +46,7 @@ Npc* parasol_get_npc(void) { f32 angle; Npc* ret = NULL; do { // TODO fix this do...while - if (playerStatus->availableDisguiseType != 0) { + if (playerStatus->availableDisguiseType != PEACH_DISGUISE_NONE) { if (gGameStatusPtr->peachFlags & PEACH_STATUS_FLAG_8) { gGameStatusPtr->peachFlags &= ~PEACH_STATUS_FLAG_8; } else { diff --git a/src/world/action/step_up.c b/src/world/action/step_up.c index 61bc02ad6c..d4d8cd4cc5 100644 --- a/src/world/action/step_up.c +++ b/src/world/action/step_up.c @@ -78,8 +78,8 @@ void action_update_step_up(void) { void func_802B6198_E24768(void) { if (!(gPlayerStatus.animFlags & PA_FLAG_INVISIBLE)) { - if (!(gGameStatusPtr->peachFlags & PEACH_STATUS_FLAG_HAS_INGREDIENT)) { - suggest_player_anim_clearUnkFlag((StepUpPeachAnims)[gGameStatusPtr->peachCookingIngredient]); + if (!(gGameStatusPtr->peachFlags & PEACH_STATUS_FLAG_DEPRESSED)) { + suggest_player_anim_clearUnkFlag(StepUpPeachAnims[gGameStatusPtr->peachBakingIngredient]); } else { suggest_player_anim_clearUnkFlag(ANIM_Peach_D000D); } diff --git a/src/world/action/walk.c b/src/world/action/walk.c index d1f531e176..ba67bb8de3 100644 --- a/src/world/action/walk.c +++ b/src/world/action/walk.c @@ -206,8 +206,8 @@ void action_update_run(void) { void func_802B6550_E23C30(void) { if (!(gPlayerStatus.animFlags & PA_FLAG_INVISIBLE)) { - if (!(gGameStatusPtr->peachFlags & PEACH_STATUS_FLAG_HAS_INGREDIENT)) { - suggest_player_anim_clearUnkFlag(WalkPeachAnims[gGameStatusPtr->peachCookingIngredient]); + if (!(gGameStatusPtr->peachFlags & PEACH_STATUS_FLAG_DEPRESSED)) { + suggest_player_anim_clearUnkFlag(WalkPeachAnims[gGameStatusPtr->peachBakingIngredient]); return; } suggest_player_anim_clearUnkFlag(ANIM_Peach_D000D); @@ -244,7 +244,7 @@ static void action_update_walk_peach(void) { } playerStatus->targetYaw = angle; - if (gGameStatusPtr->peachCookingIngredient == 0 && sqrtf(SQ(playerStatus->stickAxis[0]) + SQ(playerStatus->stickAxis[1])) > 55.0f) { + if (gGameStatusPtr->peachBakingIngredient == 0 && sqrtf(SQ(playerStatus->stickAxis[0]) + SQ(playerStatus->stickAxis[1])) > 55.0f) { set_action_state(ACTION_STATE_RUN); return; } @@ -267,11 +267,11 @@ static void action_update_run_peach(void) { if (!(playerStatus->animFlags & PA_FLAG_INVISIBLE)) { gameStatus = gGameStatusPtr; - if (!(gameStatus->peachFlags & PEACH_STATUS_FLAG_HAS_INGREDIENT)) { - if (!gameStatus->peachCookingIngredient) { + if (!(gameStatus->peachFlags & PEACH_STATUS_FLAG_DEPRESSED)) { + if (!gameStatus->peachBakingIngredient) { suggest_player_anim_clearUnkFlag(ANIM_Peach_A0003); } else { - suggest_player_anim_clearUnkFlag(WalkPeachAnims[gameStatus->peachCookingIngredient]); + suggest_player_anim_clearUnkFlag(WalkPeachAnims[gameStatus->peachBakingIngredient]); } } else { suggest_player_anim_clearUnkFlag(ANIM_Peach_D000D); diff --git a/src/world/actions.c b/src/world/actions.c index ce3b73064d..95fb3f87fa 100644 --- a/src/world/actions.c +++ b/src/world/actions.c @@ -2,6 +2,10 @@ #include "ld_addrs.h" #include "actions.h" +#include "sprite/npc/WorldClubba.h" +#include "sprite/npc/WorldKoopatrol.h" +#include "sprite/npc/HammerBros.h" + void action_update_idle(void); void action_update_walk(void); void action_update_run(void); @@ -51,20 +55,90 @@ s16 FootstepSoundSelector = 0; s32 D_800F7B84[] = { 0, 0, 0}; f32 LastMidairPlayerVelY = 0.0; -AnimID ClubbaDisguiseExtraAnims[] = { 0x00390000, 0x00390002, 0x00390003, 0x00390004, 0x00390005, 0x00390008, 0x00390007, 0x00390013, 0x00390014, ANIM_LIST_END }; - -AnimID HammerBroDisguiseExtraAnims[] = { 0x005A0000, 0x005A0002, 0x005A0003, 0x005A0004, 0x005A0006, 0x005A0007, 0x005A0009, 0x005A000A, 0x005A000B, 0x005A001A, ANIM_LIST_END }; - -AnimID KoopatrolDisguiseExtraAnims[] = { 0x00580000, 0x00580001, 0x00580002, 0x00580004, 0x00580005, 0x00580006, 0x00580007, 0x00580008, 0x00580009, 0x00580012, 0x00580014, 0x0058001B, ANIM_LIST_END }; - -DisguiseAnims BasicPeachDisguiseAnims[4] = { - {0x00580001, 0x00580004, 0x00580006, 0x00580008, 0x00580000, 0x0058001B}, - {0x00580001, 0x00580004, 0x00580006, 0x00580008, 0x00580000, 0x0058001B}, - {0x005A0003, 0x005A0006, 0x005A0009, 0x005A000B, 0x005A0000, 0x005A001A}, - {0x00390002, 0x00390003, 0x00390004, 0x00390005, 0x00390000, 0x00390014}, +AnimID ClubbaDisguiseExtraAnims[] = { + ANIM_WorldClubba_Anim00, + ANIM_WorldClubba_Anim02, + ANIM_WorldClubba_Anim03, + ANIM_WorldClubba_Anim04, + ANIM_WorldClubba_Anim05, + ANIM_WorldClubba_Anim08, + ANIM_WorldClubba_Anim07, + ANIM_WorldClubba_Anim13, + ANIM_WorldClubba_Anim14, + ANIM_LIST_END }; -AnimID* PeachDisguiseExtraAnims[4] = { KoopatrolDisguiseExtraAnims, KoopatrolDisguiseExtraAnims, HammerBroDisguiseExtraAnims, ClubbaDisguiseExtraAnims }; +AnimID HammerBroDisguiseExtraAnims[] = { + ANIM_HammerBros_Anim00, + ANIM_HammerBros_Anim02, + ANIM_HammerBros_Anim03, + ANIM_HammerBros_Anim04, + ANIM_HammerBros_Anim06, + ANIM_HammerBros_Anim07, + ANIM_HammerBros_Anim09, + ANIM_HammerBros_Anim0A, + ANIM_HammerBros_Anim0B, + ANIM_HammerBros_Anim1A, + ANIM_LIST_END +}; + +AnimID KoopatrolDisguiseExtraAnims[] = { + ANIM_WorldKoopatrol_Anim00, + ANIM_WorldKoopatrol_Anim01, + ANIM_WorldKoopatrol_Anim02, + ANIM_WorldKoopatrol_Anim04, + ANIM_WorldKoopatrol_Anim05, + ANIM_WorldKoopatrol_Anim06, + ANIM_WorldKoopatrol_Anim07, + ANIM_WorldKoopatrol_Anim08, + ANIM_WorldKoopatrol_Anim09, + ANIM_WorldKoopatrol_Anim12, + ANIM_WorldKoopatrol_Anim14, + ANIM_WorldKoopatrol_Anim1B, + ANIM_LIST_END +}; + +DisguiseAnims BasicPeachDisguiseAnims[] = { + [PEACH_DISGUISE_NONE] { + ANIM_WorldKoopatrol_Anim01, + ANIM_WorldKoopatrol_Anim04, + ANIM_WorldKoopatrol_Anim06, + ANIM_WorldKoopatrol_Anim08, + ANIM_WorldKoopatrol_Anim00, + ANIM_WorldKoopatrol_Anim1B + }, + [PEACH_DISGUISE_KOOPATROL] { + ANIM_WorldKoopatrol_Anim01, + ANIM_WorldKoopatrol_Anim04, + ANIM_WorldKoopatrol_Anim06, + ANIM_WorldKoopatrol_Anim08, + ANIM_WorldKoopatrol_Anim00, + ANIM_WorldKoopatrol_Anim1B + }, + [PEACH_DISGUISE_HAMMER_BROS] { + ANIM_HammerBros_Anim03, + ANIM_HammerBros_Anim06, + ANIM_HammerBros_Anim09, + ANIM_HammerBros_Anim0B, + ANIM_HammerBros_Anim00, + ANIM_HammerBros_Anim1A + }, + [PEACH_DISGUISE_CLUBBA] { + ANIM_WorldClubba_Anim02, + ANIM_WorldClubba_Anim03, + ANIM_WorldClubba_Anim04, + ANIM_WorldClubba_Anim05, + ANIM_WorldClubba_Anim00, + ANIM_WorldClubba_Anim14 + }, +}; + +AnimID* PeachDisguiseExtraAnims[] = { + [PEACH_DISGUISE_NONE] KoopatrolDisguiseExtraAnims, + [PEACH_DISGUISE_KOOPATROL] KoopatrolDisguiseExtraAnims, + [PEACH_DISGUISE_HAMMER_BROS] HammerBroDisguiseExtraAnims, + [PEACH_DISGUISE_CLUBBA] ClubbaDisguiseExtraAnims +}; #define ACTION_FILE(name) world_action_##name##_ROM_START, world_action_##name##_ROM_END diff --git a/src/world/area_arn/arn.h b/src/world/area_arn/arn.h index e762feeeb8..549d32199a 100644 --- a/src/world/area_arn/arn.h +++ b/src/world/area_arn/arn.h @@ -2,34 +2,34 @@ #define _WORLD_AREA_ARN_ARN_H_ enum { - AB_ARN_0 = AreaByte(0), - AB_ARN_1 = AreaByte(1), - AB_ARN_2 = AreaByte(2), - AB_ARN_3 = AreaByte(3), - AB_ARN_4 = AreaByte(4), - AB_ARN_5 = AreaByte(5), - AB_ARN_6 = AreaByte(6), - AB_ARN_7 = AreaByte(7), - AB_ARN_8 = AreaByte(8), - AB_ARN_9 = AreaByte(9), - AB_ARN_A = AreaByte(10), - AB_ARN_B = AreaByte(11), - AB_ARN_C = AreaByte(12), - AB_ARN_D = AreaByte(13), - AB_ARN_E = AreaByte(14), - AB_ARN_F = AreaByte(15), + AB_ARN_Unused_0 = AreaByte(0), + AB_ARN_Unused_1 = AreaByte(1), + AB_ARN_Unused_2 = AreaByte(2), + AB_ARN_Unused_3 = AreaByte(3), + AB_ARN_Unused_4 = AreaByte(4), + AB_ARN_Unused_5 = AreaByte(5), + AB_ARN_Unused_6 = AreaByte(6), + AB_ARN_Unused_7 = AreaByte(7), + AB_ARN_Unused_8 = AreaByte(8), + AB_ARN_Unused_9 = AreaByte(9), + AB_ARN_Unused_A = AreaByte(10), + AB_ARN_Unused_B = AreaByte(11), + AB_ARN_Unused_C = AreaByte(12), + AB_ARN_Unused_D = AreaByte(13), + AB_ARN_Unused_E = AreaByte(14), + AB_ARN_Unused_F = AreaByte(15), }; enum { - AF_ARN_01 = AreaFlag(1), - AF_ARN_02 = AreaFlag(2), - AF_ARN_03 = AreaFlag(3), - AF_ARN_04 = AreaFlag(4), - AF_ARN_05 = AreaFlag(5), - AF_ARN_06 = AreaFlag(6), - AF_ARN_07 = AreaFlag(7), - AF_ARN_08 = AreaFlag(8), - AF_ARN_09 = AreaFlag(9), + AF_ARN_01 = AreaFlag(1), + AF_ARN_02 = AreaFlag(2), + AF_ARN_03 = AreaFlag(3), + AF_ARN_04 = AreaFlag(4), + AF_ARN_05 = AreaFlag(5), + AF_ARN_06 = AreaFlag(6), + AF_ARN_07 = AreaFlag(7), + AF_ARN_08 = AreaFlag(8), + AF_ARN_09 = AreaFlag(9), }; extern MapSettings arn_02_settings; diff --git a/src/world/area_arn/arn_02/arn_02_4_npc.c b/src/world/area_arn/arn_02/arn_02_4_npc.c index 58ac81c6b6..fa696c8ea0 100644 --- a/src/world/area_arn/arn_02/arn_02_4_npc.c +++ b/src/world/area_arn/arn_02/arn_02_4_npc.c @@ -1,15 +1,12 @@ #include "arn_02.h" -#include "world/common/enemy/complete/HyperGoomba_Wander.inc.c" -#include "world/common/enemy/complete/HyperCleft.inc.c" +#include "world/common/enemy/HyperGoomba_Wander.inc.c" +#include "world/common/enemy/HyperCleft.inc.c" -StaticNpc N(NpcData_HyperCleft_01) = { +NpcData N(NpcData_HyperCleft_01) = { .id = NPC_HyperCleft_01, - .settings = &N(NpcSettings_HyperCleft), .pos = { -196.0f, 130.0f, 104.0f }, .yaw = 90, - .flags = ENEMY_FLAG_400, - .drops = HYPER_CLEFT_DROPS, .territory = { .wander = { .isFlying = FALSE, @@ -22,17 +19,17 @@ StaticNpc N(NpcData_HyperCleft_01) = { .detectSize = { 120 }, } }, + .settings = &N(NpcSettings_HyperCleft), + .flags = ENEMY_FLAG_400, + .drops = HYPER_CLEFT_DROPS, .animations = HYPER_CLEFT_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, }; -StaticNpc N(NpcData_HyperCleft_02) = { +NpcData N(NpcData_HyperCleft_02) = { .id = NPC_HyperCleft_02, - .settings = &N(NpcSettings_HyperCleft), .pos = { 641.0f, 268.0f, 202.0f }, .yaw = 90, - .flags = ENEMY_FLAG_400, - .drops = HYPER_CLEFT_DROPS, .territory = { .wander = { .isFlying = FALSE, @@ -45,17 +42,17 @@ StaticNpc N(NpcData_HyperCleft_02) = { .detectSize = { 120 }, } }, + .settings = &N(NpcSettings_HyperCleft), + .flags = ENEMY_FLAG_400, + .drops = HYPER_CLEFT_DROPS, .animations = HYPER_CLEFT_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, }; -StaticNpc N(NpcData_HyperGoomba) = { +NpcData N(NpcData_HyperGoomba) = { .id = NPC_HyperGoomba, - .settings = &N(NpcSettings_HyperGoomba), .pos = { 333.0f, 215.0f, 85.0f }, .yaw = 90, - .flags = ENEMY_FLAG_400, - .drops = HYPER_GOOMBA_DROPS, .territory = { .wander = { .isFlying = FALSE, @@ -68,6 +65,9 @@ StaticNpc N(NpcData_HyperGoomba) = { .detectSize = { 120, 137 }, } }, + .settings = &N(NpcSettings_HyperGoomba), + .flags = ENEMY_FLAG_400, + .drops = HYPER_GOOMBA_DROPS, .animations = HYPER_GOOMBA_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, }; diff --git a/src/world/area_arn/arn_03/arn_03_3_npc.c b/src/world/area_arn/arn_03/arn_03_3_npc.c index ef1dd4f67a..f04c299de8 100644 --- a/src/world/area_arn/arn_03/arn_03_3_npc.c +++ b/src/world/area_arn/arn_03/arn_03_3_npc.c @@ -368,14 +368,10 @@ EvtScript N(EVS_NpcInit_Boo_05) = { EVT_END }; -StaticNpc N(NpcData_Boo_01) = { +NpcData N(NpcData_Boo_01) = { .id = NPC_Boo_01, - .settings = &N(NpcSettings_Boo_Patrol), .pos = { 36.0f, 185.0f, 140.0f }, .yaw = 90, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400, - .init = &N(EVS_NpcInit_Boo_01), - .drops = BOO_DROPS, .territory = { .patrol = { .isFlying = FALSE, @@ -390,30 +386,30 @@ StaticNpc N(NpcData_Boo_01) = { .detectSize = { 150 }, } }, + .init = &N(EVS_NpcInit_Boo_01), + .settings = &N(NpcSettings_Boo_Patrol), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400, + .drops = NO_DROPS, .animations = GUSTY_BOO_ANIMS, .tattle = MSG_NpcTattle_ARN_LovesBow, }; -StaticNpc N(NpcData_Boo_02) = { +NpcData N(NpcData_Boo_02) = { .id = NPC_Boo_02, - .settings = &N(NpcSettings_Boo), .pos = { 209.0f, 185.0f, 217.0f }, .yaw = 90, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400, .init = &N(EVS_NpcInit_Boo_02), - .drops = BOO_DROPS, + .settings = &N(NpcSettings_Boo), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400, + .drops = NO_DROPS, .animations = GUSTY_BOO_ANIMS, .tattle = MSG_NpcTattle_ARN_BooA, }; -StaticNpc N(NpcData_Boo_03) = { +NpcData N(NpcData_Boo_03) = { .id = NPC_Boo_03, - .settings = &N(NpcSettings_Boo_Patrol), .pos = { 379.0f, 186.0f, 186.0f }, .yaw = 90, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400, - .init = &N(EVS_NpcInit_Boo_03), - .drops = BOO_DROPS, .territory = { .patrol = { .isFlying = FALSE, @@ -428,30 +424,34 @@ StaticNpc N(NpcData_Boo_03) = { .detectSize = { 150 }, } }, + .init = &N(EVS_NpcInit_Boo_03), + .settings = &N(NpcSettings_Boo_Patrol), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400, + .drops = NO_DROPS, .animations = GUSTY_BOO_ANIMS, .tattle = MSG_NpcTattle_ARN_BooB, }; -StaticNpc N(NpcData_Boo_04) = { +NpcData N(NpcData_Boo_04) = { .id = NPC_Boo_04, - .settings = &N(NpcSettings_Boo), .pos = { 544.0f, 235.0f, 128.0f }, .yaw = 90, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400, .init = &N(EVS_NpcInit_Boo_04), - .drops = BOO_DROPS, + .settings = &N(NpcSettings_Boo), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400, + .drops = NO_DROPS, .animations = GUSTY_BOO_ANIMS, .tattle = MSG_NpcTattle_ARN_BooC, }; -StaticNpc N(NpcData_Boo_05) = { +NpcData N(NpcData_Boo_05) = { .id = NPC_Boo_05, - .settings = &N(NpcSettings_Boo), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 90, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400, .init = &N(EVS_NpcInit_Boo_05), - .drops = BOO_DROPS, + .settings = &N(NpcSettings_Boo), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400, + .drops = NO_DROPS, .animations = GUSTY_BOO_ANIMS, }; @@ -507,45 +507,45 @@ EvtScript N(EVS_NpcInit_Boo_09) = { EVT_END }; -StaticNpc N(NpcData_Boo_06)[] = { +NpcData N(NpcData_Boo_06)[] = { { .id = NPC_Boo_06, - .settings = &N(NpcSettings_Boo), .pos = { 36.0f, 277.0f, 140.0f }, .yaw = 90, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_Boo_06), - .drops = BOO_DROPS, + .settings = &N(NpcSettings_Boo), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, + .drops = NO_DROPS, .animations = GUSTY_BOO_ANIMS, }, { .id = NPC_Boo_07, - .settings = &N(NpcSettings_Boo), .pos = { 180.0f, 285.0f, 182.0f }, .yaw = 90, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_Boo_07), - .drops = BOO_DROPS, + .settings = &N(NpcSettings_Boo), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, + .drops = NO_DROPS, .animations = GUSTY_BOO_ANIMS, }, { .id = NPC_Boo_08, - .settings = &N(NpcSettings_Boo), .pos = { 349.0f, 286.0f, 152.0f }, .yaw = 90, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_Boo_08), - .drops = BOO_DROPS, + .settings = &N(NpcSettings_Boo), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, + .drops = NO_DROPS, .animations = GUSTY_BOO_ANIMS, }, { .id = NPC_Boo_09, - .settings = &N(NpcSettings_Boo), .pos = { 490.0f, 324.0f, 128.0f }, .yaw = 90, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_Boo_09), - .drops = BOO_DROPS, + .settings = &N(NpcSettings_Boo), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, + .drops = NO_DROPS, .animations = GUSTY_BOO_ANIMS, }, }; diff --git a/src/world/area_arn/arn_04/arn_04_3_npc.c b/src/world/area_arn/arn_04/arn_04_3_npc.c index 07048fb626..fbcda8da09 100644 --- a/src/world/area_arn/arn_04/arn_04_3_npc.c +++ b/src/world/area_arn/arn_04/arn_04_3_npc.c @@ -1,16 +1,13 @@ #include "arn_04.h" -#include "world/common/enemy/complete/HyperGoomba_Patrol.inc.c" -#include "world/common/enemy/complete/HyperParagoomba.inc.c" -#include "world/common/enemy/complete/HyperCleft.inc.c" +#include "world/common/enemy/HyperGoomba_Patrol.inc.c" +#include "world/common/enemy/HyperParagoomba.inc.c" +#include "world/common/enemy/HyperCleft.inc.c" -StaticNpc N(NpcData_HyperParagoomba) = { +NpcData N(NpcData_HyperParagoomba) = { .id = NPC_HyperParagoomba, - .settings = &N(NpcSettings_HyperParagoomba), .pos = { -350.0f, 180.0f, 150.0f }, .yaw = 90, - .flags = ENEMY_FLAG_400, - .drops = HYPER_PARAGOOMBA_DROPS, .territory = { .wander = { .isFlying = FALSE, @@ -23,17 +20,17 @@ StaticNpc N(NpcData_HyperParagoomba) = { .detectSize = { 150 }, } }, + .settings = &N(NpcSettings_HyperParagoomba), + .flags = ENEMY_FLAG_400, + .drops = HYPER_PARAGOOMBA_DROPS, .animations = HYPER_PARAGOOMBA_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, }; -StaticNpc N(NpcData_HyperGoomba) = { +NpcData N(NpcData_HyperGoomba) = { .id = NPC_HyperGoomba, - .settings = &N(NpcSettings_HyperGoomba_Patrol), .pos = { 360.0f, 208.0f, 100.0f }, .yaw = 90, - .flags = ENEMY_FLAG_400, - .drops = HYPER_GOOMBA_DROPS, .territory = { .wander = { .isFlying = FALSE, @@ -46,17 +43,17 @@ StaticNpc N(NpcData_HyperGoomba) = { .detectSize = { 150 }, } }, + .settings = &N(NpcSettings_HyperGoomba_Patrol), + .flags = ENEMY_FLAG_400, + .drops = HYPER_GOOMBA_DROPS, .animations = HYPER_GOOMBA_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, }; -StaticNpc N(NpcData_HyperCleft_01) = { +NpcData N(NpcData_HyperCleft_01) = { .id = NPC_HyperCleft_01, - .settings = &N(NpcSettings_HyperCleft), .pos = { 150.0f, 177.0f, 160.0f }, .yaw = 90, - .flags = ENEMY_FLAG_400, - .drops = HYPER_CLEFT_DROPS, .territory = { .wander = { .isFlying = FALSE, @@ -69,17 +66,17 @@ StaticNpc N(NpcData_HyperCleft_01) = { .detectSize = { 150 }, } }, + .settings = &N(NpcSettings_HyperCleft), + .flags = ENEMY_FLAG_400, + .drops = HYPER_CLEFT_DROPS, .animations = HYPER_CLEFT_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, }; -StaticNpc N(NpcData_HyperCleft_02) = { +NpcData N(NpcData_HyperCleft_02) = { .id = NPC_HyperCleft_02, - .settings = &N(NpcSettings_HyperCleft), .pos = { 550.0f, 230.0f, 125.0f }, .yaw = 90, - .flags = ENEMY_FLAG_400, - .drops = HYPER_CLEFT_DROPS, .territory = { .wander = { .isFlying = FALSE, @@ -92,6 +89,9 @@ StaticNpc N(NpcData_HyperCleft_02) = { .detectSize = { 150 }, } }, + .settings = &N(NpcSettings_HyperCleft), + .flags = ENEMY_FLAG_400, + .drops = HYPER_CLEFT_DROPS, .animations = HYPER_CLEFT_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, }; diff --git a/src/world/area_arn/arn_05/arn_05_3_npc.c b/src/world/area_arn/arn_05/arn_05_3_npc.c index 731a9f87dc..2aeb2288ac 100644 --- a/src/world/area_arn/arn_05/arn_05_3_npc.c +++ b/src/world/area_arn/arn_05/arn_05_3_npc.c @@ -2,7 +2,7 @@ #include "sprite/npc/WorldBow.h" -#include "world/common/enemy/complete/TubbaBlubba.inc.c" +#include "world/common/enemy/TubbaBlubba.inc.c" #include "world/common/npc/Boo_Patrol.inc.c" #include "world/common/npc/Boo.inc.c" @@ -228,15 +228,11 @@ EvtScript N(EVS_NpcInit_Boo_05) = { EVT_END }; -StaticNpc N(NpcData_Boo_01)[] = { +NpcData N(NpcData_Boo_01)[] = { { .id = NPC_Boo_01, - .settings = &N(NpcSettings_Boo_Patrol), .pos = { 55.0f, 195.0f, 160.0f }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, - .init = &N(EVS_NpcInit_Boo_01), - .drops = BOO_DROPS, .territory = { .patrol = { .isFlying = FALSE, @@ -251,50 +247,50 @@ StaticNpc N(NpcData_Boo_01)[] = { .detectSize = { 50 }, } }, + .init = &N(EVS_NpcInit_Boo_01), + .settings = &N(NpcSettings_Boo_Patrol), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = NO_DROPS, .animations = GUSTY_BOO_ANIMS, .tattle = MSG_NpcTattle_ARN_BooD, }, { .id = NPC_Boo_02, - .settings = &N(NpcSettings_Boo), .pos = { 160.0f, 191.0f, 250.0f }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_Boo_02), - .drops = BOO_DROPS, + .settings = &N(NpcSettings_Boo), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = NO_DROPS, .animations = GUSTY_BOO_ANIMS, .tattle = MSG_NpcTattle_ARN_BooE, }, { .id = NPC_Boo_03, - .settings = &N(NpcSettings_Boo), .pos = { 390.0f, 190.0f, 255.0f }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_Boo_03), - .drops = BOO_DROPS, + .settings = &N(NpcSettings_Boo), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = NO_DROPS, .animations = GUSTY_BOO_ANIMS, .tattle = MSG_NpcTattle_ARN_BooF, }, { .id = NPC_Boo_04, - .settings = &N(NpcSettings_Boo), .pos = { 503.0f, 206.0f, 210.0f }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_Boo_04), - .drops = BOO_DROPS, + .settings = &N(NpcSettings_Boo), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = NO_DROPS, .animations = GUSTY_BOO_ANIMS, .tattle = MSG_NpcTattle_ARN_BooG, }, { .id = NPC_Boo_05, - .settings = &N(NpcSettings_Boo_Patrol), .pos = { 350.0f, 185.0f, 197.0f }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, - .init = &N(EVS_NpcInit_Boo_05), - .drops = BOO_DROPS, .territory = { .patrol = { .isFlying = FALSE, @@ -309,6 +305,10 @@ StaticNpc N(NpcData_Boo_01)[] = { .detectSize = { 50 }, } }, + .init = &N(EVS_NpcInit_Boo_05), + .settings = &N(NpcSettings_Boo_Patrol), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = NO_DROPS, .animations = GUSTY_BOO_ANIMS, .tattle = MSG_NpcTattle_ARN_BooH, }, @@ -634,14 +634,14 @@ s32 N(extraAnimationList_80244390)[] = { -1 }; -StaticNpc N(NpcData_Tubba) = { +NpcData N(NpcData_Tubba) = { .id = NPC_Tubba, - .settings = &N(NpcSettings_TubbaBlubba), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_Tubba), - .drops = TUBBA_DROPS, + .settings = &N(NpcSettings_TubbaBlubba), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_800, + .drops = NO_DROPS, .animations = TUBBA_ANIMS, .extraAnimations = N(extraAnimationList_80244390), }; @@ -698,45 +698,45 @@ EvtScript N(EVS_NpcInit_Boo_09) = { EVT_END }; -StaticNpc N(NpcData_Boo_06)[] = { +NpcData N(NpcData_Boo_06)[] = { { .id = NPC_Boo_06, - .settings = &N(NpcSettings_Boo), .pos = { 36.0f, 277.0f, 140.0f }, .yaw = 90, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_Boo_06), - .drops = BOO_DROPS, + .settings = &N(NpcSettings_Boo), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, + .drops = NO_DROPS, .animations = GUSTY_BOO_ANIMS, }, { .id = NPC_Boo_07, - .settings = &N(NpcSettings_Boo), .pos = { 200.0f, 275.0f, 182.0f }, .yaw = 90, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_Boo_07), - .drops = BOO_DROPS, + .settings = &N(NpcSettings_Boo), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, + .drops = NO_DROPS, .animations = GUSTY_BOO_ANIMS, }, { .id = NPC_Boo_08, - .settings = &N(NpcSettings_Boo), .pos = { 379.0f, 300.0f, 192.0f }, .yaw = 90, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_Boo_08), - .drops = BOO_DROPS, + .settings = &N(NpcSettings_Boo), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, + .drops = NO_DROPS, .animations = GUSTY_BOO_ANIMS, }, { .id = NPC_Boo_09, - .settings = &N(NpcSettings_Boo), .pos = { 525.0f, 286.0f, 178.0f }, .yaw = 90, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_Boo_09), - .drops = BOO_DROPS, + .settings = &N(NpcSettings_Boo), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, + .drops = NO_DROPS, .animations = GUSTY_BOO_ANIMS, }, }; diff --git a/src/world/area_arn/arn_07/arn_07.h b/src/world/area_arn/arn_07/arn_07.h index d93d00857f..2c73596653 100644 --- a/src/world/area_arn/arn_07/arn_07.h +++ b/src/world/area_arn/arn_07/arn_07.h @@ -34,6 +34,7 @@ enum { enum { MV_Unk_00 = MapVar(0), + MV_Unk_01 = MapVar(1), }; #define NAMESPACE arn_07 diff --git a/src/world/area_arn/arn_07/arn_07_2_main.c b/src/world/area_arn/arn_07/arn_07_2_main.c index e486d6b43e..6bbf813e1f 100644 --- a/src/world/area_arn/arn_07/arn_07_2_main.c +++ b/src/world/area_arn/arn_07/arn_07_2_main.c @@ -1,5 +1,6 @@ #include "arn_07.h" +#define STAR_SPIRIT_DATA_VAR MV_Unk_01 #include "world/common/todo/StarSpiritEffectFunc.inc.c" s32 N(KeyList)[] = { diff --git a/src/world/area_arn/arn_07/arn_07_5_npc.c b/src/world/area_arn/arn_07/arn_07_5_npc.c index 97ebde18c3..b8a7b76f27 100644 --- a/src/world/area_arn/arn_07/arn_07_5_npc.c +++ b/src/world/area_arn/arn_07/arn_07_5_npc.c @@ -1,9 +1,9 @@ #include "arn_07.h" #include "effects.h" -#include "world/common/enemy/complete/HyperParagoomba.inc.c" +#include "world/common/enemy/HyperParagoomba.inc.c" #include "world/common/npc/TubbasHeart.inc.c" -#include "world/common/enemy/complete/TubbaBlubba.inc.c" +#include "world/common/enemy/TubbaBlubba.inc.c" #include "world/common/npc/Boo.inc.c" #include "world/common/npc/StarSpirit.inc.c" @@ -364,7 +364,7 @@ EvtScript N(EVS_NpcInit_Bootler) = { EVT_END }; -s32 N(ExtraAnims_Tubba)[] = { +AnimID N(ExtraAnims_Tubba)[] = { ANIM_WorldTubba_Anim00, ANIM_WorldTubba_Anim22, ANIM_WorldTubba_Anim23, @@ -373,22 +373,22 @@ s32 N(ExtraAnims_Tubba)[] = { ANIM_WorldTubba_Anim08, ANIM_WorldTubba_Anim0F, ANIM_WorldTubba_Anim12, - -1 + ANIM_LIST_END }; -s32 N(ExtraAnims_Boo)[] = { +AnimID N(ExtraAnims_Boo)[] = { ANIM_Boo_Still, - -1 + ANIM_LIST_END }; -s32 N(ExtraAnims_GustyBoo)[] = { +AnimID N(ExtraAnims_GustyBoo)[] = { ANIM_Boo_Tan_Still, - -1 + ANIM_LIST_END }; -s32 N(ExtraAnims_Bootler)[] = { +AnimID N(ExtraAnims_Bootler)[] = { ANIM_Bootler_Idle, - -1 + ANIM_LIST_END }; EvtScript N(EVS_NpcIdle_Skolar) = { @@ -558,111 +558,107 @@ EvtScript N(EVS_NpcInit_Skolar) = { EVT_END }; -StaticNpc N(NpcData_Tubba)[] = { +NpcData N(NpcData_Tubba)[] = { { .id = NPC_Tubba, - .settings = &N(NpcSettings_TubbaBlubba), .pos = { 309.0f, 0.0f, 11.0f }, .yaw = 270, - .flags = ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_200000, .init = &N(EVS_NpcInit_Tubba), - .drops = TUBBA_DROPS, + .settings = &N(NpcSettings_TubbaBlubba), + .flags = ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_200000, + .drops = NO_DROPS, .animations = TUBBA_ANIMS, .extraAnimations = N(ExtraAnims_Tubba), }, { .id = NPC_TubbasHeart, - .settings = &N(NpcSettings_TubbasHeart), .pos = { -10.0f, 50.0f, -170.0f }, .yaw = 90, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_200000, .init = &N(EVS_NpcInit_TubbasHeart), - .drops = TUBBAS_HEART_DROPS, + .settings = &N(NpcSettings_TubbasHeart), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_200000, + .drops = NO_DROPS, .animations = TUBBAS_HEART_ANIMS, }, }; -StaticNpc N(NpcData_Boos)[] = { +NpcData N(NpcData_Boos)[] = { { .id = NPC_Boo_01, - .settings = &N(NpcSettings_Boo), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_200000, .init = &N(EVS_NpcInit_Boo), - .drops = BOO_DROPS, + .settings = &N(NpcSettings_Boo), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_200000, + .drops = NO_DROPS, .animations = GUSTY_BOO_ANIMS, .extraAnimations = N(ExtraAnims_GustyBoo), }, { .id = NPC_Boo_02, - .settings = &N(NpcSettings_Boo), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_200000, .init = &N(EVS_NpcInit_Boo), - .drops = BOO_DROPS, + .settings = &N(NpcSettings_Boo), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_200000, + .drops = NO_DROPS, .animations = GUSTY_BOO_ANIMS, .extraAnimations = N(ExtraAnims_GustyBoo), }, { .id = NPC_Boo_03, - .settings = &N(NpcSettings_Boo), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_200000, .init = &N(EVS_NpcInit_Boo), - .drops = BOO_DROPS, + .settings = &N(NpcSettings_Boo), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_200000, + .drops = NO_DROPS, .animations = GUSTY_BOO_ANIMS, .extraAnimations = N(ExtraAnims_GustyBoo), }, { .id = NPC_Boo_04, - .settings = &N(NpcSettings_Boo), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_200000, .init = &N(EVS_NpcInit_Boo), - .drops = BOO_DROPS, + .settings = &N(NpcSettings_Boo), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_200000, + .drops = NO_DROPS, .animations = GUSTY_BOO_ANIMS, .extraAnimations = N(ExtraAnims_GustyBoo), }, { .id = NPC_Boo_05, - .settings = &N(NpcSettings_Boo), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_200000, .init = &N(EVS_NpcInit_Boo), - .drops = BOO_DROPS, + .settings = &N(NpcSettings_Boo), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_200000, + .drops = NO_DROPS, .animations = NORMAL_BOO_ANIMS, .extraAnimations = N(ExtraAnims_Boo), }, { .id = NPC_Boo_06, - .settings = &N(NpcSettings_Boo), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_200000, .init = &N(EVS_NpcInit_Boo), - .drops = BOO_DROPS, + .settings = &N(NpcSettings_Boo), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_200000, + .drops = NO_DROPS, .animations = NORMAL_BOO_ANIMS, .extraAnimations = N(ExtraAnims_Boo), }, }; -StaticNpc N(NpcData_Bow) = { +NpcData N(NpcData_Bow) = { .id = NPC_Bow, - .settings = &N(NpcSettings_Boo), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_200000, .init = &N(EVS_NpcInit_Bow), - .drops = { - .dropFlags = NPC_DROP_FLAG_80, - .heartDrops = NO_DROPS, - .flowerDrops = NO_DROPS, - }, + .settings = &N(NpcSettings_Boo), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_200000, + .drops = NO_DROPS, .animations = { .idle = ANIM_WorldBow_Idle, .walk = ANIM_WorldBow_Walk, @@ -683,18 +679,14 @@ StaticNpc N(NpcData_Bow) = { }, }; -StaticNpc N(NpcData_Bootler) = { +NpcData N(NpcData_Bootler) = { .id = NPC_Bootler, - .settings = &N(NpcSettings_Boo), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_200000, .init = &N(EVS_NpcInit_Bootler), - .drops = { - .dropFlags = NPC_DROP_FLAG_80, - .heartDrops = NO_DROPS, - .flowerDrops = NO_DROPS, - }, + .settings = &N(NpcSettings_Boo), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_200000, + .drops = NO_DROPS, .animations = { .idle = ANIM_Bootler_Idle, .walk = ANIM_Bootler_Walk, @@ -726,14 +718,10 @@ EvtScript N(EVS_NpcInit_HyperParagoomba) = { EVT_END }; -StaticNpc N(NpcData_HyperParagoomba_01) = { +NpcData N(NpcData_HyperParagoomba_01) = { .id = NPC_HyperParagoomba_01, - .settings = &N(NpcSettings_HyperParagoomba), .pos = { -216.0f, 60.0f, -10.0f }, .yaw = 90, - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, - .init = &N(EVS_NpcInit_HyperParagoomba), - .drops = HYPER_PARAGOOMBA_DROPS, .territory = { .wander = { .isFlying = FALSE, @@ -746,18 +734,18 @@ StaticNpc N(NpcData_HyperParagoomba_01) = { .detectSize = { 250 }, } }, + .init = &N(EVS_NpcInit_HyperParagoomba), + .settings = &N(NpcSettings_HyperParagoomba), + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = HYPER_PARAGOOMBA_DROPS, .animations = HYPER_PARAGOOMBA_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, }; -StaticNpc N(NpcData_HyperParagoomba_02) = { +NpcData N(NpcData_HyperParagoomba_02) = { .id = NPC_HyperParagoomba_02, - .settings = &N(NpcSettings_HyperParagoomba), .pos = { 0.0f, 60.0f, 150.0f }, .yaw = 270, - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, - .init = &N(EVS_NpcInit_HyperParagoomba), - .drops = HYPER_PARAGOOMBA_DROPS, .territory = { .wander = { .isFlying = FALSE, @@ -770,18 +758,18 @@ StaticNpc N(NpcData_HyperParagoomba_02) = { .detectSize = { 250 }, } }, + .init = &N(EVS_NpcInit_HyperParagoomba), + .settings = &N(NpcSettings_HyperParagoomba), + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = HYPER_PARAGOOMBA_DROPS, .animations = HYPER_PARAGOOMBA_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, }; -StaticNpc N(NpcData_HyperParagoomba_03) = { +NpcData N(NpcData_HyperParagoomba_03) = { .id = NPC_HyperParagoomba_03, - .settings = &N(NpcSettings_HyperParagoomba), .pos = { 260.0f, 60.0f, 30.0f }, .yaw = 90, - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, - .init = &N(EVS_NpcInit_HyperParagoomba), - .drops = HYPER_PARAGOOMBA_DROPS, .territory = { .wander = { .isFlying = FALSE, @@ -794,18 +782,22 @@ StaticNpc N(NpcData_HyperParagoomba_03) = { .detectSize = { 250 }, } }, + .init = &N(EVS_NpcInit_HyperParagoomba), + .settings = &N(NpcSettings_HyperParagoomba), + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = HYPER_PARAGOOMBA_DROPS, .animations = HYPER_PARAGOOMBA_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, }; -StaticNpc N(NpcData_Skolar) = { +NpcData N(NpcData_Skolar) = { .id = NPC_Skolar, - .settings = &N(NpcSettings_StarSpirit), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_Skolar), - .drops = SKOLAR_DROPS, + .settings = &N(NpcSettings_StarSpirit), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = NO_DROPS, .animations = SKOLAR_ANIMS, }; diff --git a/src/world/area_arn/arn_08/arn_08_6_npc.c b/src/world/area_arn/arn_08/arn_08_6_npc.c index 6ec26d9c9a..aacb123d0d 100644 --- a/src/world/area_arn/arn_08/arn_08_6_npc.c +++ b/src/world/area_arn/arn_08/arn_08_6_npc.c @@ -45,25 +45,25 @@ EvtScript N(EVS_NpcInit_Yakkey) = { EVT_END }; -StaticNpc N(NpcData_TubbasHeart) = { +NpcData N(NpcData_TubbasHeart) = { .id = NPC_TubbasHeart, - .settings = &N(NpcSettings_TubbasHeart), .pos = { -23.0f, 75.0f, 31.0f }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_TubbasHeart), - .drops = TUBBAS_HEART_DROPS, + .settings = &N(NpcSettings_TubbasHeart), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = NO_DROPS, .animations = TUBBAS_HEART_ANIMS, }; -StaticNpc N(NpcData_Yakkey) = { +NpcData N(NpcData_Yakkey) = { .id = NPC_Yakkey, - .settings = &N(NpcSettings_Yakkey), .pos = { 38.0f, 0.0f, 97.0f }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_Yakkey), - .drops = YAKKEY_DROPS, + .settings = &N(NpcSettings_Yakkey), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_800, + .drops = NO_DROPS, .animations = YAKKEY_ANIMS, .tattle = MSG_NpcTattle_Yakkey, }; diff --git a/src/world/area_arn/arn_09/arn_09_5_npc.c b/src/world/area_arn/arn_09/arn_09_5_npc.c index a0421594e3..2ff7db719b 100644 --- a/src/world/area_arn/arn_09/arn_09_5_npc.c +++ b/src/world/area_arn/arn_09/arn_09_5_npc.c @@ -45,14 +45,14 @@ EvtScript N(EVS_NpcInit_TubbasHeart) = { EVT_END }; -StaticNpc N(NpcData_TubbasHeart) = { +NpcData N(NpcData_TubbasHeart) = { .id = NPC_TubbasHeart, - .settings = &N(NpcSettings_TubbasHeart), .pos = { 0.0f, 25.0f, 0.0f }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_TubbasHeart), - .drops = TUBBAS_HEART_DROPS, + .settings = &N(NpcSettings_TubbasHeart), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = NO_DROPS, .animations = TUBBAS_HEART_ANIMS, }; diff --git a/src/world/area_arn/arn_10/arn_10_3_npc.c b/src/world/area_arn/arn_10/arn_10_3_npc.c index 3bab95095d..966cab485f 100644 --- a/src/world/area_arn/arn_10/arn_10_3_npc.c +++ b/src/world/area_arn/arn_10/arn_10_3_npc.c @@ -1,7 +1,7 @@ #include "arn_10.h" #include "world/common/npc/TubbasHeart.inc.c" -#include "world/common/enemy/complete/HyperGoomba_Wander.inc.c" +#include "world/common/enemy/HyperGoomba_Wander.inc.c" EvtScript N(EVS_NpcIdle_TubbasHeart) = { EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_TubbasHeart_Anim13) @@ -59,25 +59,21 @@ EvtScript N(EVS_NpcInit_HyperGoomba) = { EVT_END }; -StaticNpc N(NpcData_TubbasHeart) = { +NpcData N(NpcData_TubbasHeart) = { .id = NPC_TubbasHeart, - .settings = &N(NpcSettings_TubbasHeart), .pos = { 80.0f, 50.0f, 0.0f }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_TubbasHeart), - .drops = TUBBAS_HEART_DROPS, + .settings = &N(NpcSettings_TubbasHeart), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = NO_DROPS, .animations = TUBBAS_HEART_ANIMS, }; -StaticNpc N(NpcData_HyperGoomba) = { +NpcData N(NpcData_HyperGoomba) = { .id = NPC_HyperGoomba, - .settings = &N(NpcSettings_HyperGoomba), .pos = { 0.0f, 0.0f, 0.0f }, .yaw = 270, - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, - .init = &N(EVS_NpcInit_HyperGoomba), - .drops = HYPER_GOOMBA_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -90,6 +86,10 @@ StaticNpc N(NpcData_HyperGoomba) = { .detectSize = { 150 }, } }, + .init = &N(EVS_NpcInit_HyperGoomba), + .settings = &N(NpcSettings_HyperGoomba), + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = HYPER_GOOMBA_DROPS, .animations = HYPER_GOOMBA_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, }; diff --git a/src/world/area_arn/arn_11/arn_11_3_npc.c b/src/world/area_arn/arn_11/arn_11_3_npc.c index 75d43248dd..6eb77249fb 100644 --- a/src/world/area_arn/arn_11/arn_11_3_npc.c +++ b/src/world/area_arn/arn_11/arn_11_3_npc.c @@ -149,14 +149,14 @@ EvtScript N(EVS_NpcInit_TubbasHeart) = { EVT_END }; -StaticNpc N(NpcData_TubbasHeart) = { +NpcData N(NpcData_TubbasHeart) = { .id = NPC_TubbasHeart, - .settings = &N(NpcSettings_TubbasHeart), .pos = { 119.0f, 60.0f, 0.0f }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_800 | ENEMY_FLAG_40000, .init = &N(EVS_NpcInit_TubbasHeart), - .drops = TUBBAS_HEART_DROPS, + .settings = &N(NpcSettings_TubbasHeart), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_800 | ENEMY_FLAG_40000, + .drops = NO_DROPS, .animations = TUBBAS_HEART_ANIMS, }; diff --git a/src/world/area_arn/arn_12/arn_12_3_npc.c b/src/world/area_arn/arn_12/arn_12_3_npc.c index 6a0a007721..e217776e01 100644 --- a/src/world/area_arn/arn_12/arn_12_3_npc.c +++ b/src/world/area_arn/arn_12/arn_12_3_npc.c @@ -1,7 +1,7 @@ #include "arn_12.h" #include "world/common/npc/TubbasHeart.inc.c" -#include "world/common/enemy/complete/HyperGoomba_Wander.inc.c" +#include "world/common/enemy/HyperGoomba_Wander.inc.c" EvtScript N(EVS_NpcIdle_TubbasHeart) = { EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_TubbasHeart_Anim13) @@ -60,25 +60,21 @@ EvtScript N(EVS_NpcInit_HyperGoomba) = { EVT_END }; -StaticNpc N(NpcData_TubbasHeart) = { +NpcData N(NpcData_TubbasHeart) = { .id = NPC_TubbasHeart, - .settings = &N(NpcSettings_TubbasHeart), .pos = { 80.0f, 50.0f, 0.0f }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_TubbasHeart), - .drops = TUBBAS_HEART_DROPS, + .settings = &N(NpcSettings_TubbasHeart), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = NO_DROPS, .animations = TUBBAS_HEART_ANIMS, }; -StaticNpc N(NpcData_HyperGoomba) = { +NpcData N(NpcData_HyperGoomba) = { .id = NPC_HyperGoomba, - .settings = &N(NpcSettings_HyperGoomba), .pos = { 0.0f, 0.0f, 0.0f }, .yaw = 270, - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, - .init = &N(EVS_NpcInit_HyperGoomba), - .drops = HYPER_GOOMBA_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -91,6 +87,10 @@ StaticNpc N(NpcData_HyperGoomba) = { .detectSize = { 150 }, } }, + .init = &N(EVS_NpcInit_HyperGoomba), + .settings = &N(NpcSettings_HyperGoomba), + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = HYPER_GOOMBA_DROPS, .animations = HYPER_GOOMBA_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, }; diff --git a/src/world/area_arn/arn_13/arn_13_3_npc.c b/src/world/area_arn/arn_13/arn_13_3_npc.c index 7f9d5123ef..b5bee138a0 100644 --- a/src/world/area_arn/arn_13/arn_13_3_npc.c +++ b/src/world/area_arn/arn_13/arn_13_3_npc.c @@ -1,7 +1,7 @@ #include "arn_13.h" #include "world/common/npc/TubbasHeart.inc.c" -#include "world/common/enemy/complete/HyperGoomba_Wander.inc.c" +#include "world/common/enemy/HyperGoomba_Wander.inc.c" EvtScript N(EVS_NpcIdle_TubbasHeart) = { EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_TubbasHeart_Anim13) @@ -60,25 +60,21 @@ EvtScript N(EVS_NpcInit_HyperGoomba) = { EVT_END }; -StaticNpc N(NpcData_TubbasHeart) = { +NpcData N(NpcData_TubbasHeart) = { .id = NPC_TubbasHeart, - .settings = &N(NpcSettings_TubbasHeart), .pos = { 80.0f, 50.0f, 0.0f }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_TubbasHeart), - .drops = TUBBAS_HEART_DROPS, + .settings = &N(NpcSettings_TubbasHeart), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = NO_DROPS, .animations = TUBBAS_HEART_ANIMS, }; -StaticNpc N(NpcData_HyperGoomba) = { +NpcData N(NpcData_HyperGoomba) = { .id = NPC_HyperGoomba, - .settings = &N(NpcSettings_HyperGoomba), .pos = { 0.0f, 0.0f, 0.0f }, .yaw = 270, - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, - .init = &N(EVS_NpcInit_HyperGoomba), - .drops = HYPER_GOOMBA_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -91,6 +87,10 @@ StaticNpc N(NpcData_HyperGoomba) = { .detectSize = { 150 }, } }, + .init = &N(EVS_NpcInit_HyperGoomba), + .settings = &N(NpcSettings_HyperGoomba), + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = HYPER_GOOMBA_DROPS, .animations = HYPER_GOOMBA_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, }; 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 91bfe73848..2537b26ca6 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 @@ -9,13 +9,8 @@ API_CALLABLE(N(PlaySentinelSounds)) { } #include "world/common/npc/Boo.inc.c" -#include "world/common/enemy/complete/Sentinel.h" - -NpcSettings N(NpcSettings_Sentinel) = { - .height = 24, - .radius = 24, - .level = 99, -}; +#include "world/common/npc/Dummy.inc.c" +#include "world/common/enemy/Sentinel.h" EvtScript N(EVS_SetDoorRots) = { EVT_SET(LVar3, 0) @@ -440,70 +435,70 @@ EvtScript N(EVS_NpcInit_Boo_06) = { EVT_END }; -StaticNpc N(NpcData_Boo_01) = { +NpcData N(NpcData_Boo_01) = { .id = NPC_Boo_01, - .settings = &N(NpcSettings_Boo), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 90, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_Boo_01), - .drops = BOO_DROPS, + .settings = &N(NpcSettings_Boo), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_400000, + .drops = NO_DROPS, .animations = GUSTY_BOO_ANIMS, .tattle = MSG_NpcTattle_BraveBoo, }; -StaticNpc N(NpcData_Boo_02) = { +NpcData N(NpcData_Boo_02) = { .id = NPC_Boo_02, - .settings = &N(NpcSettings_Boo), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 90, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400, .init = &N(EVS_NpcInit_Boo_02), - .drops = BOO_DROPS, + .settings = &N(NpcSettings_Boo), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400, + .drops = NO_DROPS, .animations = GUSTY_BOO_ANIMS, }; -StaticNpc N(NpcData_Boo_03) = { +NpcData N(NpcData_Boo_03) = { .id = NPC_Boo_03, - .settings = &N(NpcSettings_Boo), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 90, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400, .init = &N(EVS_NpcInit_Boo_03), - .drops = BOO_DROPS, + .settings = &N(NpcSettings_Boo), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400, + .drops = NO_DROPS, .animations = GUSTY_BOO_ANIMS, }; -StaticNpc N(NpcData_Boo_04) = { +NpcData N(NpcData_Boo_04) = { .id = NPC_Boo_04, - .settings = &N(NpcSettings_Boo), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 90, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400, .init = &N(EVS_NpcInit_Boo_04), - .drops = BOO_DROPS, + .settings = &N(NpcSettings_Boo), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400, + .drops = NO_DROPS, .animations = GUSTY_BOO_ANIMS, }; -StaticNpc N(NpcData_Boo_05) = { +NpcData N(NpcData_Boo_05) = { .id = NPC_Boo_05, - .settings = &N(NpcSettings_Boo), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 90, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400, .init = &N(EVS_NpcInit_Boo_05), - .drops = BOO_DROPS, + .settings = &N(NpcSettings_Boo), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400, + .drops = NO_DROPS, .animations = GUSTY_BOO_ANIMS, }; -StaticNpc N(NpcData_Boo_06) = { +NpcData N(NpcData_Boo_06) = { .id = NPC_Boo_06, - .settings = &N(NpcSettings_Boo), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 90, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400, .init = &N(EVS_NpcInit_Boo_06), - .drops = BOO_DROPS, + .settings = &N(NpcSettings_Boo), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400, + .drops = NO_DROPS, .animations = GUSTY_BOO_ANIMS, }; @@ -653,14 +648,14 @@ EvtScript N(EVS_NpcInit_Sentinel) = { EVT_END }; -StaticNpc N(NpcData_Sentinel) = { +NpcData N(NpcData_Sentinel) = { .id = NPC_Sentinel, - .settings = &N(NpcSettings_Sentinel), .pos = { 0.0f, 0.0f, -1000.0f }, .yaw = 90, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_Sentinel), - .drops = SENTINEL_DROPS, + .settings = &N(NpcSettings_Dummy), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_400000, + .drops = NO_DROPS, .animations = SENTINEL_ANIMS, }; diff --git a/src/world/area_dgb/dgb_01/dgb_01.h b/src/world/area_dgb/dgb_01/dgb_01.h index c3996b573b..46baa57a32 100644 --- a/src/world/area_dgb/dgb_01/dgb_01.h +++ b/src/world/area_dgb/dgb_01/dgb_01.h @@ -42,9 +42,9 @@ extern NpcGroupList N(ThirdFloorEscapeNPCs); extern StaticAnimatorNode* N(SmashBridgesSkeleton)[]; extern AnimScript N(AS_SmashBridges); -ApiStatus InitAnimatedModels(Evt* script, s32 isInitialCall); -ApiStatus SetAnimatedModelRenderMode(Evt* script, s32 isInitialCall); -ApiStatus DeleteAnimatedModel(Evt* script, s32 isInitialCall); +API_CALLABLE(InitAnimatedModels); +API_CALLABLE(SetAnimatedModelRenderMode); +API_CALLABLE(DeleteAnimatedModel); extern Gfx N(img0_gfx)[]; extern Gfx N(img1_gfx)[]; diff --git a/src/world/area_dgb/dgb_01/dgb_01_5_npc.c b/src/world/area_dgb/dgb_01/dgb_01_5_npc.c index 611f9c89c1..220fbe16f2 100644 --- a/src/world/area_dgb/dgb_01/dgb_01_5_npc.c +++ b/src/world/area_dgb/dgb_01/dgb_01_5_npc.c @@ -2,11 +2,11 @@ #define AI_SENTINEL_FIRST_NPC NPC_Sentinel_01 #define AI_SENTINEL_LAST_NPC NPC_Tubba -#include "world/common/enemy/complete/Sentinel.inc.c" +#include "world/common/enemy/Sentinel.inc.c" -#include "world/common/enemy/complete/Clubba.h" -#include "world/common/enemy/complete/TubbaBlubba_Patrol.inc.c" -#include "world/common/enemy/complete/TubbaBlubba.inc.c" +#include "world/common/enemy/Clubba.h" +#include "world/common/enemy/TubbaBlubba_Patrol.inc.c" +#include "world/common/enemy/TubbaBlubba.inc.c" #include "world/common/npc/Yakkey.inc.c" #include "world/common/todo/UnkFunc1.inc.c" @@ -243,14 +243,10 @@ EvtScript N(EVS_NpcInit_Sentinel_04) = { EVT_END }; -StaticNpc N(NpcData_Sentinel_01) = { +NpcData N(NpcData_Sentinel_01) = { .id = NPC_Sentinel_01, - .settings = &N(NpcSettings_Sentinel), .pos = { -180.0f, 100.0f, 230.0f }, .yaw = 90, - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, - .init = &N(EVS_NpcInit_Sentinel_01), - .drops = SENTINEL_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -263,17 +259,17 @@ StaticNpc N(NpcData_Sentinel_01) = { .detectSize = { 450, 1000 }, } }, + .init = &N(EVS_NpcInit_Sentinel_01), + .settings = &N(NpcSettings_Sentinel), + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = NO_DROPS, .animations = SENTINEL_ANIMS, }; -StaticNpc N(NpcData_Sentinel_02) = { +NpcData N(NpcData_Sentinel_02) = { .id = NPC_Sentinel_02, - .settings = &N(NpcSettings_Sentinel), .pos = { 180.0f, 100.0f, 230.0f }, .yaw = 270, - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, - .init = &N(EVS_NpcInit_Sentinel_02), - .drops = SENTINEL_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -286,17 +282,17 @@ StaticNpc N(NpcData_Sentinel_02) = { .detectSize = { 450, 1000 }, } }, + .init = &N(EVS_NpcInit_Sentinel_02), + .settings = &N(NpcSettings_Sentinel), + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = NO_DROPS, .animations = SENTINEL_ANIMS, }; -StaticNpc N(NpcData_Sentinel_03) = { +NpcData N(NpcData_Sentinel_03) = { .id = NPC_Sentinel_03, - .settings = &N(NpcSettings_Sentinel), .pos = { -180.0f, 100.0f, -230.0f }, .yaw = 90, - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, - .init = &N(EVS_NpcInit_Sentinel_03), - .drops = SENTINEL_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -309,17 +305,17 @@ StaticNpc N(NpcData_Sentinel_03) = { .detectSize = { 450, 1000 }, } }, + .init = &N(EVS_NpcInit_Sentinel_03), + .settings = &N(NpcSettings_Sentinel), + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = NO_DROPS, .animations = SENTINEL_ANIMS, }; -StaticNpc N(NpcData_Sentinel_04) = { +NpcData N(NpcData_Sentinel_04) = { .id = NPC_Sentinel_04, - .settings = &N(NpcSettings_Sentinel), .pos = { 180.0f, 100.0f, -230.0f }, .yaw = 270, - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, - .init = &N(EVS_NpcInit_Sentinel_04), - .drops = SENTINEL_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -332,10 +328,14 @@ StaticNpc N(NpcData_Sentinel_04) = { .detectSize = { 450, 1000 }, } }, + .init = &N(EVS_NpcInit_Sentinel_04), + .settings = &N(NpcSettings_Sentinel), + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = NO_DROPS, .animations = SENTINEL_ANIMS, }; -s32 N(ExtraAnims_Tubba)[] = { +AnimID N(ExtraAnims_Tubba)[] = { ANIM_WorldTubba_Anim06, ANIM_WorldTubba_Anim10, ANIM_WorldTubba_Anim09, @@ -347,29 +347,25 @@ s32 N(ExtraAnims_Tubba)[] = { ANIM_WorldTubba_Anim1B, ANIM_WorldTubba_Anim1C, ANIM_WorldTubba_Anim1D, - -1 + ANIM_LIST_END }; -StaticNpc N(NpcData_Tubba_Floor3) = { +NpcData N(NpcData_Tubba_Floor3) = { .id = NPC_Tubba, - .settings = &N(NpcSettings_TubbaBlubba), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 270, - .flags = ENEMY_FLAG_200000, .init = &N(EVS_NpcInit_Tubba_Floor3), - .drops = TUBBA_DROPS, + .settings = &N(NpcSettings_TubbaBlubba), + .flags = ENEMY_FLAG_200000, + .drops = NO_DROPS, .animations = TUBBA_ANIMS, .extraAnimations = N(ExtraAnims_Tubba), }; -StaticNpc N(NpcData_Tubba_Floor2) = { +NpcData N(NpcData_Tubba_Floor2) = { .id = NPC_Tubba, - .settings = &N(NpcSettings_TubbaBlubba_Patrol), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 270, - .flags = ENEMY_FLAG_200000, - .init = &N(EVS_NpcInit_Tubba_Floor2), - .drops = CLUBBA_DROPS, .territory = { .patrol = { .isFlying = FALSE, @@ -384,19 +380,19 @@ StaticNpc N(NpcData_Tubba_Floor2) = { .detectSize = { 1000, 250 }, } }, + .init = &N(EVS_NpcInit_Tubba_Floor2), + .settings = &N(NpcSettings_TubbaBlubba_Patrol), + .flags = ENEMY_FLAG_200000, + .drops = CLUBBA_DROPS, .animations = TUBBA_ANGRY_ANIMS, .extraAnimations = N(ExtraAnims_Tubba), .aiDetectFlags = AI_DETECT_SENSITIVE_MOTION, }; -StaticNpc N(NpcData_Tubba_Floor1) = { +NpcData N(NpcData_Tubba_Floor1) = { .id = NPC_Tubba, - .settings = &N(NpcSettings_TubbaBlubba_Patrol), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 270, - .flags = ENEMY_FLAG_200000, - .init = &N(EVS_NpcInit_Tubba_Floor1), - .drops = CLUBBA_DROPS, .territory = { .patrol = { .isFlying = FALSE, @@ -417,6 +413,10 @@ StaticNpc N(NpcData_Tubba_Floor1) = { .detectSize = { 1000, 250 }, } }, + .init = &N(EVS_NpcInit_Tubba_Floor1), + .settings = &N(NpcSettings_TubbaBlubba_Patrol), + .flags = ENEMY_FLAG_200000, + .drops = CLUBBA_DROPS, .animations = TUBBA_ANGRY_ANIMS, .extraAnimations = N(ExtraAnims_Tubba), .aiDetectFlags = AI_DETECT_SENSITIVE_MOTION, diff --git a/src/world/area_dgb/dgb_02/dgb_02_3_npc.c b/src/world/area_dgb/dgb_02/dgb_02_3_npc.c index 704e931b41..7e5ecd565e 100644 --- a/src/world/area_dgb/dgb_02/dgb_02_3_npc.c +++ b/src/world/area_dgb/dgb_02/dgb_02_3_npc.c @@ -2,16 +2,13 @@ #define INCLUDE_CLUBBA_WANDER #define INCLUDE_CLUBBA_NAPPING -#include "world/common/enemy/complete/Clubba_Multi.inc.c" +#include "world/common/enemy/Clubba_Multi.inc.c" -StaticNpc N(NpcData_Clubba_01)[] = { +NpcData N(NpcData_Clubba_01)[] = { { .id = NPC_Clubba_01, - .settings = &N(NpcSettings_Clubba_Wander), .pos = { -200.0f, 0.0f, 180.0f }, .yaw = 270, - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, - .drops = CLUBBA_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -24,6 +21,9 @@ StaticNpc N(NpcData_Clubba_01)[] = { .detectSize = { 250, 90 }, } }, + .settings = &N(NpcSettings_Clubba_Wander), + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = CLUBBA_DROPS, .animations = CLUBBA_ANIMS, .extraAnimations = N(ExtraAnims_Clubba), .aiDetectFlags = AI_DETECT_SENSITIVE_MOTION, @@ -31,14 +31,11 @@ StaticNpc N(NpcData_Clubba_01)[] = { CLUBBA_MACE_HITBOX(NPC_Clubba_01_Hitbox), }; -StaticNpc N(NpcData_Clubba_02)[] = { +NpcData N(NpcData_Clubba_02)[] = { { .id = NPC_Clubba_02, - .settings = &N(NpcSettings_Clubba_Napping), .pos = { 375.0f, 0.0f, 100.0f }, .yaw = 270, - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, - .drops = CLUBBA_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -51,6 +48,9 @@ StaticNpc N(NpcData_Clubba_02)[] = { .detectSize = { 250, 90 }, } }, + .settings = &N(NpcSettings_Clubba_Napping), + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = CLUBBA_DROPS, .animations = CLUBBA_ANIMS, .aiDetectFlags = AI_DETECT_SENSITIVE_MOTION, }, diff --git a/src/world/area_dgb/dgb_03/dgb_03_5_npc.c b/src/world/area_dgb/dgb_03/dgb_03_5_npc.c index cec1a0819a..3a339438a3 100644 --- a/src/world/area_dgb/dgb_03/dgb_03_5_npc.c +++ b/src/world/area_dgb/dgb_03/dgb_03_5_npc.c @@ -3,7 +3,7 @@ #define INCLUDE_CLUBBA_WANDER #define INCLUDE_CLUBBA_PATROL #define INCLUDE_CLUBBA_NAPPING -#include "world/common/enemy/complete/Clubba_Multi.inc.c" +#include "world/common/enemy/Clubba_Multi.inc.c" EvtScript N(EVS_NpcInit_Clubba_Napping) = { EVT_CALL(GetEntryID, LVar0) @@ -14,14 +14,11 @@ EvtScript N(EVS_NpcInit_Clubba_Napping) = { EVT_END }; -StaticNpc N(NpcData_Clubba_Wander)[] = { +NpcData N(NpcData_Clubba_Wander)[] = { { .id = NPC_Clubba_Wander, - .settings = &N(NpcSettings_Clubba_Wander), .pos = { 180.0f, 0.0f, -122.0f }, .yaw = 270, - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, - .drops = CLUBBA_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -34,20 +31,20 @@ StaticNpc N(NpcData_Clubba_Wander)[] = { .detectSize = { 355, 255 }, } }, + .settings = &N(NpcSettings_Clubba_Wander), + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = CLUBBA_DROPS, .animations = CLUBBA_ANIMS, .aiDetectFlags = AI_DETECT_SENSITIVE_MOTION, }, CLUBBA_MACE_HITBOX(NPC_Clubba_Wander_Hitbox), }; -StaticNpc N(NpcData_Clubba_Patrol)[] = { +NpcData N(NpcData_Clubba_Patrol)[] = { { .id = NPC_Clubba_Patrol, - .settings = &N(NpcSettings_Clubba_Patrol), .pos = { -272.0f, 0.0f, -135.0f }, .yaw = 270, - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, - .drops = CLUBBA_DROPS, .territory = { .patrol = { .isFlying = TRUE, @@ -62,21 +59,20 @@ StaticNpc N(NpcData_Clubba_Patrol)[] = { .detectSize = { 355, 255 }, } }, + .settings = &N(NpcSettings_Clubba_Patrol), + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = CLUBBA_DROPS, .animations = CLUBBA_ANIMS, .aiDetectFlags = AI_DETECT_SENSITIVE_MOTION, }, CLUBBA_MACE_HITBOX(NPC_Clubba_Patrol_Hitbox), }; -StaticNpc N(NpcData_Clubba_Napping)[] = { +NpcData N(NpcData_Clubba_Napping)[] = { { .id = NPC_Clubba_Napping, - .settings = &N(NpcSettings_Clubba_Napping), .pos = { -326.0f, 210.0f, 80.0f }, .yaw = 90, - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, - .init = &N(EVS_NpcInit_Clubba_Napping), - .drops = CLUBBA_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -89,6 +85,10 @@ StaticNpc N(NpcData_Clubba_Napping)[] = { .detectSize = { 355, 255 }, } }, + .init = &N(EVS_NpcInit_Clubba_Napping), + .settings = &N(NpcSettings_Clubba_Napping), + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = CLUBBA_DROPS, .animations = CLUBBA_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT | AI_DETECT_SENSITIVE_MOTION, }, diff --git a/src/world/area_dgb/dgb_04/dgb_04_3_npc.c b/src/world/area_dgb/dgb_04/dgb_04_3_npc.c index ef72afdfc0..93e8b40f0f 100644 --- a/src/world/area_dgb/dgb_04/dgb_04_3_npc.c +++ b/src/world/area_dgb/dgb_04/dgb_04_3_npc.c @@ -2,15 +2,12 @@ #define AI_SENTINEL_FIRST_NPC NPC_Sentinel #define AI_SENTINEL_LAST_NPC NPC_Sentinel -#include "world/common/enemy/complete/Sentinel.inc.c" +#include "world/common/enemy/Sentinel.inc.c" -StaticNpc N(NpcData_Sentinel) = { +NpcData N(NpcData_Sentinel) = { .id = NPC_Sentinel, - .settings = &N(NpcSettings_Sentinel), .pos = { 70.0f, -220.0f, 186.0f }, .yaw = 90, - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, - .drops = SENTINEL_DROPS, .territory = { .wander = { .isFlying = FALSE, @@ -23,6 +20,9 @@ StaticNpc N(NpcData_Sentinel) = { .detectSize = { 80, 150 }, } }, + .settings = &N(NpcSettings_Sentinel), + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = NO_DROPS, .animations = SENTINEL_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, }; diff --git a/src/world/area_dgb/dgb_05/dgb_05_5_npc.c b/src/world/area_dgb/dgb_05/dgb_05_5_npc.c index f64c34cc29..4dbe5893a7 100644 --- a/src/world/area_dgb/dgb_05/dgb_05_5_npc.c +++ b/src/world/area_dgb/dgb_05/dgb_05_5_npc.c @@ -1,16 +1,13 @@ #include "dgb_05.h" #define INCLUDE_CLUBBA_NAPPING -#include "world/common/enemy/complete/Clubba_Multi.inc.c" +#include "world/common/enemy/Clubba_Multi.inc.c" -StaticNpc N(NpcData_Clubba_01)[] = { +NpcData N(NpcData_Clubba_01)[] = { { .id = NPC_Clubba_01, - .settings = &N(NpcSettings_Clubba_Napping), .pos = { 132.0f, -110.0f, 238.0f }, .yaw = 270, - .flags = ENEMY_FLAG_400, - .drops = CLUBBA_DROPS, .territory = { .wander = { .isFlying = FALSE, @@ -23,20 +20,20 @@ StaticNpc N(NpcData_Clubba_01)[] = { .detectSize = { 200 }, } }, + .settings = &N(NpcSettings_Clubba_Napping), + .flags = ENEMY_FLAG_400, + .drops = CLUBBA_DROPS, .animations = CLUBBA_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT | AI_DETECT_SENSITIVE_MOTION, }, CLUBBA_MACE_HITBOX(NPC_Clubba_01_Hitbox), }; -StaticNpc N(NpcData_Clubba_02)[] = { +NpcData N(NpcData_Clubba_02)[] = { { .id = NPC_Clubba_02, - .settings = &N(NpcSettings_Clubba_Napping), .pos = { 503.0f, -210.0f, 225.0f }, .yaw = 270, - .flags = ENEMY_FLAG_400, - .drops = CLUBBA_DROPS, .territory = { .wander = { .isFlying = FALSE, @@ -49,6 +46,9 @@ StaticNpc N(NpcData_Clubba_02)[] = { .detectSize = { 200, 150 }, } }, + .settings = &N(NpcSettings_Clubba_Napping), + .flags = ENEMY_FLAG_400, + .drops = CLUBBA_DROPS, .animations = CLUBBA_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT | AI_DETECT_SENSITIVE_MOTION, }, diff --git a/src/world/area_dgb/dgb_06/dgb_06_4_npc.c b/src/world/area_dgb/dgb_06/dgb_06_4_npc.c index 9ae0c9e025..52c4c611f6 100644 --- a/src/world/area_dgb/dgb_06/dgb_06_4_npc.c +++ b/src/world/area_dgb/dgb_06/dgb_06_4_npc.c @@ -23,14 +23,14 @@ EvtScript N(EVS_NpcInit_Boo) = { EVT_END }; -StaticNpc N(NpcData_Boo) = { +NpcData N(NpcData_Boo) = { .id = NPC_Boo, - .settings = &N(NpcSettings_Boo), .pos = { -300.0f, 10.0f, 150.0f }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_400, .init = &N(EVS_NpcInit_Boo), - .drops = NPC_NO_DROPS, + .settings = &N(NpcSettings_Boo), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_400, + .drops = NO_DROPS, .animations = GUSTY_BOO_ANIMS, .tattle = MSG_NpcTattle_HidingBoo, }; diff --git a/src/world/area_dgb/dgb_07/dgb_07_4_npc.c b/src/world/area_dgb/dgb_07/dgb_07_4_npc.c index c678c4b7bb..a41088ed3e 100644 --- a/src/world/area_dgb/dgb_07/dgb_07_4_npc.c +++ b/src/world/area_dgb/dgb_07/dgb_07_4_npc.c @@ -1,16 +1,13 @@ #include "dgb_07.h" #define INCLUDE_CLUBBA_NAPPING -#include "world/common/enemy/complete/Clubba_Multi.inc.c" +#include "world/common/enemy/Clubba_Multi.inc.c" -StaticNpc N(NpcData_Clubba_01)[] = { +NpcData N(NpcData_Clubba_01)[] = { { .id = NPC_Clubba_01, - .settings = &N(NpcSettings_Clubba_Napping), .pos = { -500.0f, 0.0f, -240.0f }, .yaw = 270, - .flags = ENEMY_FLAG_800, - .drops = CLUBBA_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -23,6 +20,9 @@ StaticNpc N(NpcData_Clubba_01)[] = { .detectSize = { 200 }, } }, + .settings = &N(NpcSettings_Clubba_Napping), + .flags = ENEMY_FLAG_800, + .drops = CLUBBA_DROPS, .animations = CLUBBA_ANIMS, .extraAnimations = N(ExtraAnims_Clubba), .aiDetectFlags = AI_DETECT_SENSITIVE_MOTION, diff --git a/src/world/area_dgb/dgb_08/dgb_08_3_npc.c b/src/world/area_dgb/dgb_08/dgb_08_3_npc.c index 6430ebd0ff..b1e91c5e28 100644 --- a/src/world/area_dgb/dgb_08/dgb_08_3_npc.c +++ b/src/world/area_dgb/dgb_08/dgb_08_3_npc.c @@ -1,7 +1,7 @@ #include "dgb_08.h" -#include "world/common/enemy/complete/TubbaBlubba_Patrol.inc.c" -#include "world/common/enemy/complete/TubbaBlubba.inc.c" +#include "world/common/enemy/TubbaBlubba_Patrol.inc.c" +#include "world/common/enemy/TubbaBlubba.inc.c" NpcSettings N(NpcSettings_Yakkey) = { .height = 24, @@ -10,11 +10,11 @@ NpcSettings N(NpcSettings_Yakkey) = { }; #define INCLUDE_CLUBBA_WANDER -#include "world/common/enemy/complete/Clubba_Multi.inc.c" +#include "world/common/enemy/Clubba_Multi.inc.c" #define AI_SENTINEL_FIRST_NPC NPC_Sentinel_01 #define AI_SENTINEL_LAST_NPC NPC_Tubba -#include "world/common/enemy/complete/Sentinel.inc.c" +#include "world/common/enemy/Sentinel.inc.c" NpcSettings N(NpcSettings_LastClubba) = { .height = 24, @@ -170,14 +170,10 @@ EvtScript N(EVS_NpcInit_Tubba) = { EVT_END }; -StaticNpc N(NpcData_Tubba) = { +NpcData N(NpcData_Tubba) = { .id = NPC_Tubba, - .settings = &N(NpcSettings_TubbaBlubba), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 270, - .flags = ENEMY_FLAG_4 | ENEMY_FLAG_40000 | ENEMY_FLAG_200000 | ENEMY_FLAG_NO_DROPS, - .init = &N(EVS_NpcInit_Tubba), - .drops = CLUBBA_DROPS, .territory = { .patrol = { .isFlying = FALSE, @@ -200,18 +196,19 @@ StaticNpc N(NpcData_Tubba) = { .detectSize = { 1450, 200 }, } }, + .init = &N(EVS_NpcInit_Tubba), + .settings = &N(NpcSettings_TubbaBlubba), + .flags = ENEMY_FLAG_4 | ENEMY_FLAG_40000 | ENEMY_FLAG_200000 | ENEMY_FLAG_NO_DROPS, + .drops = CLUBBA_DROPS, .animations = TUBBA_ANGRY_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, }; -StaticNpc N(NpcData_Clubba_01)[] = { +NpcData N(NpcData_Clubba_01)[] = { { .id = NPC_Clubba_01, - .settings = &N(NpcSettings_Clubba_Wander), .pos = { -250.0f, 0.0f, 135.0f }, .yaw = 90, - .flags = ENEMY_FLAG_400, - .drops = CLUBBA_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -224,6 +221,9 @@ StaticNpc N(NpcData_Clubba_01)[] = { .detectSize = { 250 }, } }, + .settings = &N(NpcSettings_Clubba_Wander), + .flags = ENEMY_FLAG_400, + .drops = CLUBBA_DROPS, .animations = CLUBBA_ANIMS, .extraAnimations = N(ExtraAnims_Clubba), .aiDetectFlags = AI_DETECT_SENSITIVE_MOTION, @@ -231,14 +231,11 @@ StaticNpc N(NpcData_Clubba_01)[] = { CLUBBA_MACE_HITBOX(NPC_Clubba_01_Hitbox), }; -StaticNpc N(NpcData_Clubba_02)[] = { +NpcData N(NpcData_Clubba_02)[] = { { .id = NPC_Clubba_02, - .settings = &N(NpcSettings_Clubba_Wander), .pos = { 220.0f, 0.0f, 155.0f }, .yaw = 270, - .flags = ENEMY_FLAG_400, - .drops = CLUBBA_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -251,6 +248,9 @@ StaticNpc N(NpcData_Clubba_02)[] = { .detectSize = { 250 }, } }, + .settings = &N(NpcSettings_Clubba_Wander), + .flags = ENEMY_FLAG_400, + .drops = CLUBBA_DROPS, .animations = CLUBBA_ANIMS, .extraAnimations = N(ExtraAnims_Clubba), .aiDetectFlags = AI_DETECT_SENSITIVE_MOTION, @@ -258,14 +258,11 @@ StaticNpc N(NpcData_Clubba_02)[] = { CLUBBA_MACE_HITBOX(NPC_Clubba_02_Hitbox), }; -StaticNpc N(NpcData_Clubba_03)[] = { +NpcData N(NpcData_Clubba_03)[] = { { .id = NPC_Clubba_03, - .settings = &N(NpcSettings_Clubba_Wander), .pos = { 825.0f, 100.0f, 200.0f }, .yaw = 270, - .flags = ENEMY_FLAG_400, - .drops = CLUBBA_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -278,6 +275,9 @@ StaticNpc N(NpcData_Clubba_03)[] = { .detectSize = { 150 }, } }, + .settings = &N(NpcSettings_Clubba_Wander), + .flags = ENEMY_FLAG_400, + .drops = CLUBBA_DROPS, .animations = CLUBBA_ANIMS, .extraAnimations = N(ExtraAnims_Clubba), .aiDetectFlags = AI_DETECT_SIGHT | AI_DETECT_SENSITIVE_MOTION, @@ -285,13 +285,10 @@ StaticNpc N(NpcData_Clubba_03)[] = { CLUBBA_MACE_HITBOX(NPC_Clubba_03_Hitbox), }; -StaticNpc N(NpcData_Sentinel_01) = { +NpcData N(NpcData_Sentinel_01) = { .id = NPC_Sentinel_01, - .settings = &N(NpcSettings_Sentinel), .pos = { 75.0f, 310.0f, 85.0f }, .yaw = 90, - .flags = ENEMY_FLAG_400, - .drops = SENTINEL_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -304,16 +301,16 @@ StaticNpc N(NpcData_Sentinel_01) = { .detectSize = { 250, 55 }, } }, + .settings = &N(NpcSettings_Sentinel), + .flags = ENEMY_FLAG_400, + .drops = NO_DROPS, .animations = SENTINEL_ANIMS, }; -StaticNpc N(NpcData_Sentinel_02) = { +NpcData N(NpcData_Sentinel_02) = { .id = NPC_Sentinel_02, - .settings = &N(NpcSettings_Sentinel), .pos = { -451.0f, 310.0f, 81.0f }, .yaw = 90, - .flags = ENEMY_FLAG_400, - .drops = SENTINEL_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -326,6 +323,9 @@ StaticNpc N(NpcData_Sentinel_02) = { .detectSize = { 250, 145 }, } }, + .settings = &N(NpcSettings_Sentinel), + .flags = ENEMY_FLAG_400, + .drops = NO_DROPS, .animations = SENTINEL_ANIMS, }; @@ -394,14 +394,10 @@ EvtScript N(EVS_NpcInit_LastClubba) = { EVT_END }; -StaticNpc N(NpcData_LastClubba) = { +NpcData N(NpcData_LastClubba) = { .id = NPC_Clubba_Last, - .settings = &N(NpcSettings_LastClubba), .pos = { 426.0f, 0.0f, 38.0f }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000, - .init = &N(EVS_NpcInit_LastClubba), - .drops = NPC_NO_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -414,6 +410,10 @@ StaticNpc N(NpcData_LastClubba) = { .detectSize = { 0 }, } }, + .init = &N(EVS_NpcInit_LastClubba), + .settings = &N(NpcSettings_LastClubba), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000, + .drops = NO_DROPS, .animations = CLUBBA_ANIMS, .aiDetectFlags = AI_DETECT_SENSITIVE_MOTION, .tattle = MSG_NpcTattle_LastClubba, @@ -431,14 +431,10 @@ EvtScript N(EVS_NpcInit_Clubba_Unused) = { EVT_END }; -StaticNpc N(NpcData_Clubba_Unused) = { +NpcData N(NpcData_Clubba_Unused) = { .id = NPC_Clubba_Unused, - .settings = &N(NpcSettings_Clubba_Wander), .pos = { -250.0f, 0.0f, 135.0f }, .yaw = 90, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_400, - .init = &N(EVS_NpcInit_Clubba_Unused), - .drops = CLUBBA_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -451,6 +447,10 @@ StaticNpc N(NpcData_Clubba_Unused) = { .detectSize = { 250 }, } }, + .init = &N(EVS_NpcInit_Clubba_Unused), + .settings = &N(NpcSettings_Clubba_Wander), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_400, + .drops = CLUBBA_DROPS, .animations = CLUBBA_ANIMS, .extraAnimations = N(ExtraAnims_Clubba), .aiDetectFlags = AI_DETECT_SENSITIVE_MOTION, diff --git a/src/world/area_dgb/dgb_09/dgb_09_4_npc.c b/src/world/area_dgb/dgb_09/dgb_09_4_npc.c index cfe3bfbc2c..057cad57a2 100644 --- a/src/world/area_dgb/dgb_09/dgb_09_4_npc.c +++ b/src/world/area_dgb/dgb_09/dgb_09_4_npc.c @@ -2,20 +2,17 @@ #define INCLUDE_CLUBBA_WANDER #define INCLUDE_CLUBBA_NAPPING -#include "world/common/enemy/complete/Clubba_Multi.inc.c" +#include "world/common/enemy/Clubba_Multi.inc.c" #define AI_SENTINEL_FIRST_NPC NPC_Sentinel #define AI_SENTINEL_LAST_NPC NPC_Sentinel -#include "world/common/enemy/complete/Sentinel.inc.c" +#include "world/common/enemy/Sentinel.inc.c" -StaticNpc N(NpcData_Clubba_Wander)[] = { +NpcData N(NpcData_Clubba_Wander)[] = { { .id = NPC_Clubba_Wander, - .settings = &N(NpcSettings_Clubba_Wander), .pos = { -350.0f, 0.0f, 180.0f }, .yaw = 270, - .flags = ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, - .drops = CLUBBA_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -28,6 +25,9 @@ StaticNpc N(NpcData_Clubba_Wander)[] = { .detectSize = { 600, 250 }, } }, + .settings = &N(NpcSettings_Clubba_Wander), + .flags = ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = CLUBBA_DROPS, .animations = CLUBBA_ANIMS, .extraAnimations = N(ExtraAnims_Clubba), .aiDetectFlags = AI_DETECT_SENSITIVE_MOTION, @@ -45,15 +45,11 @@ EvtScript N(EVS_NpcInit_Clubba_Napping) = { EVT_END }; -StaticNpc N(NpcData_Clubba_Napping)[] = { +NpcData N(NpcData_Clubba_Napping)[] = { { .id = NPC_Clubba_Napping, - .settings = &N(NpcSettings_Clubba_Napping), .pos = { 310.0f, 0.0f, 88.0f }, .yaw = 270, - .flags = ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, - .init = &N(EVS_NpcInit_Clubba_Napping), - .drops = CLUBBA_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -66,6 +62,10 @@ StaticNpc N(NpcData_Clubba_Napping)[] = { .detectSize = { 600, 250 }, } }, + .init = &N(EVS_NpcInit_Clubba_Napping), + .settings = &N(NpcSettings_Clubba_Napping), + .flags = ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = CLUBBA_DROPS, .animations = CLUBBA_ANIMS, .extraAnimations = N(ExtraAnims_Clubba), .aiDetectFlags = AI_DETECT_SENSITIVE_MOTION, @@ -73,13 +73,10 @@ StaticNpc N(NpcData_Clubba_Napping)[] = { CLUBBA_MACE_HITBOX(NPC_Clubba_Napping_Hitbox), }; -StaticNpc N(NpcData_Sentinel) = { +NpcData N(NpcData_Sentinel) = { .id = NPC_Sentinel, - .settings = &N(NpcSettings_Sentinel), .pos = { -20.0f, 100.0f, 180.0f }, .yaw = 90, - .flags = ENEMY_FLAG_400, - .drops = SENTINEL_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -92,6 +89,9 @@ StaticNpc N(NpcData_Sentinel) = { .detectSize = { 250 }, } }, + .settings = &N(NpcSettings_Sentinel), + .flags = ENEMY_FLAG_400, + .drops = NO_DROPS, .animations = SENTINEL_ANIMS, }; diff --git a/src/world/area_dgb/dgb_15/dgb_15_3_npc.c b/src/world/area_dgb/dgb_15/dgb_15_3_npc.c index 8e5136aa0d..3ede3e1298 100644 --- a/src/world/area_dgb/dgb_15/dgb_15_3_npc.c +++ b/src/world/area_dgb/dgb_15/dgb_15_3_npc.c @@ -1,9 +1,9 @@ #include "dgb_15.h" #define INCLUDE_CLUBBA_WANDER -#include "world/common/enemy/complete/Clubba_Multi.inc.c" +#include "world/common/enemy/Clubba_Multi.inc.c" -#include "world/common/enemy/complete/TubbaBlubba.inc.c" +#include "world/common/enemy/TubbaBlubba.inc.c" NpcSettings N(NpcSettings_Yakkey) = { .height = 24, @@ -162,14 +162,10 @@ EvtScript N(EVS_NpcInit_Tubba) = { EVT_END }; -StaticNpc N(NpcData_Tubba) = { +NpcData N(NpcData_Tubba) = { .id = NPC_Tubba, - .settings = &N(NpcSettings_TubbaBlubba), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 270, - .flags = ENEMY_FLAG_100 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_200000 | ENEMY_FLAG_NO_DROPS, - .init = &N(EVS_NpcInit_Tubba), - .drops = CLUBBA_DROPS, .territory = { .patrol = { .isFlying = TRUE, @@ -189,6 +185,10 @@ StaticNpc N(NpcData_Tubba) = { .detectSize = { 1000, 250 }, } }, + .init = &N(EVS_NpcInit_Tubba), + .settings = &N(NpcSettings_TubbaBlubba), + .flags = ENEMY_FLAG_100 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_200000 | ENEMY_FLAG_NO_DROPS, + .drops = CLUBBA_DROPS, .animations = TUBBA_ANIMS, .aiDetectFlags = AI_DETECT_SENSITIVE_MOTION, }; diff --git a/src/world/area_dgb/dgb_16/dgb_16_4_npc.c b/src/world/area_dgb/dgb_16/dgb_16_4_npc.c index f80ee0f9ce..dfba27841b 100644 --- a/src/world/area_dgb/dgb_16/dgb_16_4_npc.c +++ b/src/world/area_dgb/dgb_16/dgb_16_4_npc.c @@ -1,16 +1,13 @@ #include "dgb_16.h" #define INCLUDE_CLUBBA_NAPPING -#include "world/common/enemy/complete/Clubba_Multi.inc.c" +#include "world/common/enemy/Clubba_Multi.inc.c" -StaticNpc N(NpcData_Clubba_01)[] = { +NpcData N(NpcData_Clubba_01)[] = { { .id = NPC_Clubba_01, - .settings = &N(NpcSettings_Clubba_Napping), .pos = { -70.0f, 0.0f, -100.0f }, .yaw = 270, - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, - .drops = CLUBBA_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -23,6 +20,9 @@ StaticNpc N(NpcData_Clubba_01)[] = { .detectSize = { 430, 92 }, } }, + .settings = &N(NpcSettings_Clubba_Napping), + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = CLUBBA_DROPS, .animations = CLUBBA_ANIMS, .extraAnimations = N(ExtraAnims_Clubba), .aiDetectFlags = AI_DETECT_SENSITIVE_MOTION, @@ -30,14 +30,11 @@ StaticNpc N(NpcData_Clubba_01)[] = { CLUBBA_MACE_HITBOX(NPC_Clubba_01_Hitbox), }; -StaticNpc N(NpcData_Clubba_02)[] = { +NpcData N(NpcData_Clubba_02)[] = { { .id = NPC_Clubba_02, - .settings = &N(NpcSettings_Clubba_Napping), .pos = { 0.0f, 0.0f, -235.0f }, .yaw = 90, - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, - .drops = CLUBBA_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -50,20 +47,20 @@ StaticNpc N(NpcData_Clubba_02)[] = { .detectSize = { 430, 92 }, } }, + .settings = &N(NpcSettings_Clubba_Napping), + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = CLUBBA_DROPS, .animations = CLUBBA_ANIMS, .aiDetectFlags = AI_DETECT_SENSITIVE_MOTION, }, CLUBBA_MACE_HITBOX(NPC_Clubba_02_Hitbox), }; -StaticNpc N(NpcData_Clubba_03)[] = { +NpcData N(NpcData_Clubba_03)[] = { { .id = NPC_Clubba_03, - .settings = &N(NpcSettings_Clubba_Napping), .pos = { 70.0f, 0.0f, -100.0f }, .yaw = 90, - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, - .drops = CLUBBA_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -76,20 +73,20 @@ StaticNpc N(NpcData_Clubba_03)[] = { .detectSize = { 430, 92 }, } }, + .settings = &N(NpcSettings_Clubba_Napping), + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = CLUBBA_DROPS, .animations = CLUBBA_ANIMS, .aiDetectFlags = AI_DETECT_SENSITIVE_MOTION, }, CLUBBA_MACE_HITBOX(NPC_Clubba_03_Hitbox), }; -StaticNpc N(NpcData_Clubba_04)[] = { +NpcData N(NpcData_Clubba_04)[] = { { .id = NPC_Clubba_04, - .settings = &N(NpcSettings_Clubba_Napping), .pos = { 140.0f, 0.0f, -235.0f }, .yaw = 270, - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, - .drops = CLUBBA_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -102,20 +99,20 @@ StaticNpc N(NpcData_Clubba_04)[] = { .detectSize = { 430, 92 }, } }, + .settings = &N(NpcSettings_Clubba_Napping), + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = CLUBBA_DROPS, .animations = CLUBBA_ANIMS, .aiDetectFlags = AI_DETECT_SENSITIVE_MOTION, }, CLUBBA_MACE_HITBOX(NPC_Clubba_04_Hitbox), }; -StaticNpc N(NpcData_Clubba_05)[] = { +NpcData N(NpcData_Clubba_05)[] = { { .id = NPC_Clubba_05, - .settings = &N(NpcSettings_Clubba_Napping), .pos = { 210.0f, 0.0f, -100.0f }, .yaw = 270, - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, - .drops = CLUBBA_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -128,20 +125,20 @@ StaticNpc N(NpcData_Clubba_05)[] = { .detectSize = { 430, 92 }, } }, + .settings = &N(NpcSettings_Clubba_Napping), + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = CLUBBA_DROPS, .animations = CLUBBA_ANIMS, .aiDetectFlags = AI_DETECT_SENSITIVE_MOTION, }, CLUBBA_MACE_HITBOX(NPC_Clubba_05_Hitbox), }; -StaticNpc N(NpcData_Clubba_06)[] = { +NpcData N(NpcData_Clubba_06)[] = { { .id = NPC_Clubba_06, - .settings = &N(NpcSettings_Clubba_Napping), .pos = { 280.0f, 0.0f, -235.0f }, .yaw = 90, - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, - .drops = CLUBBA_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -154,6 +151,9 @@ StaticNpc N(NpcData_Clubba_06)[] = { .detectSize = { 430, 92 }, } }, + .settings = &N(NpcSettings_Clubba_Napping), + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = CLUBBA_DROPS, .animations = CLUBBA_ANIMS, .aiDetectFlags = AI_DETECT_SENSITIVE_MOTION, }, 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 7644ce7cb3..4cc879a938 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 @@ -4,8 +4,8 @@ extern EvtScript N(EVS_NpcAI_Tubba_Chase); extern EvtScript N(EVS_NpcAI_Tubba_WakeUp); -#include "world/common/enemy/complete/TubbaBlubba_Patrol.inc.c" -#include "world/common/enemy/complete/TubbaBlubba.inc.c" +#include "world/common/enemy/TubbaBlubba_Patrol.inc.c" +#include "world/common/enemy/TubbaBlubba.inc.c" #include "world/common/todo/UnkFunc1.inc.c" @@ -486,14 +486,10 @@ EvtScript N(EVS_NpcInit_Yakkey) = { EVT_END }; -StaticNpc N(NpcData_Tubba) = { +NpcData N(NpcData_Tubba) = { .id = NPC_Tubba, - .settings = &N(NpcSettings_TubbaBlubba), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 270, - .flags = ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_200000 | ENEMY_FLAG_NO_DROPS, - .init = &N(EVS_NpcInit_Tubba), - .drops = TUBBA_DROPS, .territory = { .patrol = { .isFlying = TRUE, @@ -511,17 +507,21 @@ StaticNpc N(NpcData_Tubba) = { .detectSize = { 1000, 250 }, } }, + .init = &N(EVS_NpcInit_Tubba), + .settings = &N(NpcSettings_TubbaBlubba), + .flags = ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_200000 | ENEMY_FLAG_NO_DROPS, + .drops = NO_DROPS, .animations = TUBBA_ANGRY_ANIMS, }; -StaticNpc N(NpcData_Yakkey) = { +NpcData N(NpcData_Yakkey) = { .id = NPC_Yakkey, - .settings = &N(NpcSettings_Yakkey), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_Yakkey), - .drops = NPC_NO_DROPS, + .settings = &N(NpcSettings_Yakkey), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_800, + .drops = NO_DROPS, .animations = { .idle = ANIM_Yakkey_Idle, .walk = ANIM_Yakkey_Idle, diff --git a/src/world/area_dro/dro.h b/src/world/area_dro/dro.h index 333daca2ef..f7efc7e5e9 100644 --- a/src/world/area_dro/dro.h +++ b/src/world/area_dro/dro.h @@ -9,15 +9,15 @@ enum { AB_DRO_SHOP_PREV1 = AreaByte(4), AB_DRO_SHOP_PREV2 = AreaByte(5), AB_DRO_SHOP_PREV3 = AreaByte(6), - AB_DRO_7 = AreaByte(7), - AB_DRO_8 = AreaByte(8), - AB_DRO_9 = AreaByte(9), - AB_DRO_A = AreaByte(10), - AB_DRO_B = AreaByte(11), - AB_DRO_C = AreaByte(12), - AB_DRO_D = AreaByte(13), - AB_DRO_E = AreaByte(14), - AB_DRO_F = AreaByte(15), + AB_DRO_Unused_7 = AreaByte(7), + AB_DRO_Unused_8 = AreaByte(8), + AB_DRO_Unused_9 = AreaByte(9), + AB_DRO_Unused_A = AreaByte(10), + AB_DRO_Unused_B = AreaByte(11), + AB_DRO_Unused_C = AreaByte(12), + AB_DRO_Unused_D = AreaByte(13), + AB_DRO_Unused_E = AreaByte(14), + AB_DRO_Unused_F = AreaByte(15), }; enum { diff --git a/src/world/area_dro/dro_01/dro_01_3_npc.c b/src/world/area_dro/dro_01/dro_01_3_npc.c index 0ab02c6200..ceebb98069 100644 --- a/src/world/area_dro/dro_01/dro_01_3_npc.c +++ b/src/world/area_dro/dro_01/dro_01_3_npc.c @@ -189,26 +189,22 @@ EvtScript N(EVS_NpcInit_Dryite_06) = { EVT_END }; -StaticNpc N(PassiveNPCs)[] = { +NpcData N(PassiveNPCs)[] = { { .id = NPC_Mouser_01, - .settings = &N(NpcSettings_Mouser), .pos = { -332.0f, 0.0f, 188.0f }, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, - .init = &N(EVS_NpcInit_Mouser_01), .yaw = 90, - .drops = MOUSER_DROPS, + .init = &N(EVS_NpcInit_Mouser_01), + .settings = &N(NpcSettings_Mouser), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .drops = NO_DROPS, .animations = MOUSER_BLUE_ANIMS, .tattle = MSG_NpcTattle_DRO_Greeter, }, { .id = NPC_Dryite_01, - .settings = &N(NpcSettings_Dryite_Wander), .pos = { -235.0f, 0.0f, 160.0f }, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, - .init = &N(EVS_NpcInit_Dryite_01), .yaw = 90, - .drops = DRYITE_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -221,54 +217,54 @@ StaticNpc N(PassiveNPCs)[] = { .detectSize = { 0 }, } }, + .init = &N(EVS_NpcInit_Dryite_01), + .settings = &N(NpcSettings_Dryite_Wander), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .drops = NO_DROPS, .animations = DRYITE_YELLOW_ANIMS, .tattle = MSG_NpcTattle_DRO_DryiteA, }, { .id = NPC_Dryite_02, - .settings = &N(NpcSettings_Dryite), .pos = { -380.0f, 0.0f, -15.0f }, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, - .init = &N(EVS_NpcInit_Dryite_02), .yaw = 61, - .drops = DRYITE_DROPS, + .init = &N(EVS_NpcInit_Dryite_02), + .settings = &N(NpcSettings_Dryite), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .drops = NO_DROPS, .animations = DRYITE_BLUE_ANIMS, .tattle = MSG_NpcTattle_DRO_DryiteD, }, { .id = NPC_Dryite_03, - .settings = &N(NpcSettings_Dryite), .pos = { 195.0f, 0.0f, -75.0f }, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, - .init = &N(EVS_NpcInit_HintDryite), .yaw = 74, - .drops = DRYITE_DROPS, + .init = &N(EVS_NpcInit_HintDryite), + .settings = &N(NpcSettings_Dryite), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .drops = NO_DROPS, .animations = DRYITE_GREEN_ANIMS, .tattle = MSG_NpcTattle_DRO_DryiteB, }, { .id = NPC_Dryite_04, - .settings = &N(NpcSettings_Dryite), .pos = { 225.0f, 0.0f, -83.0f }, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, - .init = &N(EVS_NpcInit_Dryite_04), .yaw = 257, - .drops = DRYITE_DROPS, + .init = &N(EVS_NpcInit_Dryite_04), + .settings = &N(NpcSettings_Dryite), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .drops = NO_DROPS, .animations = DRYITE_GREEN_ANIMS, .tattle = MSG_NpcTattle_DRO_DryiteC, }, { .id = NPC_ArtistToad, - .settings = &N(NpcSettings_Dryite), .pos = { 285.0f, 0.0f, -274.0f }, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, - .init = &N(EVS_NpcInit_Composer), .yaw = 271, - .drops = { - .dropFlags = NPC_DROP_FLAG_80, - .heartDrops = NO_DROPS, - .flowerDrops = NO_DROPS, - }, + .init = &N(EVS_NpcInit_Composer), + .settings = &N(NpcSettings_Dryite), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .drops = NO_DROPS, .animations = { ANIM_Musician_Composer_Idle, ANIM_Musician_Composer_Still, @@ -291,28 +287,24 @@ StaticNpc N(PassiveNPCs)[] = { }, { .id = NPC_Mouser_ShopOwner, - .settings = &N(NpcSettings_Mouser), .pos = { 31.0f, 0.0f, -374.0f }, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, - .init = &N(EVS_NpcInit_ShopOwner), .yaw = 180, - .drops = MOUSER_DROPS, + .init = &N(EVS_NpcInit_ShopOwner), + .settings = &N(NpcSettings_Mouser), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .drops = NO_DROPS, .animations = MOUSER_PURPLE_ANIMS, .tattle = MSG_NpcTattle_DRO_ShopOwner, }, { .id = NPC_ChuckQuizmo, - .settings = &N(NpcSettings_ChuckQuizmo), .pos = { -400.0f, 0.0f, 100.0f }, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .yaw = 263, .initVarCount = 1, .initVar = { .bytes = { 0, QUIZ_AREA_DRO, QUIZ_COUNT_DRO, QUIZ_MAP_DRO_01 }}, - .yaw = 263, - .drops = { - .dropFlags = NPC_DROP_FLAG_80, - .heartDrops = NO_DROPS, - .flowerDrops = NO_DROPS, - }, + .settings = &N(NpcSettings_ChuckQuizmo), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = NO_DROPS, .animations = { .idle = ANIM_ChuckQuizmo_Idle, .walk = ANIM_ChuckQuizmo_Walk, @@ -335,12 +327,8 @@ StaticNpc N(PassiveNPCs)[] = { }, { .id = NPC_Dryite_05, - .settings = &N(NpcSettings_Dryite_Wander), .pos = { -120.0f, 0.0f, 134.0f }, .yaw = 257, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, - .init = &N(EVS_NpcInit_DojoGrad), - .drops = DRYITE_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -353,17 +341,17 @@ StaticNpc N(PassiveNPCs)[] = { .detectSize = { 0 }, } }, + .init = &N(EVS_NpcInit_DojoGrad), + .settings = &N(NpcSettings_Dryite_Wander), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .drops = NO_DROPS, .animations = DRYITE_BROWN_ANIMS, .tattle = MSG_NpcTattle_DRO_DojoGraduate, }, { .id = NPC_Dryite_06, - .settings = &N(NpcSettings_Dryite_Patrol), .pos = { 40.0f, 0.0f, 105.0f }, .yaw = 270, - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, - .init = &N(EVS_NpcInit_Dryite_06), - .drops = DRYITE_DROPS, .territory = { .patrol = { .isFlying = TRUE, @@ -378,42 +366,46 @@ StaticNpc N(PassiveNPCs)[] = { .detectSize = { 0 }, } }, + .init = &N(EVS_NpcInit_Dryite_06), + .settings = &N(NpcSettings_Dryite_Patrol), + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, + .drops = NO_DROPS, .animations = DRYITE_BROWN_ANIMS, .tattle = MSG_NpcTattle_DRO_WorriedDryite, }, }; -StaticNpc N(ThreeSisterNPCs)[] = { +NpcData N(ThreeSisterNPCs)[] = { { .id = NPC_ThreeSisters_01, - .settings = &N(NpcSettings_Toad_Stationary), .pos = { -141.0f, 0.0f, -18.0f }, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, - .init = &N(EVS_NpcInit_ThreeSisters), .yaw = 62, - .drops = TOADETTE_DROPS, + .init = &N(EVS_NpcInit_ThreeSisters), + .settings = &N(NpcSettings_Toad_Stationary), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .drops = NO_DROPS, .animations = TOADETTE_PINK_ANIMS, .tattle = MSG_NpcTattle_TravelingMaidA, }, { .id = NPC_ThreeSisters_02, - .settings = &N(NpcSettings_Toad_Stationary), .pos = { -124.0f, 0.0f, -61.0f }, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, - .init = &N(EVS_NpcInit_ThreeSisters), .yaw = 63, - .drops = TOADETTE_DROPS, + .init = &N(EVS_NpcInit_ThreeSisters), + .settings = &N(NpcSettings_Toad_Stationary), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .drops = NO_DROPS, .animations = TOADETTE_PINK_ANIMS, .tattle = MSG_NpcTattle_TravelingMaidB, }, { .id = NPC_ThreeSisters_03, - .settings = &N(NpcSettings_Toad_Stationary), .pos = { -80.0f, 0.0f, -35.0f }, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, - .init = &N(EVS_NpcInit_ThreeSisters), .yaw = 244, - .drops = TOADETTE_DROPS, + .init = &N(EVS_NpcInit_ThreeSisters), + .settings = &N(NpcSettings_Toad_Stationary), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .drops = NO_DROPS, .animations = TOADETTE_PINK_ANIMS, .tattle = MSG_NpcTattle_TravelingMaidC, }, diff --git a/src/world/area_dro/dro_02/dro_02_5_npc.c b/src/world/area_dro/dro_02/dro_02_5_npc.c index f72db9055a..d3ef0ad7b5 100644 --- a/src/world/area_dro/dro_02/dro_02_5_npc.c +++ b/src/world/area_dro/dro_02/dro_02_5_npc.c @@ -354,20 +354,16 @@ EvtScript N(EVS_NpcInit_ToadHouseKeeper) = { EVT_END }; -StaticNpc N(PassiveNPCs)[] = { +NpcData N(PassiveNPCs)[] = { { .id = NPC_Archeologist, - .settings = &N(NpcSettings_Archeologist), .pos = { -320.0f, 0.0f, -14.0f }, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, - .init = &N(EVS_NpcInit_Archeologist), .yaw = 90, - .drops = { - .dropFlags = NPC_DROP_FLAG_80, - .heartDrops = NO_DROPS, - .flowerDrops = NO_DROPS, - }, .territory = { .temp = { -303, 0, 22, 146, 38, -32767, 1, 0, 0, 0, 0, 0, 0, 1 }}, + .init = &N(EVS_NpcInit_Archeologist), + .settings = &N(NpcSettings_Archeologist), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .drops = NO_DROPS, .animations = { ANIM_Archeologist_Idle, ANIM_Archeologist_Walk, @@ -390,50 +386,46 @@ StaticNpc N(PassiveNPCs)[] = { }, { .id = NPC_Dryite_01, - .settings = &N(NpcSettings_Dryite_Wander), .pos = { -20.0f, 0.0f, 40.0f }, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, - .init = &N(EVS_NpcInit_MrE), .yaw = 270, - .drops = DRYITE_DROPS, .territory = { .temp = { -20, 0, 40, 60, 0, -32767, 0, 0, 0, 0, 0, 0, 0, 1 }}, + .init = &N(EVS_NpcInit_MrE), + .settings = &N(NpcSettings_Dryite_Wander), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .drops = NO_DROPS, .animations = DRYITE_BLUE_ANIMS, .tattle = MSG_NpcTattle_DRO_DryiteE, }, { .id = NPC_DisguisedMoustafa, - .settings = &N(NpcSettings_Mouser), .pos = { 245.0f, 0.0f, -35.0f }, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, - .init = &N(EVS_NpcInit_DisguisedMoustafa), .yaw = 90, - .drops = MOUSER_DROPS, + .init = &N(EVS_NpcInit_DisguisedMoustafa), + .settings = &N(NpcSettings_Mouser), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .drops = NO_DROPS, .animations = DISGUISED_MOUSTAFA_ANIMS, .tattle = MSG_NpcTattle_Sheek, }, { .id = NPC_Toad, - .settings = &N(NpcSettings_Toad_Stationary), .pos = { -143.0f, 0.0f, -170.0f }, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, - .init = &N(EVS_NpcInit_ToadHouseKeeper), .yaw = 180, - .drops = TOAD_DROPS, + .init = &N(EVS_NpcInit_ToadHouseKeeper), + .settings = &N(NpcSettings_Toad_Stationary), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .drops = NO_DROPS, .animations = TOAD_RED_ANIMS, .tattle = MSG_NpcTattle_DRO_ToadHouseToad, }, { .id = NPC_Merlee, - .settings = &N(NpcSettings_Merlee), .pos = { -130.0f, 0.0f, -400.0f }, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, - .init = &N(EVS_NpcAuxAI_Merlee), .yaw = 180, - .drops = { - .dropFlags = NPC_DROP_FLAG_80, - .heartDrops = NO_DROPS, - .flowerDrops = NO_DROPS, - }, + .init = &N(EVS_NpcAuxAI_Merlee), + .settings = &N(NpcSettings_Merlee), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .drops = NO_DROPS, .animations = { ANIM_WorldMerlee_Idle, ANIM_WorldMerlee_Walk, @@ -456,82 +448,78 @@ StaticNpc N(PassiveNPCs)[] = { }, { .id = NPC_Moustafa, - .settings = &N(NpcSettings_Mouser), .pos = { NPC_DISPOSE_LOCATION }, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, - .init = &N(EVS_NpcInit_Moustafa), .yaw = 0, - .drops = MOUSER_DROPS, + .init = &N(EVS_NpcInit_Moustafa), + .settings = &N(NpcSettings_Mouser), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .drops = NO_DROPS, .animations = MOUSTAFA_ANIMS, .tattle = MSG_NpcTattle_Moustafa, }, { .id = NPC_Dryite_02, - .settings = &N(NpcSettings_Dryite), .pos = { 25.0f, 0.0f, -38.0f }, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, - .init = &N(EVS_NpcInit_Dryite_02), .yaw = 270, - .drops = DRYITE_DROPS, + .init = &N(EVS_NpcInit_Dryite_02), + .settings = &N(NpcSettings_Dryite), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .drops = NO_DROPS, .animations = DRYITE_GREEN_ANIMS, .tattle = MSG_NpcTattle_DRO_DryiteF, }, { .id = NPC_Dryite_03, - .settings = &N(NpcSettings_Dryite), .pos = { -375.0f, 0.0f, -10.0f }, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, - .init = &N(EVS_NpcInit_Dryite_03), .yaw = 270, - .drops = DRYITE_DROPS, + .init = &N(EVS_NpcInit_Dryite_03), + .settings = &N(NpcSettings_Dryite), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .drops = NO_DROPS, .animations = DRYITE_GREEN_ANIMS, .tattle = MSG_NpcTattle_DRO_VisitedShootingStarSummit, }, { .id = NPC_Mouser_01, - .settings = &N(NpcSettings_Mouser), .pos = { -50.0f, 0.0f, -470.0f }, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, - .init = &N(EVS_NpcInit_Mouser_01), .yaw = 180, - .drops = { - .dropFlags = NPC_DROP_FLAG_80, - .heartDrops = NO_DROPS, - .flowerDrops = NO_DROPS, - }, + .init = &N(EVS_NpcInit_Mouser_01), + .settings = &N(NpcSettings_Mouser), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .drops = NO_DROPS, .animations = MOUSER_BLUE_ANIMS, .tattle = MSG_NpcTattle_DRO_CrushingOnMerlee, }, { .id = NPC_Mouser_02, - .settings = &N(NpcSettings_Mouser), .pos = { -270.0f, 0.0f, 91.0f }, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, - .init = &N(EVS_NpcInit_Mouser_02), .yaw = 270, - .drops = MOUSER_DROPS, + .init = &N(EVS_NpcInit_Mouser_02), + .settings = &N(NpcSettings_Mouser), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .drops = NO_DROPS, .animations = MOUSER_BLUE_ANIMS, .tattle = MSG_NpcTattle_DRO_TellsTales, }, { .id = NPC_Mouser_03, - .settings = &N(NpcSettings_Mouser), .pos = { 210.0f, 0.0f, -35.0f }, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, - .init = &N(EVS_NpcInit_Mouser_03), .yaw = 90, - .drops = MOUSER_DROPS, + .init = &N(EVS_NpcInit_Mouser_03), + .settings = &N(NpcSettings_Mouser), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .drops = NO_DROPS, .animations = MOUSER_PURPLE_ANIMS, }, { .id = NPC_ChuckQuizmo, - .settings = &N(NpcSettings_ChuckQuizmo), .pos = { -335.0f, 0.0f, 90.0f }, - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, + .yaw = 270, .initVarCount = 1, .initVar = { .bytes = { 0, QUIZ_AREA_DRO, QUIZ_COUNT_DRO, QUIZ_MAP_DRO_02 } }, - .yaw = 270, - .drops = QUIZMO_DROPS, + .settings = &N(NpcSettings_ChuckQuizmo), + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, + .drops = NO_DROPS, .animations = QUIZMO_ANIMS, .tattle = MSG_NpcTattle_ChuckQuizmo, }, diff --git a/src/world/area_end/end.h b/src/world/area_end/end.h index 16f47cf059..2afa83b250 100644 --- a/src/world/area_end/end.h +++ b/src/world/area_end/end.h @@ -2,22 +2,22 @@ #define _WORLD_AREA_END_END_H_ enum { - AB_END_0 = AreaByte(0), - AB_END_1 = AreaByte(1), - AB_END_2 = AreaByte(2), - AB_END_3 = AreaByte(3), - AB_END_4 = AreaByte(4), - AB_END_5 = AreaByte(5), - AB_END_6 = AreaByte(6), - AB_END_7 = AreaByte(7), - AB_END_8 = AreaByte(8), - AB_END_9 = AreaByte(9), - AB_END_A = AreaByte(10), - AB_END_B = AreaByte(11), - AB_END_C = AreaByte(12), - AB_END_D = AreaByte(13), - AB_END_E = AreaByte(14), - AB_END_F = AreaByte(15), + AB_END_Unused_0 = AreaByte(0), + AB_END_Unused_1 = AreaByte(1), + AB_END_Unused_2 = AreaByte(2), + AB_END_Unused_3 = AreaByte(3), + AB_END_Unused_4 = AreaByte(4), + AB_END_Unused_5 = AreaByte(5), + AB_END_Unused_6 = AreaByte(6), + AB_END_Unused_7 = AreaByte(7), + AB_END_Unused_8 = AreaByte(8), + AB_END_Unused_9 = AreaByte(9), + AB_END_Unused_A = AreaByte(10), + AB_END_Unused_B = AreaByte(11), + AB_END_Unused_C = AreaByte(12), + AB_END_Unused_D = AreaByte(13), + AB_END_Unused_E = AreaByte(14), + AB_END_Unused_F = AreaByte(15), }; #define AF_END(index) AreaFlag(index) diff --git a/src/world/area_end/end_00/end_00_3_parade_setup.c b/src/world/area_end/end_00/end_00_3_parade_setup.c index b11fbcf6ef..3af47183ed 100644 --- a/src/world/area_end/end_00/end_00_3_parade_setup.c +++ b/src/world/area_end/end_00/end_00_3_parade_setup.c @@ -205,65 +205,65 @@ EvtScript N(EVS_TexPan_Water) = { EVT_END }; -s32 N(ExtraAnims_Tutankoopa)[] = { +AnimID N(ExtraAnims_Tutankoopa)[] = { ANIM_Tutankoopa_Anim02, ANIM_Tutankoopa_Anim06, ANIM_Tutankoopa_Anim09, ANIM_Tutankoopa_Anim01, ANIM_Tutankoopa_Anim04, - -1 + ANIM_LIST_END }; -s32 N(ExtraAnims_Rowf)[] = { +AnimID N(ExtraAnims_Rowf)[] = { ANIM_Rowf_PackedStill, ANIM_Rowf_PackedIdle, ANIM_Rowf_PackedWalk, ANIM_Rowf_PackedRun, ANIM_Rowf_PackedTalk, ANIM_Rowf_PackedCheer, - -1 + ANIM_LIST_END }; -s32 N(ExtraAnims_Moustafa)[] = { +AnimID N(ExtraAnims_Moustafa)[] = { ANIM_Moustafa_Run, ANIM_Moustafa_Shout, ANIM_Moustafa_Talk, ANIM_Moustafa_Toss, ANIM_Moustafa_Idle, - -1 + ANIM_LIST_END }; -s32 N(ExtraAnims_Mouser)[] = { +AnimID N(ExtraAnims_Mouser)[] = { ANIM_Mouser_Blue_Run, ANIM_Mouser_Blue_IdleOnlyBlink, ANIM_Mouser_Blue_Whisper, - -1 + ANIM_LIST_END }; -s32 N(ExtraAnims_Buzzar)[] = { +AnimID N(ExtraAnims_Buzzar)[] = { ANIM_Buzzar_Anim05, ANIM_Buzzar_Anim03, - -1 + ANIM_LIST_END }; -s32 N(ExtraAnims_GoombaKing)[] = { +AnimID N(ExtraAnims_GoombaKing)[] = { ANIM_GoombaKing_Still, ANIM_GoombaKing_Dead, ANIM_GoombaKing_Angry, - -1 + ANIM_LIST_END }; -s32 N(ExtraAnims_RaphaelRaven)[] = { +AnimID N(ExtraAnims_RaphaelRaven)[] = { ANIM_RaphaelRaven_IdleNoFeet, - -1 + ANIM_LIST_END }; -s32 N(ExtraAnims_LavaPiranha)[] = { +AnimID N(ExtraAnims_LavaPiranha)[] = { ANIM_LavaPiranha_Anim04, - -1 + ANIM_LIST_END }; -s32 N(ExtraAnims_HuffNPuff)[] = { +AnimID N(ExtraAnims_HuffNPuff)[] = { ANIM_HuffNPuff_Anim01, ANIM_HuffNPuff_Anim02, ANIM_HuffNPuff_Anim03, @@ -273,17 +273,17 @@ s32 N(ExtraAnims_HuffNPuff)[] = { ANIM_HuffNPuff_Anim26, ANIM_HuffNPuff_Anim27, ANIM_HuffNPuff_Anim28, - -1 + ANIM_LIST_END }; -s32 N(ExtraAnims_TuffPuff)[] = { +AnimID N(ExtraAnims_TuffPuff)[] = { ANIM_TuffPuff_Idle, ANIM_TuffPuff_Hurt, ANIM_TuffPuff_Blush, - -1 + ANIM_LIST_END }; -s32 N(ExtraAnims_GourmetGuy)[] = { +AnimID N(ExtraAnims_GourmetGuy)[] = { ANIM_GourmetGuy_Walk, ANIM_GourmetGuy_Leap, ANIM_GourmetGuy_TalkSurprise, @@ -291,26 +291,26 @@ s32 N(ExtraAnims_GourmetGuy)[] = { ANIM_GourmetGuy_Idle, ANIM_GourmetGuy_Inspect, ANIM_GourmetGuy_Panic, - -1 + ANIM_LIST_END }; -s32 N(ExtraAnims_MageJrTroopa)[] = { +AnimID N(ExtraAnims_MageJrTroopa)[] = { ANIM_MageJrTroopa_Idle, ANIM_MageJrTroopa_Run, ANIM_MageJrTroopa_RaiseStaff, ANIM_MageJrTroopa_SwingStaff, ANIM_MageJrTroopa_BurnStill, - -1 + ANIM_LIST_END }; -s32 N(ExtraAnims_Kammy)[] = { +AnimID N(ExtraAnims_Kammy)[] = { ANIM_WorldKammy_Anim14, ANIM_WorldKammy_Anim0C, ANIM_WorldKammy_Anim0E, ANIM_WorldKammy_Anim0F, ANIM_WorldKammy_Anim12, ANIM_WorldKammy_Anim07, - -1 + ANIM_LIST_END }; ParadeNpcInfo N(ParadeNpcsTable)[] = { diff --git a/src/world/area_end/end_00/end_00_7_boos.c b/src/world/area_end/end_00/end_00_7_boos.c index 215b4d0164..0e2d600162 100644 --- a/src/world/area_end/end_00/end_00_7_boos.c +++ b/src/world/area_end/end_00/end_00_7_boos.c @@ -193,11 +193,11 @@ EvtScript N(EVS_ParadePhase_GoombaKing) = { EVT_CALL(NpcJump0, NPC_BlueGoombaBros, LVar0, LVar1, LVar2, 20) EVT_END_THREAD EVT_LOOP(16) - EVT_CALL(ShowSweat, NPC_RedGoombaBros, 0, 45, 1, 0, 0, 0, 0, 20) - EVT_CALL(ShowSweat, NPC_BlueGoombaBros, 0, -45, 1, 0, 0, 0, 0, 20) + EVT_CALL(ShowSweat, NPC_RedGoombaBros, 0, 45, EMOTER_NPC, 0, 0, 0, 0, 20) + EVT_CALL(ShowSweat, NPC_BlueGoombaBros, 0, -45, EMOTER_NPC, 0, 0, 0, 0, 20) EVT_WAIT(10) - EVT_CALL(ShowSweat, NPC_RedGoombaBros, 0, -45, 1, 0, 0, 0, 0, 20) - EVT_CALL(ShowSweat, NPC_BlueGoombaBros, 0, 45, 1, 0, 0, 0, 0, 20) + EVT_CALL(ShowSweat, NPC_RedGoombaBros, 0, -45, EMOTER_NPC, 0, 0, 0, 0, 20) + EVT_CALL(ShowSweat, NPC_BlueGoombaBros, 0, 45, EMOTER_NPC, 0, 0, 0, 0, 20) EVT_WAIT(10) EVT_END_LOOP EVT_CALL(SetNpcFlagBits, NPC_GoombaKing, NPC_FLAG_GRAVITY, TRUE) diff --git a/src/world/area_flo/flo.h b/src/world/area_flo/flo.h index 44ac11ac88..406b936192 100644 --- a/src/world/area_flo/flo.h +++ b/src/world/area_flo/flo.h @@ -10,6 +10,14 @@ enum { AB_FLO_TreePuzzle_SecondCorrect = AreaByte(5), AB_FLO_GuardLakituTalkCount = AreaByte(6), AB_FLO_GuardedMachineHitCount = AreaByte(7), + AB_FLO_Unused_8 = AreaByte(8), + AB_FLO_Unused_9 = AreaByte(9), + AB_FLO_Unused_A = AreaByte(10), + AB_FLO_Unused_B = AreaByte(11), + AB_FLO_Unused_C = AreaByte(12), + AB_FLO_Unused_D = AreaByte(13), + AB_FLO_Unused_E = AreaByte(14), + AB_FLO_Unused_F = AreaByte(15), }; enum { diff --git a/src/world/area_flo/flo_00/flo_00_3_npc.c b/src/world/area_flo/flo_00/flo_00_3_npc.c index 78b50ca32d..1b995c24d7 100644 --- a/src/world/area_flo/flo_00/flo_00_3_npc.c +++ b/src/world/area_flo/flo_00/flo_00_3_npc.c @@ -618,26 +618,22 @@ EvtScript N(EVS_NpcInit_Lakilulu) = { EVT_END }; -StaticNpc N(NpcData_Wisterwood) = { +NpcData N(NpcData_Wisterwood) = { .id = NPC_Dummy_Wisterwood, - .settings = &N(NpcSettings_Dummy), .pos = { -72.0f, 60.0f, -100.0f }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_200 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_Wisterwood), - .drops = BUBULB_DROPS, + .settings = &N(NpcSettings_Dummy), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_200 | ENEMY_FLAG_800, + .drops = NO_DROPS, .animations = BUBULB_PINK_ANIMS, }; -StaticNpc N(NpcData_Bubulbs)[] = { +NpcData N(NpcData_Bubulbs)[] = { { .id = NPC_Bubulb_01, - .settings = &N(NpcSettings_Bubulb_Patrol), .pos = { -59.0f, 0.0f, -40.0f }, .yaw = 90, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_800 | ENEMY_FLAG_2000, - .init = &N(EVS_NpcInit_Bubulb_01), - .drops = BUBULB_DROPS, .territory = { .patrol = { .isFlying = TRUE, @@ -652,17 +648,17 @@ StaticNpc N(NpcData_Bubulbs)[] = { .detectSize = { 100 }, } }, + .init = &N(EVS_NpcInit_Bubulb_01), + .settings = &N(NpcSettings_Bubulb_Patrol), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .drops = NO_DROPS, .animations = BUBULB_PINK_ANIMS, .tattle = MSG_NpcTattle_FLO_BubulbA, }, { .id = NPC_Bubulb_02, - .settings = &N(NpcSettings_Bubulb_Patrol), .pos = { 67.0f, 0.0f, 85.0f }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_800 | ENEMY_FLAG_2000, - .init = &N(EVS_NpcInit_Bubulb_02), - .drops = BUBULB_DROPS, .territory = { .patrol = { .isFlying = TRUE, @@ -677,17 +673,17 @@ StaticNpc N(NpcData_Bubulbs)[] = { .detectSize = { 100 }, } }, + .init = &N(EVS_NpcInit_Bubulb_02), + .settings = &N(NpcSettings_Bubulb_Patrol), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .drops = NO_DROPS, .animations = BUBULB_PURPLE_ANIMS, .tattle = MSG_NpcTattle_FLO_BubulbB, }, { .id = NPC_Bubulb_03, - .settings = &N(NpcSettings_Bubulb_Patrol), .pos = { 90.0f, 0.0f, 410.0f }, .yaw = 90, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_800 | ENEMY_FLAG_2000, - .init = &N(EVS_NpcInit_Bubulb_03), - .drops = BUBULB_DROPS, .territory = { .patrol = { .isFlying = TRUE, @@ -702,17 +698,17 @@ StaticNpc N(NpcData_Bubulbs)[] = { .detectSize = { 100 }, } }, + .init = &N(EVS_NpcInit_Bubulb_03), + .settings = &N(NpcSettings_Bubulb_Patrol), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .drops = NO_DROPS, .animations = BUBULB_GREEN_ANIMS, .tattle = MSG_NpcTattle_FLO_BubulbC, }, { .id = NPC_Bubulb_04, - .settings = &N(NpcSettings_Bubulb_Patrol), .pos = { 200.0f, 0.0f, 430.0f }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_800 | ENEMY_FLAG_2000, - .init = &N(EVS_NpcInit_Bubulb_04), - .drops = BUBULB_DROPS, .territory = { .patrol = { .isFlying = TRUE, @@ -727,46 +723,46 @@ StaticNpc N(NpcData_Bubulbs)[] = { .detectSize = { 100 }, } }, + .init = &N(EVS_NpcInit_Bubulb_04), + .settings = &N(NpcSettings_Bubulb_Patrol), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .drops = NO_DROPS, .animations = BUBULB_YELLOW_ANIMS, .tattle = MSG_NpcTattle_FLO_BubulbD, }, }; -StaticNpc N(NpcData_Tolielup) = { +NpcData N(NpcData_Tolielup) = { .id = NPC_Tolielup, - .settings = &N(NpcSettings_Tolielup), .pos = { -400.0f, 0.0f, 190.0f }, .yaw = 90, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_Tolielup), - .drops = TOLIELUP_DROPS, + .settings = &N(NpcSettings_Tolielup), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, + .drops = NO_DROPS, .animations = TOLIELUP_ANIMS, .tattle = MSG_NpcTattle_Tolielup, }; -StaticNpc N(NpcData_Klevar) = { +NpcData N(NpcData_Klevar) = { .id = NPC_Klevar, - .settings = &N(NpcSettings_StarSpirit), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_Klevar), - .drops = KLEVAR_DROPS, + .settings = &N(NpcSettings_StarSpirit), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = NO_DROPS, .animations = KLEVAR_ANIMS, }; -StaticNpc N(NpcData_Lakilulu) = { +NpcData N(NpcData_Lakilulu) = { .id = NPC_Lakilulu, - .settings = &N(NpcSettings_Dummy), .pos = { 198.0f, 0.0f, 363.0f }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_Lakilulu), - .drops = { - .dropFlags = NPC_DROP_FLAG_80, - .heartDrops = NO_DROPS, - .flowerDrops = NO_DROPS, - }, + .settings = &N(NpcSettings_Dummy), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = NO_DROPS, .animations = { .idle = ANIM_Lakilulu_Idle, .walk = ANIM_Lakilulu_Idle, 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 e9520aa677..78aedaebf9 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 @@ -75,19 +75,15 @@ EvtScript N(EVS_NpcInit_Parakarry_Epilogue) = { EVT_END }; -StaticNpc N(NpcData_Lakilester_Epilogue)[] = { +NpcData N(NpcData_Lakilester_Epilogue)[] = { { .id = NPC_Lakilester_Epilogue, - .settings = &N(NpcSettings_Lakilester_Epilogue), .pos = { 144.0f, 0.0f, 374.0f }, .yaw = 90, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_Lakilester_Epilogue), - .drops = { - .dropFlags = NPC_DROP_FLAG_80, - .heartDrops = NO_DROPS, - .flowerDrops = NO_DROPS, - }, + .settings = &N(NpcSettings_Lakilester_Epilogue), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_800, + .drops = NO_DROPS, .animations = { .idle = ANIM_WorldLakilester_Idle, .walk = ANIM_WorldLakilester_Idle, @@ -109,16 +105,12 @@ StaticNpc N(NpcData_Lakilester_Epilogue)[] = { }, { .id = NPC_Lakilulu_Epilogue, - .settings = &N(NpcSettings_Lakilester_Epilogue), .pos = { 198.0f, 0.0f, 363.0f }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_Lakilulu_Epilogue), - .drops = { - .dropFlags = NPC_DROP_FLAG_80, - .heartDrops = NO_DROPS, - .flowerDrops = NO_DROPS, - }, + .settings = &N(NpcSettings_Lakilester_Epilogue), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_800, + .drops = NO_DROPS, .animations = { .idle = ANIM_Lakilulu_Idle, .walk = ANIM_Lakilulu_Idle, @@ -140,16 +132,12 @@ StaticNpc N(NpcData_Lakilester_Epilogue)[] = { }, { .id = NPC_Parakarry_Epilogue, - .settings = &N(NpcSettings_Parakarry), .pos = { 266.0f, 0.0f, 322.0f }, .yaw = 0, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_Parakarry_Epilogue), - .drops = { - .dropFlags = NPC_DROP_FLAG_80, - .heartDrops = NO_DROPS, - .flowerDrops = NO_DROPS, - }, + .settings = &N(NpcSettings_Parakarry), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_800, + .drops = NO_DROPS, .animations = PARAKARRY_ANIMS, }, }; diff --git a/src/world/area_flo/flo_03/flo_03_3_npc.c b/src/world/area_flo/flo_03/flo_03_3_npc.c index bc8a2e67be..f0101bd3f8 100644 --- a/src/world/area_flo/flo_03/flo_03_3_npc.c +++ b/src/world/area_flo/flo_03/flo_03_3_npc.c @@ -776,18 +776,14 @@ EvtScript N(EVS_NpcInit_MontyMole_04) = { EVT_END }; -StaticNpc N(NpcData_Petunia) = { +NpcData N(NpcData_Petunia) = { .id = NPC_Petunia, - .settings = &N(NpcSettings_Petunia), .pos = { -30.0f, 0.0f, 100.0f }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_Petunia), - .drops = { - .dropFlags = NPC_DROP_FLAG_80, - .heartDrops = NO_DROPS, - .flowerDrops = NO_DROPS, - }, + .settings = &N(NpcSettings_Petunia), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = NO_DROPS, .animations = { .idle = ANIM_Petunia_Idle, .walk = ANIM_Petunia_Idle, @@ -809,18 +805,14 @@ StaticNpc N(NpcData_Petunia) = { .tattle = MSG_NpcTattle_Petunia, }; -StaticNpc N(NpcData_Dayzee) = { +NpcData N(NpcData_Dayzee) = { .id = NPC_Dayzee, - .settings = &N(NpcSettings_Dayzee), .pos = { -233.0f, 0.0f, -217.0f }, .yaw = 90, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_Dayzee), - .drops = { - .dropFlags = NPC_DROP_FLAG_80, - .heartDrops = NO_DROPS, - .flowerDrops = NO_DROPS, - }, + .settings = &N(NpcSettings_Dayzee), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = NO_DROPS, .animations = { .idle = ANIM_Dayzee_Anim01, .walk = ANIM_Dayzee_Anim02, @@ -841,18 +833,14 @@ StaticNpc N(NpcData_Dayzee) = { }, }; -StaticNpc N(NpcData_MontyMole_01) = { +NpcData N(NpcData_MontyMole_01) = { .id = NPC_MontyMole_01, - .settings = &N(NpcSettings_Dayzee), .pos = { -100.0f, 0.0f, 210.0f }, .yaw = 90, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_MontyMole_01), - .drops = { - .dropFlags = NPC_DROP_FLAG_80, - .heartDrops = NO_DROPS, - .flowerDrops = NO_DROPS, - }, + .settings = &N(NpcSettings_Dayzee), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = NO_DROPS, .animations = { .idle = ANIM_MontyMole_Dark_Anim01, .walk = ANIM_MontyMole_Dark_Anim02, @@ -873,18 +861,14 @@ StaticNpc N(NpcData_MontyMole_01) = { }, }; -StaticNpc N(NpcData_MontyMole_02) = { +NpcData N(NpcData_MontyMole_02) = { .id = NPC_MontyMole_02, - .settings = &N(NpcSettings_Dayzee), .pos = { -130.0f, 0.0f, 0.0f }, .yaw = 90, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_MontyMole_02), - .drops = { - .dropFlags = NPC_DROP_FLAG_80, - .heartDrops = NO_DROPS, - .flowerDrops = NO_DROPS, - }, + .settings = &N(NpcSettings_Dayzee), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = NO_DROPS, .animations = { .idle = ANIM_MontyMole_Dark_Anim01, .walk = ANIM_MontyMole_Dark_Anim02, @@ -905,18 +889,14 @@ StaticNpc N(NpcData_MontyMole_02) = { }, }; -StaticNpc N(NpcData_MontyMole_03) = { +NpcData N(NpcData_MontyMole_03) = { .id = NPC_MontyMole_03, - .settings = &N(NpcSettings_Dayzee), .pos = { 75.0f, 0.0f, 20.0f }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_MontyMole_03), - .drops = { - .dropFlags = NPC_DROP_FLAG_80, - .heartDrops = NO_DROPS, - .flowerDrops = NO_DROPS, - }, + .settings = &N(NpcSettings_Dayzee), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = NO_DROPS, .animations = { .idle = ANIM_MontyMole_Dark_Anim01, .walk = ANIM_MontyMole_Dark_Anim02, @@ -937,18 +917,14 @@ StaticNpc N(NpcData_MontyMole_03) = { }, }; -StaticNpc N(NpcData_MontyMole_04) = { +NpcData N(NpcData_MontyMole_04) = { .id = NPC_MontyMole_04, - .settings = &N(NpcSettings_Dayzee), .pos = { 71.0f, 0.0f, 200.0f }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_MontyMole_04), - .drops = { - .dropFlags = NPC_DROP_FLAG_80, - .heartDrops = NO_DROPS, - .flowerDrops = NO_DROPS, - }, + .settings = &N(NpcSettings_Dayzee), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = NO_DROPS, .animations = { .idle = ANIM_MontyMole_Dark_Anim01, .walk = ANIM_MontyMole_Dark_Anim02, diff --git a/src/world/area_flo/flo_07/flo_07_2_main.c b/src/world/area_flo/flo_07/flo_07_2_main.c index 024b7a5768..977cf1badf 100644 --- a/src/world/area_flo/flo_07/flo_07_2_main.c +++ b/src/world/area_flo/flo_07/flo_07_2_main.c @@ -1,7 +1,6 @@ #include "flo_07.h" #include "world/common/atomic/TexturePan.inc.c" -#include "world/common/atomic/TexturePan.data.inc.c" #include "../common/FlowerSpawnRegion.inc.c" diff --git a/src/world/area_flo/flo_07/flo_07_3_npc.c b/src/world/area_flo/flo_07/flo_07_3_npc.c index 0a8864d496..894325b579 100644 --- a/src/world/area_flo/flo_07/flo_07_3_npc.c +++ b/src/world/area_flo/flo_07/flo_07_3_npc.c @@ -231,14 +231,14 @@ EvtScript N(EVS_SetupFoliage) = { EVT_END }; -StaticNpc N(NpcData_Posie) = { +NpcData N(NpcData_Posie) = { .id = NPC_Posie, - .settings = &N(NpcSettings_Posie), .pos = { -260.0f, 0.0f, 0.0f }, .yaw = 90, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_Posie), - .drops = POSIE_DROPS, + .settings = &N(NpcSettings_Posie), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = NO_DROPS, .animations = POSIE_ANIMS, .tattle = MSG_NpcTattle_Posie, }; diff --git a/src/world/area_flo/flo_08/flo_08_4_npc.c b/src/world/area_flo/flo_08/flo_08_4_npc.c index 274eabda43..4b496ecce4 100644 --- a/src/world/area_flo/flo_08/flo_08_4_npc.c +++ b/src/world/area_flo/flo_08/flo_08_4_npc.c @@ -1,8 +1,8 @@ #include "flo_08.h" -#include "world/common/enemy/complete/AmazyDayzee.inc.c" +#include "world/common/enemy/AmazyDayzee.inc.c" #include "world/common/npc/GateFlower.inc.c" -#include "world/common/enemy/complete/CrazyDayzee.inc.c" +#include "world/common/enemy/CrazyDayzee.inc.c" #include "world/common/complete/NormalItemChoice.inc.c" @@ -157,25 +157,22 @@ EvtScript N(EVS_NpcInit_GateFlower) = { EVT_END }; -StaticNpc N(NpcData_GateFlower) = { +NpcData N(NpcData_GateFlower) = { .id = NPC_GateFlower, - .settings = &N(NpcSettings_GateFlower), .pos = { -695.0f, 0.0f, -30.0f }, .yaw = 270, - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_GateFlower), - .drops = GATE_FLOWER_DROPS, + .settings = &N(NpcSettings_GateFlower), + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, + .drops = NO_DROPS, .animations = GATE_FLOWER_YELLOW_ANIMS, .tattle = MSG_NpcTattle_YellowGateFlower, }; -StaticNpc N(NpcData_Dayzee_01) = { +NpcData N(NpcData_Dayzee_01) = { .id = NPC_Dayzee_01, - .settings = &N(NpcSettings_CrazyDayzee), .pos = { 205.0f, 0.0f, -80.0f }, .yaw = 90, - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, - .drops = CRAZY_DAYZEE_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -188,17 +185,17 @@ StaticNpc N(NpcData_Dayzee_01) = { .detectSize = { 200 }, } }, + .settings = &N(NpcSettings_CrazyDayzee), + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = CRAZY_DAYZEE_DROPS, .animations = CRAZY_DAYZEE_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT | AI_DETECT_SENSITIVE_MOTION, }; -StaticNpc N(NpcData_Dayzee_02) = { +NpcData N(NpcData_Dayzee_02) = { .id = NPC_Dayzee_02, - .settings = &N(NpcSettings_CrazyDayzee), .pos = { 275.0f, 0.0f, -115.0f }, .yaw = 270, - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, - .drops = CRAZY_DAYZEE_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -211,17 +208,17 @@ StaticNpc N(NpcData_Dayzee_02) = { .detectSize = { 200 }, } }, + .settings = &N(NpcSettings_CrazyDayzee), + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = CRAZY_DAYZEE_DROPS, .animations = CRAZY_DAYZEE_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT | AI_DETECT_SENSITIVE_MOTION, }; -StaticNpc N(NpcData_Dayzee_03) = { +NpcData N(NpcData_Dayzee_03) = { .id = NPC_Dayzee_03, - .settings = &N(NpcSettings_CrazyDayzee), .pos = { -230.0f, 60.0f, -110.0f }, .yaw = 90, - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, - .drops = CRAZY_DAYZEE_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -234,17 +231,17 @@ StaticNpc N(NpcData_Dayzee_03) = { .detectSize = { 200 }, } }, + .settings = &N(NpcSettings_CrazyDayzee), + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .drops = CRAZY_DAYZEE_DROPS, .animations = CRAZY_DAYZEE_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT | AI_DETECT_SENSITIVE_MOTION, }; -StaticNpc N(NpcData_Dayzee_04) = { +NpcData N(NpcData_Dayzee_04) = { .id = NPC_Dayzee_04, - .settings = &N(NpcSettings_CrazyDayzee), .pos = { -330.0f, 60.0f, -110.0f }, .yaw = 270, - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, - .drops = CRAZY_DAYZEE_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -257,17 +254,17 @@ StaticNpc N(NpcData_Dayzee_04) = { .detectSize = { 200 }, } }, + .settings = &N(NpcSettings_CrazyDayzee), + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .drops = CRAZY_DAYZEE_DROPS, .animations = CRAZY_DAYZEE_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT | AI_DETECT_SENSITIVE_MOTION, }; -StaticNpc N(NpcData_Dayzee_05) = { +NpcData N(NpcData_Dayzee_05) = { .id = NPC_Dayzee_05, - .settings = &N(NpcSettings_CrazyDayzee), .pos = { -430.0f, 60.0f, -110.0f }, .yaw = 90, - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, - .drops = CRAZY_DAYZEE_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -280,17 +277,17 @@ StaticNpc N(NpcData_Dayzee_05) = { .detectSize = { 200 }, } }, + .settings = &N(NpcSettings_CrazyDayzee), + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .drops = CRAZY_DAYZEE_DROPS, .animations = CRAZY_DAYZEE_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT | AI_DETECT_SENSITIVE_MOTION, }; -StaticNpc N(NpcData_Dayzee_06) = { +NpcData N(NpcData_Dayzee_06) = { .id = NPC_Dayzee_06, - .settings = &N(NpcSettings_CrazyDayzee), .pos = { -530.0f, 60.0f, -110.0f }, .yaw = 270, - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, - .drops = CRAZY_DAYZEE_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -303,17 +300,17 @@ StaticNpc N(NpcData_Dayzee_06) = { .detectSize = { 200 }, } }, + .settings = &N(NpcSettings_CrazyDayzee), + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .drops = CRAZY_DAYZEE_DROPS, .animations = CRAZY_DAYZEE_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT | AI_DETECT_SENSITIVE_MOTION, }; -StaticNpc N(NpcData_Dayzee_07) = { +NpcData N(NpcData_Dayzee_07) = { .id = NPC_Dayzee_07, - .settings = &N(NpcSettings_CrazyDayzee), .pos = { -630.0f, 60.0f, -110.0f }, .yaw = 90, - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, - .drops = CRAZY_DAYZEE_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -326,6 +323,9 @@ StaticNpc N(NpcData_Dayzee_07) = { .detectSize = { 150 }, } }, + .settings = &N(NpcSettings_CrazyDayzee), + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .drops = CRAZY_DAYZEE_DROPS, .animations = CRAZY_DAYZEE_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT | AI_DETECT_SENSITIVE_MOTION, }; @@ -351,14 +351,10 @@ EvtScript N(EVS_NpcInit_AmazyDayzee) = { EVT_END }; -StaticNpc N(NpcData_AmazyDayzee) = { +NpcData N(NpcData_AmazyDayzee) = { .id = NPC_AmazyDayzee, - .settings = &N(NpcSettings_AmazyDayzee), .pos = { 240.0f, 0.0f, -90.0f }, .yaw = 270, - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, - .init = &N(EVS_NpcInit_AmazyDayzee), - .drops = AMAZY_DAYZEE_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -371,6 +367,10 @@ StaticNpc N(NpcData_AmazyDayzee) = { .detectSize = { 200 }, } }, + .init = &N(EVS_NpcInit_AmazyDayzee), + .settings = &N(NpcSettings_AmazyDayzee), + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .drops = AMAZY_DAYZEE_DROPS, .animations = AMAZY_DAYZEE_ANIMS, .aiDetectFlags = AI_DETECT_SENSITIVE_MOTION, }; diff --git a/src/world/area_flo/flo_09/flo_09_5_npc.c b/src/world/area_flo/flo_09/flo_09_5_npc.c index 48490bb39d..20f5634a33 100644 --- a/src/world/area_flo/flo_09/flo_09_5_npc.c +++ b/src/world/area_flo/flo_09/flo_09_5_npc.c @@ -1,8 +1,8 @@ #include "flo_09.h" -#include "world/common/enemy/complete/CrazyDayzee.inc.c" +#include "world/common/enemy/CrazyDayzee.inc.c" -#include "world/common/enemy/complete/Bzzap.inc.c" +#include "world/common/enemy/Bzzap.inc.c" NpcSettings N(NpcSettings_Bzzap_02) = { .height = 24, @@ -58,13 +58,10 @@ EvtScript N(EVS_NpcInit_Bzzap_02) = { EVT_END }; -StaticNpc N(NpcData_Dayzee_01) = { +NpcData N(NpcData_Dayzee_01) = { .id = NPC_Dayzee_01, - .settings = &N(NpcSettings_CrazyDayzee), .pos = { -350.0f, 0.0f, 40.0f }, .yaw = 90, - .flags = ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, - .drops = CRAZY_DAYZEE_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -77,17 +74,17 @@ StaticNpc N(NpcData_Dayzee_01) = { .detectSize = { 200 }, } }, + .settings = &N(NpcSettings_CrazyDayzee), + .flags = ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .drops = CRAZY_DAYZEE_DROPS, .animations = CRAZY_DAYZEE_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT | AI_DETECT_SENSITIVE_MOTION, }; -StaticNpc N(NpcData_Dayzee_02) = { +NpcData N(NpcData_Dayzee_02) = { .id = NPC_Dayzee_02, - .settings = &N(NpcSettings_CrazyDayzee), .pos = { 260.0f, 0.0f, 75.0f }, .yaw = 270, - .flags = ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, - .drops = CRAZY_DAYZEE_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -100,17 +97,17 @@ StaticNpc N(NpcData_Dayzee_02) = { .detectSize = { 200 }, } }, + .settings = &N(NpcSettings_CrazyDayzee), + .flags = ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .drops = CRAZY_DAYZEE_DROPS, .animations = CRAZY_DAYZEE_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT | AI_DETECT_SENSITIVE_MOTION, }; -StaticNpc N(NpcData_Bzzap_01) = { +NpcData N(NpcData_Bzzap_01) = { .id = NPC_Bzzap_01, - .settings = &N(NpcSettings_Bzzap), .pos = { -50.0f, 55.0f, 90.0f }, .yaw = 90, - .flags = ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, - .drops = BZZAP_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -123,18 +120,17 @@ StaticNpc N(NpcData_Bzzap_01) = { .detectSize = { 250 }, } }, + .settings = &N(NpcSettings_Bzzap), + .flags = ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .drops = BZZAP_DROPS, .animations = BZZAP_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT | AI_DETECT_SENSITIVE_MOTION, }; -StaticNpc N(NpcData_Bzzap_02) = { +NpcData N(NpcData_Bzzap_02) = { .id = NPC_Bzzap_02, - .settings = &N(NpcSettings_Bzzap_02), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 90, - .flags = ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, - .init = &N(EVS_NpcInit_Bzzap_02), - .drops = BZZAP_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -147,6 +143,10 @@ StaticNpc N(NpcData_Bzzap_02) = { .detectSize = { 250 }, } }, + .init = &N(EVS_NpcInit_Bzzap_02), + .settings = &N(NpcSettings_Bzzap_02), + .flags = ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .drops = BZZAP_DROPS, .animations = BZZAP_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT | AI_DETECT_SENSITIVE_MOTION, }; 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 0e5f778c57..93bf534f1e 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 @@ -4,7 +4,6 @@ #include "world/common/complete/GiveReward.inc.c" #include "world/common/atomic/TexturePan.inc.c" -#include "world/common/atomic/TexturePan.data.inc.c" EvtScript N(EVS_RaiseFountain) = { EVT_CALL(MakeLerp, -50, 170, 385, EASING_LINEAR) diff --git a/src/world/area_flo/flo_10/flo_10_5_npc.c b/src/world/area_flo/flo_10/flo_10_5_npc.c index d4f3c56d4e..f01ba866f0 100644 --- a/src/world/area_flo/flo_10/flo_10_5_npc.c +++ b/src/world/area_flo/flo_10/flo_10_5_npc.c @@ -198,14 +198,14 @@ EvtScript N(EVS_NpcInit_Lily) = { EVT_END }; -StaticNpc N(NpcData_Lily) = { +NpcData N(NpcData_Lily) = { .id = NPC_Lily, - .settings = &N(NpcSettings_Lily), .pos = { 80.0f, -60.0f, 0.0f }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_Lily), - .drops = LILY_DROPS, + .settings = &N(NpcSettings_Lily), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = NO_DROPS, .animations = LILY_ANIMS, .tattle = MSG_NpcTattle_Lily, }; diff --git a/src/world/area_flo/flo_11/flo_11_3_npc.c b/src/world/area_flo/flo_11/flo_11_3_npc.c index 3b9dfd7d14..7d6a12ac73 100644 --- a/src/world/area_flo/flo_11/flo_11_3_npc.c +++ b/src/world/area_flo/flo_11/flo_11_3_npc.c @@ -1,6 +1,6 @@ #include "flo_11.h" -#include "world/common/enemy/complete/Lakitu_Stationary.inc.c" +#include "world/common/enemy/Lakitu_Stationary.inc.c" Vec3f N(FlightPath_Lakitu_01_Search)[] = { { 460.0, 200.0, -240.0 }, @@ -368,24 +368,24 @@ EvtScript N(EVS_NpcInit_Lakitu_02) = { EVT_END }; -StaticNpc N(NpcData_Lakitus)[] = { +NpcData N(NpcData_Lakitus)[] = { { .id = NPC_Lakitu_01, - .settings = &N(NpcSettings_Lakitu), .pos = { 553.0f, 60.0f, 52.0f }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000, .init = &N(EVS_NpcInit_Lakitu_01), + .settings = &N(NpcSettings_Lakitu), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000, .drops = LAKITU_DROPS, .animations = LAKITU_ANIMS, }, { .id = NPC_Lakitu_02, - .settings = &N(NpcSettings_Lakitu), .pos = { 553.0f, 60.0f, 52.0f }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000, .init = &N(EVS_NpcInit_Lakitu_02), + .settings = &N(NpcSettings_Lakitu), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000, .drops = LAKITU_DROPS, .animations = LAKITU_ANIMS, }, diff --git a/src/world/area_flo/flo_12/flo_12_3_npc.c b/src/world/area_flo/flo_12/flo_12_3_npc.c index 841a9296cc..9942a86641 100644 --- a/src/world/area_flo/flo_12/flo_12_3_npc.c +++ b/src/world/area_flo/flo_12/flo_12_3_npc.c @@ -188,25 +188,25 @@ EvtScript N(EVS_NpcInit_Rosie) = { EVT_END }; -StaticNpc N(NpcData_Rosie)[] = { +NpcData N(NpcData_Rosie)[] = { { .id = NPC_Rosie, - .settings = &N(NpcSettings_Rosie), .pos = { -70.0f, 0.0f, 20.0f }, .yaw = 90, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_Rosie), - .drops = ROSIE_DROPS, + .settings = &N(NpcSettings_Rosie), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_400000, + .drops = NO_DROPS, .animations = ROSIE_ANIMS, .tattle = MSG_NpcTattle_Rosie, }, { .id = NPC_Dummy, - .settings = &N(NpcSettings_Dummy), .pos = { -70.0f, 0.0f, 20.0f }, .yaw = 90, + .settings = &N(NpcSettings_Dummy), .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_200, - .drops = ROSIE_DROPS, + .drops = NO_DROPS, .animations = ROSIE_ANIMS, }, }; diff --git a/src/world/area_flo/flo_13/flo_13_4_npc.c b/src/world/area_flo/flo_13/flo_13_4_npc.c index 87c3e4fc71..cc66a9cb68 100644 --- a/src/world/area_flo/flo_13/flo_13_4_npc.c +++ b/src/world/area_flo/flo_13/flo_13_4_npc.c @@ -12,7 +12,7 @@ NpcSettings N(NpcSettings_Lakilester) = { #define AI_LAKITU_FIRST_SPINY_ID NPC_Spiny_01 #define AI_LAKITU_LAST_SPINY_ID NPC_Spiny_06 -#include "world/common/enemy/complete/Lakitu_SpinySpawner.inc.c" +#include "world/common/enemy/Lakitu_SpinySpawner.inc.c" #include "world/common/todo/UnkFunc42.inc.c" @@ -592,18 +592,14 @@ EvtScript N(EVS_NpcInit_Spiny) = { EVT_END }; -StaticNpc N(NpcData_Lakilester) = { +NpcData N(NpcData_Lakilester) = { .id = NPC_Lakilester, - .settings = &N(NpcSettings_Lakilester), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 90, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000, .init = &N(EVS_NpcInit_Lakilester), - .drops = { - .dropFlags = NPC_DROP_FLAG_80, - .heartDrops = NO_DROPS, - .flowerDrops = NO_DROPS, - }, + .settings = &N(NpcSettings_Lakilester), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000, + .drops = NO_DROPS, .animations = { .idle = ANIM_WorldLakilester_Idle, .walk = ANIM_WorldLakilester_Idle, @@ -624,18 +620,14 @@ StaticNpc N(NpcData_Lakilester) = { }, }; -StaticNpc N(NpcData_Lakilulu) = { +NpcData N(NpcData_Lakilulu) = { .id = NPC_Lakilulu, - .settings = &N(NpcSettings_Lakilester), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 90, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_Lakilulu), - .drops = { - .dropFlags = NPC_DROP_FLAG_80, - .heartDrops = NO_DROPS, - .flowerDrops = NO_DROPS, - }, + .settings = &N(NpcSettings_Lakilester), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = NO_DROPS, .animations = { .idle = ANIM_Lakilulu_Idle, .walk = ANIM_Lakilulu_Idle, @@ -657,18 +649,14 @@ StaticNpc N(NpcData_Lakilulu) = { .tattle = MSG_NpcTattle_Lakilulu, }; -StaticNpc N(NpcData_Lakilulu_Spiny) = { +NpcData N(NpcData_Lakilulu_Spiny) = { .id = NPC_Lakilulu_Spiny, - .settings = &N(NpcSettings_Lakilester), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 90, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_Lakilulu_Spiny), - .drops = { - .dropFlags = NPC_DROP_FLAG_80, - .heartDrops = NO_DROPS, - .flowerDrops = NO_DROPS, - }, + .settings = &N(NpcSettings_Lakilester), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = NO_DROPS, .animations = { .idle = ANIM_Lakilulu_Idle, .walk = ANIM_Lakilulu_Idle, @@ -689,14 +677,10 @@ StaticNpc N(NpcData_Lakilulu_Spiny) = { }, }; -StaticNpc N(NpcData_Lakitu_01) = { +NpcData N(NpcData_Lakitu_01) = { .id = NPC_Lakitu_01, - .settings = &N(NpcSettings_Lakitu_SpinySpawner), .pos = { 335.0f, 90.0f, 45.0f }, .yaw = 270, - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, - .init = &N(EVS_NpcInit_Lakitu), - .drops = LAKITU_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -709,18 +693,18 @@ StaticNpc N(NpcData_Lakitu_01) = { .detectSize = { 250 }, } }, + .init = &N(EVS_NpcInit_Lakitu), + .settings = &N(NpcSettings_Lakitu_SpinySpawner), + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = LAKITU_DROPS, .animations = LAKITU_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT | AI_DETECT_SENSITIVE_MOTION, }; -StaticNpc N(NpcData_Lakitu_02) = { +NpcData N(NpcData_Lakitu_02) = { .id = NPC_Lakitu_02, - .settings = &N(NpcSettings_Lakitu_SpinySpawner), .pos = { -320.0f, 90.0f, 0.0f }, .yaw = 90, - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, - .init = &N(EVS_NpcInit_Lakitu), - .drops = LAKITU_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -733,18 +717,18 @@ StaticNpc N(NpcData_Lakitu_02) = { .detectSize = { 200 }, } }, + .init = &N(EVS_NpcInit_Lakitu), + .settings = &N(NpcSettings_Lakitu_SpinySpawner), + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = LAKITU_DROPS, .animations = LAKITU_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT | AI_DETECT_SENSITIVE_MOTION, }; -StaticNpc N(NpcData_Spiny_01) = { +NpcData N(NpcData_Spiny_01) = { .id = NPC_Spiny_01, - .settings = &N(NpcSettings_SpawnedSpiny), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAG_4 | ENEMY_FLAG_400, - .init = &N(EVS_NpcInit_Spiny), - .drops = SPINY_DROPS, .territory = { .wander = { .isFlying = FALSE, @@ -757,18 +741,18 @@ StaticNpc N(NpcData_Spiny_01) = { .detectSize = { 0 }, } }, + .init = &N(EVS_NpcInit_Spiny), + .settings = &N(NpcSettings_SpawnedSpiny), + .flags = ENEMY_FLAG_4 | ENEMY_FLAG_400, + .drops = SPINY_DROPS, .animations = SPINY_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT | AI_DETECT_SENSITIVE_MOTION, }; -StaticNpc N(NpcData_Spiny_02) = { +NpcData N(NpcData_Spiny_02) = { .id = NPC_Spiny_02, - .settings = &N(NpcSettings_SpawnedSpiny), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAG_4 | ENEMY_FLAG_400, - .init = &N(EVS_NpcInit_Spiny), - .drops = SPINY_DROPS, .territory = { .wander = { .isFlying = FALSE, @@ -781,18 +765,18 @@ StaticNpc N(NpcData_Spiny_02) = { .detectSize = { 0 }, } }, + .init = &N(EVS_NpcInit_Spiny), + .settings = &N(NpcSettings_SpawnedSpiny), + .flags = ENEMY_FLAG_4 | ENEMY_FLAG_400, + .drops = SPINY_DROPS, .animations = SPINY_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT | AI_DETECT_SENSITIVE_MOTION, }; -StaticNpc N(NpcData_Spiny_03) = { +NpcData N(NpcData_Spiny_03) = { .id = NPC_Spiny_03, - .settings = &N(NpcSettings_SpawnedSpiny), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAG_4 | ENEMY_FLAG_400, - .init = &N(EVS_NpcInit_Spiny), - .drops = SPINY_DROPS, .territory = { .wander = { .isFlying = FALSE, @@ -805,18 +789,18 @@ StaticNpc N(NpcData_Spiny_03) = { .detectSize = { 0 }, } }, + .init = &N(EVS_NpcInit_Spiny), + .settings = &N(NpcSettings_SpawnedSpiny), + .flags = ENEMY_FLAG_4 | ENEMY_FLAG_400, + .drops = SPINY_DROPS, .animations = SPINY_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT | AI_DETECT_SENSITIVE_MOTION, }; -StaticNpc N(NpcData_Spiny_04) = { +NpcData N(NpcData_Spiny_04) = { .id = NPC_Spiny_04, - .settings = &N(NpcSettings_SpawnedSpiny), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAG_4 | ENEMY_FLAG_400, - .init = &N(EVS_NpcInit_Spiny), - .drops = SPINY_DROPS, .territory = { .wander = { .isFlying = FALSE, @@ -829,18 +813,18 @@ StaticNpc N(NpcData_Spiny_04) = { .detectSize = { 0 }, } }, + .init = &N(EVS_NpcInit_Spiny), + .settings = &N(NpcSettings_SpawnedSpiny), + .flags = ENEMY_FLAG_4 | ENEMY_FLAG_400, + .drops = SPINY_DROPS, .animations = SPINY_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT | AI_DETECT_SENSITIVE_MOTION, }; -StaticNpc N(NpcData_Spiny_05) = { +NpcData N(NpcData_Spiny_05) = { .id = NPC_Spiny_05, - .settings = &N(NpcSettings_SpawnedSpiny), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAG_4 | ENEMY_FLAG_400, - .init = &N(EVS_NpcInit_Spiny), - .drops = SPINY_DROPS, .territory = { .wander = { .isFlying = FALSE, @@ -853,18 +837,18 @@ StaticNpc N(NpcData_Spiny_05) = { .detectSize = { 0 }, } }, + .init = &N(EVS_NpcInit_Spiny), + .settings = &N(NpcSettings_SpawnedSpiny), + .flags = ENEMY_FLAG_4 | ENEMY_FLAG_400, + .drops = SPINY_DROPS, .animations = SPINY_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT | AI_DETECT_SENSITIVE_MOTION, }; -StaticNpc N(NpcData_Spiny_06) = { +NpcData N(NpcData_Spiny_06) = { .id = NPC_Spiny_06, - .settings = &N(NpcSettings_SpawnedSpiny), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAG_4 | ENEMY_FLAG_400, - .init = &N(EVS_NpcInit_Spiny), - .drops = SPINY_DROPS, .territory = { .wander = { .isFlying = FALSE, @@ -877,6 +861,10 @@ StaticNpc N(NpcData_Spiny_06) = { .detectSize = { 0 }, } }, + .init = &N(EVS_NpcInit_Spiny), + .settings = &N(NpcSettings_SpawnedSpiny), + .flags = ENEMY_FLAG_4 | ENEMY_FLAG_400, + .drops = SPINY_DROPS, .animations = SPINY_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT | AI_DETECT_SENSITIVE_MOTION, }; diff --git a/src/world/area_flo/flo_14/flo_14_2_main.c b/src/world/area_flo/flo_14/flo_14_2_main.c index 0878862b25..a96c80b1e3 100644 --- a/src/world/area_flo/flo_14/flo_14_2_main.c +++ b/src/world/area_flo/flo_14/flo_14_2_main.c @@ -2,7 +2,6 @@ #include "effects.h" #include "world/common/atomic/TexturePan.inc.c" -#include "world/common/atomic/TexturePan.data.inc.c" API_CALLABLE(N(SpawnSunEffect)) { fx_sun_undeclared(FX_SUN_FROM_LEFT, 0, 0, 0, 0, 0); diff --git a/src/world/area_flo/flo_14/flo_14_4_npc.c b/src/world/area_flo/flo_14/flo_14_4_npc.c index 8405dccb52..c9f003591d 100644 --- a/src/world/area_flo/flo_14/flo_14_4_npc.c +++ b/src/world/area_flo/flo_14/flo_14_4_npc.c @@ -1,6 +1,6 @@ #include "flo_14.h" -#include "world/common/enemy/complete/Bzzap.inc.c" +#include "world/common/enemy/Bzzap.inc.c" #include "world/common/npc/Bubulb.h" @@ -78,25 +78,22 @@ EvtScript N(EVS_NpcInit_BubbleFlower) = { }; // uses a dummy bubulb for collision -StaticNpc N(NpcData_BubbleFlower) = { +NpcData N(NpcData_BubbleFlower) = { .id = NPC_BubbleFlower, - .settings = &N(NpcSettings_BubbleFlower), .pos = { 617.0f, 0.0f, 108.0f }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_4000, .init = &N(EVS_NpcInit_BubbleFlower), - .drops = BUBULB_DROPS, + .settings = &N(NpcSettings_BubbleFlower), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_4000, + .drops = NO_DROPS, .animations = BUBULB_PINK_ANIMS, .tattle = MSG_NpcTattle_BubblePlant, }; -StaticNpc N(NpcData_Bzzap) = { +NpcData N(NpcData_Bzzap) = { .id = NPC_Bzzap, - .settings = &N(NpcSettings_Bzzap), .pos = { -175.0f, 55.0f, 15.0f }, .yaw = 90, - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, - .drops = BZZAP_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -109,6 +106,9 @@ StaticNpc N(NpcData_Bzzap) = { .detectSize = { 200 }, } }, + .settings = &N(NpcSettings_Bzzap), + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = BZZAP_DROPS, .animations = BZZAP_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT | AI_DETECT_SENSITIVE_MOTION, }; 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 86a9692696..9c35933a99 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 @@ -197,26 +197,26 @@ EvtScript N(EVS_NpcInit_Sun_02) = { EVT_END }; -StaticNpc N(NpcData_Sun)[] = { +NpcData N(NpcData_Sun)[] = { { .id = NPC_Sun_01, - .settings = &N(NpcSettings_Sun), .pos = { 0.0f, 250.0f, 0.0f }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_Sun_01), - .drops = SUN_DROPS, + .settings = &N(NpcSettings_Sun), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_400000, + .drops = NO_DROPS, .animations = SUN_ANIMS, .tattle = MSG_NpcTattle_TheSun, }, { .id = NPC_Sun_02, - .settings = &N(NpcSettings_Sun), .pos = { 0.0f, 250.0f, 0.0f }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_8000, .init = &N(EVS_NpcInit_Sun_02), - .drops = SUN_DROPS, + .settings = &N(NpcSettings_Sun), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_8000, + .drops = NO_DROPS, .animations = SUN_ANIMS, .tattle = MSG_NpcTattle_TheSun, }, diff --git a/src/world/area_flo/flo_16/flo_16_5_npc.c b/src/world/area_flo/flo_16/flo_16_5_npc.c index aeb7ce2cc9..5d4b4ddd3a 100644 --- a/src/world/area_flo/flo_16/flo_16_5_npc.c +++ b/src/world/area_flo/flo_16/flo_16_5_npc.c @@ -1,15 +1,12 @@ #include "flo_16.h" #include "entity.h" -#include "world/common/enemy/complete/TuffPuff.inc.c" +#include "world/common/enemy/TuffPuff.inc.c" -StaticNpc N(NpcData_TuffPuff_01) = { +NpcData N(NpcData_TuffPuff_01) = { .id = NPC_TuffPuff_01, - .settings = &N(NpcSettings_TuffPuff), .pos = { 440.0f, 145.0f, 15.0f }, .yaw = 90, - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, - .drops = TUFF_PUFF_DROPS, .territory = { .wander = { .isFlying = FALSE, @@ -22,17 +19,17 @@ StaticNpc N(NpcData_TuffPuff_01) = { .detectSize = { 225, 95 }, } }, + .settings = &N(NpcSettings_TuffPuff), + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = TUFF_PUFF_DROPS, .animations = TUFF_PUFF_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT | AI_DETECT_SENSITIVE_MOTION, }; -StaticNpc N(NpcData_TuffPuff_02) = { +NpcData N(NpcData_TuffPuff_02) = { .id = NPC_TuffPuff_02, - .settings = &N(NpcSettings_TuffPuff), .pos = { 600.0f, 145.0f, 15.0f }, .yaw = 270, - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, - .drops = TUFF_PUFF_DROPS, .territory = { .wander = { .isFlying = FALSE, @@ -45,6 +42,9 @@ StaticNpc N(NpcData_TuffPuff_02) = { .detectSize = { 225, 95 }, } }, + .settings = &N(NpcSettings_TuffPuff), + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = TUFF_PUFF_DROPS, .animations = TUFF_PUFF_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT | AI_DETECT_SENSITIVE_MOTION, }; diff --git a/src/world/area_flo/flo_17/flo_17_4_npc.c b/src/world/area_flo/flo_17/flo_17_4_npc.c index be47dcbbf8..98f2680d7c 100644 --- a/src/world/area_flo/flo_17/flo_17_4_npc.c +++ b/src/world/area_flo/flo_17/flo_17_4_npc.c @@ -4,15 +4,12 @@ #define AI_LAKITU_FIRST_SPINY_ID NPC_Spiny_01 #define AI_LAKITU_LAST_SPINY_ID NPC_Spiny_04 -#include "world/common/enemy/complete/Lakitu_SpinySpawner.inc.c" +#include "world/common/enemy/Lakitu_SpinySpawner.inc.c" -StaticNpc N(NpcData_Lakitu_01) = { +NpcData N(NpcData_Lakitu_01) = { .id = NPC_Lakitu_01, - .settings = &N(NpcSettings_Lakitu_SpinySpawner), .pos = { -185.0f, 90.0f, 10.0f }, .yaw = 270, - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, - .drops = LAKITU_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -25,17 +22,17 @@ StaticNpc N(NpcData_Lakitu_01) = { .detectSize = { 85, 120 }, } }, + .settings = &N(NpcSettings_Lakitu_SpinySpawner), + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = LAKITU_DROPS, .animations = LAKITU_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT | AI_DETECT_SENSITIVE_MOTION, }; -StaticNpc N(NpcData_Lakitu_02) = { +NpcData N(NpcData_Lakitu_02) = { .id = NPC_Lakitu_02, - .settings = &N(NpcSettings_Lakitu_SpinySpawner), .pos = { 200.0f, 90.0f, -25.0f }, .yaw = 90, - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, - .drops = LAKITU_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -48,17 +45,17 @@ StaticNpc N(NpcData_Lakitu_02) = { .detectSize = { 85, 120 }, } }, + .settings = &N(NpcSettings_Lakitu_SpinySpawner), + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = LAKITU_DROPS, .animations = LAKITU_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT | AI_DETECT_SENSITIVE_MOTION, }; -StaticNpc N(NpcData_Spiny_01) = { +NpcData N(NpcData_Spiny_01) = { .id = NPC_Spiny_01, - .settings = &N(NpcSettings_SpawnedSpiny), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAG_4 | ENEMY_FLAG_400 | ENEMY_FLAG_800, - .drops = SPINY_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -71,17 +68,17 @@ StaticNpc N(NpcData_Spiny_01) = { .detectSize = { 0 }, } }, + .settings = &N(NpcSettings_SpawnedSpiny), + .flags = ENEMY_FLAG_4 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = SPINY_DROPS, .animations = SPINY_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT | AI_DETECT_SENSITIVE_MOTION, }; -StaticNpc N(NpcData_Spiny_02) = { +NpcData N(NpcData_Spiny_02) = { .id = NPC_Spiny_02, - .settings = &N(NpcSettings_SpawnedSpiny), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAG_4 | ENEMY_FLAG_400 | ENEMY_FLAG_800, - .drops = SPINY_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -94,17 +91,17 @@ StaticNpc N(NpcData_Spiny_02) = { .detectSize = { 0 }, } }, + .settings = &N(NpcSettings_SpawnedSpiny), + .flags = ENEMY_FLAG_4 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = SPINY_DROPS, .animations = SPINY_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT | AI_DETECT_SENSITIVE_MOTION, }; -StaticNpc N(NpcData_Spiny_03) = { +NpcData N(NpcData_Spiny_03) = { .id = NPC_Spiny_03, - .settings = &N(NpcSettings_SpawnedSpiny), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAG_4 | ENEMY_FLAG_400 | ENEMY_FLAG_800, - .drops = SPINY_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -117,17 +114,17 @@ StaticNpc N(NpcData_Spiny_03) = { .detectSize = { 0 }, } }, + .settings = &N(NpcSettings_SpawnedSpiny), + .flags = ENEMY_FLAG_4 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = SPINY_DROPS, .animations = SPINY_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT | AI_DETECT_SENSITIVE_MOTION, }; -StaticNpc N(NpcData_Spiny_04) = { +NpcData N(NpcData_Spiny_04) = { .id = NPC_Spiny_04, - .settings = &N(NpcSettings_SpawnedSpiny), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAG_4 | ENEMY_FLAG_400 | ENEMY_FLAG_800, - .drops = SPINY_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -140,6 +137,9 @@ StaticNpc N(NpcData_Spiny_04) = { .detectSize = { 0 }, } }, + .settings = &N(NpcSettings_SpawnedSpiny), + .flags = ENEMY_FLAG_4 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = SPINY_DROPS, .animations = SPINY_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT | AI_DETECT_SENSITIVE_MOTION, }; diff --git a/src/world/area_flo/flo_18/flo_18_2_main.c b/src/world/area_flo/flo_18/flo_18_2_main.c index a52b73935a..4de072b0f9 100644 --- a/src/world/area_flo/flo_18/flo_18_2_main.c +++ b/src/world/area_flo/flo_18/flo_18_2_main.c @@ -2,7 +2,6 @@ #include "effects.h" #include "world/common/atomic/TexturePan.inc.c" -#include "world/common/atomic/TexturePan.data.inc.c" API_CALLABLE(N(SpawnSunEffect)) { fx_sun_undeclared(FX_SUN_FROM_RIGHT, 0, 0, 0, 0, 0); diff --git a/src/world/area_flo/flo_18/flo_18_4_npc.c b/src/world/area_flo/flo_18/flo_18_4_npc.c index d4693f8fc4..5d04fadbba 100644 --- a/src/world/area_flo/flo_18/flo_18_4_npc.c +++ b/src/world/area_flo/flo_18/flo_18_4_npc.c @@ -2,8 +2,8 @@ #include "world/common/todo/UnkFunc42.inc.c" -#include "world/common/enemy/complete/Lakitu.h" -#include "world/common/enemy/complete/YMagikoopa.h" +#include "world/common/enemy/Lakitu.h" +#include "world/common/enemy/YMagikoopa.h" NpcSettings N(NpcSettings_Lakitu) = { .height = 32, @@ -597,59 +597,59 @@ EvtScript N(EVS_NpcInit_Lakitu_03) = { EVT_END }; -StaticNpc N(NpcData_MachineGang)[] = { +NpcData N(NpcData_MachineGang)[] = { { .id = NPC_Lakitu_01, - .settings = &N(NpcSettings_Lakitu), .pos = { 0.0f, 15.0f, 60.0f }, .yaw = 90, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_Lakitu_01), + .settings = &N(NpcSettings_Lakitu), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_400000, .drops = LAKITU_DROPS, .animations = LAKITU_ANIMS, .tattle = MSG_NpcTattle_PuffPuffOperator, }, { .id = NPC_Lakitu_02, - .settings = &N(NpcSettings_Lakitu), .pos = { 65.0f, 15.0f, 60.0f }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_Lakitu_02), + .settings = &N(NpcSettings_Lakitu), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_400000, .drops = LAKITU_DROPS, .animations = LAKITU_ANIMS, .tattle = MSG_NpcTattle_PuffPuffOperator, }, { .id = NPC_Lakitu_03, - .settings = &N(NpcSettings_Lakitu), .pos = { 135.0f, 15.0f, 35.0f }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_Lakitu_03), + .settings = &N(NpcSettings_Lakitu), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_400000, .drops = LAKITU_DROPS, .animations = LAKITU_ANIMS, .tattle = MSG_NpcTattle_PuffPuffOperator, }, { .id = NPC_Magikoopa, - .settings = &N(NpcSettings_Magikoopa), .pos = { -60.0f, 0.0f, 50.0f }, .yaw = 90, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_Magikoopa), - .drops = MAGIKOOPA_DROPS, + .settings = &N(NpcSettings_Magikoopa), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_400000, + .drops = MAGINO_DROPS, .animations = MAGIKOOPA_YELLOW_ANIMS, .tattle = MSG_NpcTattle_PuffPuffOperator, }, { .id = NPC_FlyingMagikoopa, - .settings = &N(NpcSettings_Magikoopa), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_FlyingMagikoopa), - .drops = MAGIKOOPA_DROPS, + .settings = &N(NpcSettings_Magikoopa), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_400000, + .drops = MAGINO_DROPS, .animations = FLYING_MAGIKOOPA_YELLOW_ANIMS, .tattle = MSG_NpcTattle_PuffPuffOperator, }, diff --git a/src/world/area_flo/flo_19/flo_19_3_main.c b/src/world/area_flo/flo_19/flo_19_3_main.c index d2bcbe3a29..b308a4d263 100644 --- a/src/world/area_flo/flo_19/flo_19_3_main.c +++ b/src/world/area_flo/flo_19/flo_19_3_main.c @@ -2,7 +2,6 @@ #include "effects.h" #include "world/common/atomic/TexturePan.inc.c" -#include "world/common/atomic/TexturePan.data.inc.c" API_CALLABLE(N(SpawnSunEffect)) { fx_sun_undeclared(FX_SUN_FROM_RIGHT, 0, 0, 0, 0, 0); diff --git a/src/world/area_flo/flo_21/flo_21_2_main.c b/src/world/area_flo/flo_21/flo_21_2_main.c index c8714e76e6..19fd01c8f6 100644 --- a/src/world/area_flo/flo_21/flo_21_2_main.c +++ b/src/world/area_flo/flo_21/flo_21_2_main.c @@ -1,9 +1,9 @@ #include "flo_21.h" +#define STAR_SPIRIT_DATA_VAR MV_Unk_01 #include "world/common/todo/StarSpiritEffectFunc.inc.c" #include "world/common/atomic/TexturePan.inc.c" -#include "world/common/atomic/TexturePan.data.inc.c" API_CALLABLE(N(SpawnSunEffect)) { fx_sun_undeclared(FX_SUN_FROM_RIGHT, 0, 0, 0, 0, 0); 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 07d9e02736..ce89d8885b 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 @@ -1,8 +1,8 @@ #include "flo_21.h" #include "effects.h" -#include "world/common/enemy/complete/HuffNPuff.h" -#include "world/common/enemy/complete/TuffPuff.h" +#include "world/common/enemy/HuffNPuff.h" +#include "world/common/enemy/TuffPuff.h" #include "world/common/todo/UnsetCamera0MoveFlag1.inc.c" @@ -574,7 +574,7 @@ EvtScript N(EVS_NpcInit_TuffPuff) = { EVT_END }; -s32 N(ExtraAnims_HuffNPuff)[] = { +AnimID N(ExtraAnims_HuffNPuff)[] = { ANIM_HuffNPuff_Anim00, ANIM_HuffNPuff_Anim01, ANIM_HuffNPuff_Anim02, @@ -586,210 +586,210 @@ s32 N(ExtraAnims_HuffNPuff)[] = { ANIM_LIST_END }; -StaticNpc N(NpcData_HuffNPuff)[] = { +NpcData N(NpcData_HuffNPuff)[] = { { .id = NPC_HuffNPuff_01, - .settings = &N(NpcSettings_HuffNPuff), .pos = { 650.0f, NPC_DISPOSE_POS_Y, 0.0f }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000, .init = &N(EVS_NpcInit_HuffNPuff_Face), - .drops = HUFF_N_PUFF_NO_DROPS, + .settings = &N(NpcSettings_HuffNPuff), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000, + .drops = NO_DROPS, .animations = HUFF_N_PUFF_ANIMS, .extraAnimations = N(ExtraAnims_HuffNPuff), }, { .id = NPC_HuffNPuff_02, - .settings = &N(NpcSettings_HuffNPuff), .pos = { 650.0f, 100.0f, 0.0f }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000, .init = &N(EVS_NpcInit_HuffNPuff_Body), - .drops = HUFF_N_PUFF_NO_DROPS, + .settings = &N(NpcSettings_HuffNPuff), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000, + .drops = NO_DROPS, .animations = HUFF_N_PUFF_ANIMS, .extraAnimations = N(ExtraAnims_HuffNPuff), }, { .id = NPC_HuffNPuff_03, - .settings = &N(NpcSettings_HuffNPuff), .pos = { 650.0f, NPC_DISPOSE_POS_Y, 0.0f }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000, .init = &N(EVS_NpcInit_HuffNPuff_Arms), - .drops = HUFF_N_PUFF_NO_DROPS, + .settings = &N(NpcSettings_HuffNPuff), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000, + .drops = NO_DROPS, .animations = HUFF_N_PUFF_ANIMS, .extraAnimations = N(ExtraAnims_HuffNPuff), }, }; -s32 N(ExtraAnims_TuffPuff)[] = { +AnimID N(ExtraAnims_TuffPuff)[] = { ANIM_TuffPuff_Dizzy, ANIM_LIST_END }; -StaticNpc N(NpcData_TuffPuffs)[] = { +NpcData N(NpcData_TuffPuffs)[] = { { .id = NPC_TuffPuff_01, - .settings = &N(NpcSettings_TuffPuff), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_TuffPuff), - .drops = TUFF_PUFF_NO_DROPS, + .settings = &N(NpcSettings_TuffPuff), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = NO_DROPS, .animations = TUFF_PUFF_ANIMS, .extraAnimations = N(ExtraAnims_TuffPuff), }, { .id = NPC_TuffPuff_02, - .settings = &N(NpcSettings_TuffPuff), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_TuffPuff), - .drops = TUFF_PUFF_NO_DROPS, + .settings = &N(NpcSettings_TuffPuff), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = NO_DROPS, .animations = TUFF_PUFF_ANIMS, .extraAnimations = N(ExtraAnims_TuffPuff), }, { .id = NPC_TuffPuff_03, - .settings = &N(NpcSettings_TuffPuff), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_TuffPuff), - .drops = TUFF_PUFF_NO_DROPS, + .settings = &N(NpcSettings_TuffPuff), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = NO_DROPS, .animations = TUFF_PUFF_ANIMS, .extraAnimations = N(ExtraAnims_TuffPuff), }, { .id = NPC_TuffPuff_04, - .settings = &N(NpcSettings_TuffPuff), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_TuffPuff), - .drops = TUFF_PUFF_NO_DROPS, + .settings = &N(NpcSettings_TuffPuff), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = NO_DROPS, .animations = TUFF_PUFF_ANIMS, .extraAnimations = N(ExtraAnims_TuffPuff), }, { .id = NPC_TuffPuff_05, - .settings = &N(NpcSettings_TuffPuff), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_TuffPuff), - .drops = TUFF_PUFF_NO_DROPS, + .settings = &N(NpcSettings_TuffPuff), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = NO_DROPS, .animations = TUFF_PUFF_ANIMS, .extraAnimations = N(ExtraAnims_TuffPuff), }, { .id = NPC_TuffPuff_06, - .settings = &N(NpcSettings_TuffPuff), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_TuffPuff), - .drops = TUFF_PUFF_NO_DROPS, + .settings = &N(NpcSettings_TuffPuff), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = NO_DROPS, .animations = TUFF_PUFF_ANIMS, .extraAnimations = N(ExtraAnims_TuffPuff), }, { .id = NPC_TuffPuff_07, - .settings = &N(NpcSettings_TuffPuff), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_TuffPuff), - .drops = TUFF_PUFF_NO_DROPS, + .settings = &N(NpcSettings_TuffPuff), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = NO_DROPS, .animations = TUFF_PUFF_ANIMS, .extraAnimations = N(ExtraAnims_TuffPuff), }, { .id = NPC_TuffPuff_08, - .settings = &N(NpcSettings_TuffPuff), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_TuffPuff), - .drops = TUFF_PUFF_NO_DROPS, + .settings = &N(NpcSettings_TuffPuff), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = NO_DROPS, .animations = TUFF_PUFF_ANIMS, .extraAnimations = N(ExtraAnims_TuffPuff), }, { .id = NPC_TuffPuff_09, - .settings = &N(NpcSettings_TuffPuff), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_TuffPuff), - .drops = TUFF_PUFF_NO_DROPS, + .settings = &N(NpcSettings_TuffPuff), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = NO_DROPS, .animations = TUFF_PUFF_ANIMS, .extraAnimations = N(ExtraAnims_TuffPuff), }, { .id = NPC_TuffPuff_10, - .settings = &N(NpcSettings_TuffPuff), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_TuffPuff), - .drops = TUFF_PUFF_NO_DROPS, + .settings = &N(NpcSettings_TuffPuff), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = NO_DROPS, .animations = TUFF_PUFF_ANIMS, .extraAnimations = N(ExtraAnims_TuffPuff), }, { .id = NPC_TuffPuff_11, - .settings = &N(NpcSettings_TuffPuff), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_TuffPuff), - .drops = TUFF_PUFF_NO_DROPS, + .settings = &N(NpcSettings_TuffPuff), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = NO_DROPS, .animations = TUFF_PUFF_ANIMS, .extraAnimations = N(ExtraAnims_TuffPuff), }, { .id = NPC_TuffPuff_12, - .settings = &N(NpcSettings_TuffPuff), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_TuffPuff), - .drops = TUFF_PUFF_NO_DROPS, + .settings = &N(NpcSettings_TuffPuff), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = NO_DROPS, .animations = TUFF_PUFF_ANIMS, .extraAnimations = N(ExtraAnims_TuffPuff), }, { .id = NPC_TuffPuff_13, - .settings = &N(NpcSettings_TuffPuff), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_TuffPuff), - .drops = TUFF_PUFF_NO_DROPS, + .settings = &N(NpcSettings_TuffPuff), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = NO_DROPS, .animations = TUFF_PUFF_ANIMS, .extraAnimations = N(ExtraAnims_TuffPuff), }, { .id = NPC_TuffPuff_14, - .settings = &N(NpcSettings_TuffPuff), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_TuffPuff), - .drops = TUFF_PUFF_NO_DROPS, + .settings = &N(NpcSettings_TuffPuff), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = NO_DROPS, .animations = TUFF_PUFF_ANIMS, .extraAnimations = N(ExtraAnims_TuffPuff), }, { .id = NPC_TuffPuff_15, - .settings = &N(NpcSettings_TuffPuff), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_TuffPuff), - .drops = TUFF_PUFF_NO_DROPS, + .settings = &N(NpcSettings_TuffPuff), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = NO_DROPS, .animations = TUFF_PUFF_ANIMS, .extraAnimations = N(ExtraAnims_TuffPuff), }, diff --git a/src/world/area_flo/flo_22/flo_22_3_npc.c b/src/world/area_flo/flo_22/flo_22_3_npc.c index 2fab050769..7f65b975c6 100644 --- a/src/world/area_flo/flo_22/flo_22_3_npc.c +++ b/src/world/area_flo/flo_22/flo_22_3_npc.c @@ -1,8 +1,8 @@ #include "flo_22.h" #include "world/common/npc/Dummy.inc.c" -#include "world/common/enemy/complete/Bzzap.h" -#include "world/common/enemy/complete/CrazyDayzee.h" +#include "world/common/enemy/Bzzap.h" +#include "world/common/enemy/CrazyDayzee.h" EvtScript N(EVS_NpcIdle_Bzzap) = { EVT_SET(MV_Bzzap_State, 0) @@ -103,24 +103,24 @@ EvtScript N(EVS_NpcInit_Dayzee) = { EVT_END }; -StaticNpc N(NpcData_Bzzap) = { +NpcData N(NpcData_Bzzap) = { .id = NPC_Bzzap, - .settings = &N(NpcSettings_Dummy), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 270, - .flags = ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_Bzzap), - .drops = BZZAP_NO_DROPS, + .settings = &N(NpcSettings_Dummy), + .flags = ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = NO_DROPS, .animations = BZZAP_ANIMS, }; -StaticNpc N(NpcData_Dayzee) = { +NpcData N(NpcData_Dayzee) = { .id = NPC_Dayzee, - .settings = &N(NpcSettings_Dummy), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 270, - .flags = ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_Dayzee), + .settings = &N(NpcSettings_Dummy), + .flags = ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .drops = CRAZY_DAYZEE_DROPS, .animations = CRAZY_DAYZEE_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT | AI_DETECT_SENSITIVE_MOTION, diff --git a/src/world/area_flo/flo_23/flo_23_3_npc.c b/src/world/area_flo/flo_23/flo_23_3_npc.c index 2f96a86f93..51c6c45ff6 100644 --- a/src/world/area_flo/flo_23/flo_23_3_npc.c +++ b/src/world/area_flo/flo_23/flo_23_3_npc.c @@ -4,7 +4,7 @@ #include "world/common/complete/NormalItemChoice.inc.c" -#include "world/common/enemy/complete/Spiny.inc.c" +#include "world/common/enemy/Spiny.inc.c" BSS s32 N(FlowerGuard_ItemChoiceList)[ITEM_NUM_CONSUMABLES + 1]; #include "../common/ItemChoice_FlowerGuard.inc.c" @@ -157,25 +157,22 @@ EvtScript N(EVS_NpcInit_GateFlower) = { EVT_END }; -StaticNpc N(NpcData_GateFlower) = { +NpcData N(NpcData_GateFlower) = { .id = NPC_GateFlower, - .settings = &N(NpcSettings_GateFlower), .pos = { 385.0f, 0.0f, -35.0f }, .yaw = 90, - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_GateFlower), - .drops = GATE_FLOWER_DROPS, + .settings = &N(NpcSettings_GateFlower), + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, + .drops = NO_DROPS, .animations = GATE_FLOWER_BLUE_ANIMS, .tattle = MSG_NpcTattle_BlueGateFlower, }; -StaticNpc N(NpcData_Spiny_01) = { +NpcData N(NpcData_Spiny_01) = { .id = NPC_Spiny_01, - .settings = &N(NpcSettings_Spiny), .pos = { 80.0f, 0.0f, 0.0f }, .yaw = 90, - .flags = ENEMY_FLAG_800 | ENEMY_FLAG_2000, - .drops = SPINY_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -188,16 +185,16 @@ StaticNpc N(NpcData_Spiny_01) = { .detectSize = { 200 }, } }, + .settings = &N(NpcSettings_Spiny), + .flags = ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .drops = SPINY_DROPS, .animations = SPINY_ANIMS, }; -StaticNpc N(NpcData_Spiny_02) = { +NpcData N(NpcData_Spiny_02) = { .id = NPC_Spiny_02, - .settings = &N(NpcSettings_Spiny), .pos = { -320.0f, 0.0f, 0.0f }, .yaw = 270, - .flags = ENEMY_FLAG_800 | ENEMY_FLAG_2000, - .drops = SPINY_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -210,6 +207,9 @@ StaticNpc N(NpcData_Spiny_02) = { .detectSize = { 200 }, } }, + .settings = &N(NpcSettings_Spiny), + .flags = ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .drops = SPINY_DROPS, .animations = SPINY_ANIMS, }; diff --git a/src/world/area_flo/flo_24/flo_24_4_water.c b/src/world/area_flo/flo_24/flo_24_4_water.c index 3fa44d01e7..e4b67d6a6a 100644 --- a/src/world/area_flo/flo_24/flo_24_4_water.c +++ b/src/world/area_flo/flo_24/flo_24_4_water.c @@ -1,7 +1,6 @@ #include "flo_24.h" #include "world/common/atomic/TexturePan.inc.c" -#include "world/common/atomic/TexturePan.data.inc.c" EvtScript N(EVS_Scene_FillWithWater) = { EVT_CALL(DisablePlayerInput, TRUE) diff --git a/src/world/area_flo/flo_25/flo_25_3_npc.c b/src/world/area_flo/flo_25/flo_25_3_npc.c index 0cae4c1ffb..b41105cbc2 100644 --- a/src/world/area_flo/flo_25/flo_25_3_npc.c +++ b/src/world/area_flo/flo_25/flo_25_3_npc.c @@ -1,8 +1,8 @@ #include "flo_25.h" #include "world/common/npc/GateFlower.inc.c" -#include "world/common/enemy/complete/TuffPuff.inc.c" -#include "world/common/enemy/complete/Bzzap.inc.c" +#include "world/common/enemy/TuffPuff.inc.c" +#include "world/common/enemy/Bzzap.inc.c" #include "world/common/complete/NormalItemChoice.inc.c" @@ -157,25 +157,22 @@ EvtScript N(EVS_NpcInit_GateFlower) = { EVT_END }; -StaticNpc N(NpcData_GateFlower) = { +NpcData N(NpcData_GateFlower) = { .id = NPC_GateFlower, - .settings = &N(NpcSettings_GateFlower), .pos = { 505.0f, 0.0f, -25.0f }, .yaw = 90, - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_GateFlower), - .drops = GATE_FLOWER_DROPS, + .settings = &N(NpcSettings_GateFlower), + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, + .drops = NO_DROPS, .animations = GATE_FLOWER_RED_ANIMS, .tattle = MSG_NpcTattle_RedGateFlower, }; -StaticNpc N(NpcData_TuffPuff) = { +NpcData N(NpcData_TuffPuff) = { .id = NPC_TuffPuff, - .settings = &N(NpcSettings_TuffPuff), .pos = { -200.0f, 45.0f, 0.0f }, .yaw = 90, - .flags = ENEMY_FLAG_400, - .drops = TUFF_PUFF_DROPS, .territory = { .wander = { .isFlying = FALSE, @@ -188,17 +185,17 @@ StaticNpc N(NpcData_TuffPuff) = { .detectSize = { 200 }, } }, + .settings = &N(NpcSettings_TuffPuff), + .flags = ENEMY_FLAG_400, + .drops = TUFF_PUFF_DROPS, .animations = TUFF_PUFF_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT | AI_DETECT_SENSITIVE_MOTION, }; -StaticNpc N(NpcData_Bzzap) = { +NpcData N(NpcData_Bzzap) = { .id = NPC_Bzzap, - .settings = &N(NpcSettings_Bzzap), .pos = { 150.0f, 55.0f, 0.0f }, .yaw = 90, - .flags = ENEMY_FLAG_400, - .drops = BZZAP_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -211,6 +208,9 @@ StaticNpc N(NpcData_Bzzap) = { .detectSize = { 200 }, } }, + .settings = &N(NpcSettings_Bzzap), + .flags = ENEMY_FLAG_400, + .drops = BZZAP_DROPS, .animations = BZZAP_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT | AI_DETECT_SENSITIVE_MOTION, }; diff --git a/src/world/area_gv/gv.h b/src/world/area_gv/gv.h index 356ebd2ad5..0e31af9bd1 100644 --- a/src/world/area_gv/gv.h +++ b/src/world/area_gv/gv.h @@ -2,22 +2,22 @@ #define _WORLD_AREA_GV_GV_H_ enum { - AB_GV_0 = AreaByte(0), - AB_GV_1 = AreaByte(1), - AB_GV_2 = AreaByte(2), - AB_GV_3 = AreaByte(3), - AB_GV_4 = AreaByte(4), - AB_GV_5 = AreaByte(5), - AB_GV_6 = AreaByte(6), - AB_GV_7 = AreaByte(7), - AB_GV_8 = AreaByte(8), - AB_GV_9 = AreaByte(9), - AB_GV_A = AreaByte(10), - AB_GV_B = AreaByte(11), - AB_GV_C = AreaByte(12), - AB_GV_D = AreaByte(13), - AB_GV_E = AreaByte(14), - AB_GV_F = AreaByte(15), + AB_GV_Unused_0 = AreaByte(0), + AB_GV_Unused_1 = AreaByte(1), + AB_GV_Unused_2 = AreaByte(2), + AB_GV_Unused_3 = AreaByte(3), + AB_GV_Unused_4 = AreaByte(4), + AB_GV_Unused_5 = AreaByte(5), + AB_GV_Unused_6 = AreaByte(6), + AB_GV_Unused_7 = AreaByte(7), + AB_GV_Unused_8 = AreaByte(8), + AB_GV_Unused_9 = AreaByte(9), + AB_GV_Unused_A = AreaByte(10), + AB_GV_Unused_B = AreaByte(11), + AB_GV_Unused_C = AreaByte(12), + AB_GV_Unused_D = AreaByte(13), + AB_GV_Unused_E = AreaByte(14), + AB_GV_Unused_F = AreaByte(15), }; #define AF_GV(index) AreaFlag(index) diff --git a/src/world/area_gv/gv_01/gv_01_1_main.c b/src/world/area_gv/gv_01/gv_01_1_main.c index f2e46e4273..9f4544d023 100644 --- a/src/world/area_gv/gv_01/gv_01_1_main.c +++ b/src/world/area_gv/gv_01/gv_01_1_main.c @@ -5,7 +5,6 @@ #include "world/common/entity/Pipe.inc.c" #include "world/common/atomic/TexturePan.inc.c" -#include "world/common/atomic/TexturePan.data.inc.c" s32 N(DropLetterYCurve)[] = { 200, 170, 140, 110, 80, 50, 20, 10, diff --git a/src/world/area_hos/hos.h b/src/world/area_hos/hos.h index b49aa21678..45b97f5ea3 100644 --- a/src/world/area_hos/hos.h +++ b/src/world/area_hos/hos.h @@ -9,15 +9,15 @@ enum { AB_HOS_StatcAmt_Misstar = AreaByte(4), AB_HOS_StatcAmt_Klevar = AreaByte(5), AB_HOS_StatcAmt_Kalmar = 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), + 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), }; enum { diff --git a/src/world/area_hos/hos_00/hos_00_4_npc.c b/src/world/area_hos/hos_00/hos_00_4_npc.c index 1ff3c601a5..6c1315a03f 100644 --- a/src/world/area_hos/hos_00/hos_00_4_npc.c +++ b/src/world/area_hos/hos_00/hos_00_4_npc.c @@ -3,7 +3,7 @@ #include "world/common/npc/Twink.inc.c" #include "world/common/npc/Toad_Stationary.inc.c" -#include "world/common/enemy/complete/FlyingMagikoopa.h" +#include "world/common/enemy/FlyingMagikoopa.h" NpcSettings N(NpcSettings_FlyingMagikoopa) = { .height = 34, @@ -123,45 +123,45 @@ EvtScript N(EVS_NpcInit_Twink) = { EVT_END }; -StaticNpc N(NpcData_Twink) = { +NpcData N(NpcData_Twink) = { .id = NPC_Twink, - .settings = &N(NpcSettings_Twink), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 90, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_Twink), - .drops = NPC_NO_DROPS, + .settings = &N(NpcSettings_Twink), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = NO_DROPS, .animations = TWINK_ANIMS, }; -StaticNpc N(NpcData_FlyingMagikoopa) = { +NpcData N(NpcData_FlyingMagikoopa) = { .id = NPC_FlyingMagikoopa, - .settings = &N(NpcSettings_FlyingMagikoopa), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_40000 | ENEMY_FLAG_NO_DROPS, .init = &N(EVS_NpcInit_FlyingMagikoopa), - .drops = NPC_NO_DROPS, + .settings = &N(NpcSettings_FlyingMagikoopa), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_40000 | ENEMY_FLAG_NO_DROPS, + .drops = NO_DROPS, .animations = FLYING_MAGIKOOPA_ANIMS, }; -StaticNpc N(NpcData_Wishing)[] = { +NpcData N(NpcData_Wishing)[] = { { .id = NPC_Toadette, - .settings = &N(NpcSettings_Toad_Stationary), .pos = { 280.0f, -10.0f, -50.0f }, .yaw = 90, + .settings = &N(NpcSettings_Toad_Stationary), .flags = ENEMY_FLAG_PASSIVE, - .drops = NPC_NO_DROPS, + .drops = NO_DROPS, .animations = TOADETTE_PINK_ANIMS, }, { .id = NPC_ToadKid, - .settings = &N(NpcSettings_Toad_Stationary), .pos = { 330.0f, -10.0f, -40.0f }, .yaw = 270, + .settings = &N(NpcSettings_Toad_Stationary), .flags = ENEMY_FLAG_PASSIVE, - .drops = NPC_NO_DROPS, + .drops = NO_DROPS, .animations = TOAD_KID_RED_ANIMS, }, }; diff --git a/src/world/area_hos/hos_01/hos_01.h b/src/world/area_hos/hos_01/hos_01.h index 30bd94ea60..961c41b455 100644 --- a/src/world/area_hos/hos_01/hos_01.h +++ b/src/world/area_hos/hos_01/hos_01.h @@ -12,24 +12,24 @@ #include "sprite/npc/WorldGoombario.h" enum { - NPC_Eldstar = 0, - NPC_Mamar = 1, - NPC_Skolar = 2, - NPC_Muskular = 3, - NPC_Misstar = 4, - NPC_Klevar = 5, - NPC_Kalmar = 6, + NPC_Eldstar = 0, + NPC_Mamar = 1, + NPC_Skolar = 2, + NPC_Muskular = 3, + NPC_Misstar = 4, + NPC_Klevar = 5, + NPC_Kalmar = 6, }; enum { - MV_AlphaAmt_Eldstar = MapVar(0), - MV_AlphaAmt_Others = MapVar(1), - MV_StarBeamFXPtr = MapVar(10), - MV_StarBeamState = MapVar(11), + MV_AlphaAmt_Eldstar = MapVar(0), + MV_AlphaAmt_Others = MapVar(1), + MV_StarBeamFXPtr = MapVar(10), + MV_StarBeamState = MapVar(11), }; enum { - MF_SpiritsGone = MapFlag(0), + MF_SpiritsGone = MapFlag(0), }; #define NAMESPACE hos_01 diff --git a/src/world/area_hos/hos_01/hos_01_3_model_fx.c b/src/world/area_hos/hos_01/hos_01_3_model_fx.c index 8adba9bf0f..d00bf2deff 100644 --- a/src/world/area_hos/hos_01/hos_01_3_model_fx.c +++ b/src/world/area_hos/hos_01/hos_01_3_model_fx.c @@ -2,7 +2,6 @@ #include "effects.h" #include "world/common/atomic/TexturePan.inc.c" -#include "world/common/atomic/TexturePan.data.inc.c" s32 N(GlowingStarAlpha) = 255; s32 N(GivingPowerAlpha) = 255; diff --git a/src/world/area_hos/hos_01/hos_01_4_npc.c b/src/world/area_hos/hos_01/hos_01_4_npc.c index 2676e36096..a9a1c933d0 100644 --- a/src/world/area_hos/hos_01/hos_01_4_npc.c +++ b/src/world/area_hos/hos_01/hos_01_4_npc.c @@ -439,70 +439,70 @@ EvtScript N(EVS_NpcInit_Eldstar) = { EVT_END }; -StaticNpc N(NpcData_StarSpirits)[] = { +NpcData N(NpcData_StarSpirits)[] = { { .id = NPC_Eldstar, - .settings = &N(NpcSettings_StarSpirit), .pos = { -30.0f, 260.0f, -170.0f }, .yaw = 270, - .flags = COMMON_PASSIVE_FLAGS, .init = &N(EVS_NpcInit_Eldstar), - .drops = NPC_NO_DROPS, + .settings = &N(NpcSettings_StarSpirit), + .flags = COMMON_PASSIVE_FLAGS, + .drops = NO_DROPS, .animations = ELDSTAR_ANIMS, .tattle = MSG_NpcTattle_Eldstar, }, { .id = NPC_Mamar, - .settings = &N(NpcSettings_StarSpirit), .pos = { 100.0f, 260.0f, -215.0f }, .yaw = 270, + .settings = &N(NpcSettings_StarSpirit), .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, - .drops = NPC_NO_DROPS, + .drops = NO_DROPS, .animations = MAMAR_ANIMS, }, { .id = NPC_Skolar, - .settings = &N(NpcSettings_StarSpirit), .pos = { -145.0f, 260.0f, -225.0f }, .yaw = 90, + .settings = &N(NpcSettings_StarSpirit), .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, - .drops = NPC_NO_DROPS, + .drops = NO_DROPS, .animations = SKOLAR_ANIMS, }, { .id = NPC_Muskular, - .settings = &N(NpcSettings_StarSpirit), .pos = { 20.0f, 260.0f, -45.0f }, .yaw = 270, + .settings = &N(NpcSettings_StarSpirit), .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, - .drops = NPC_NO_DROPS, + .drops = NO_DROPS, .animations = MUSKULAR_ANIMS, }, { .id = NPC_Misstar, - .settings = &N(NpcSettings_StarSpirit), .pos = { -155.0f, 260.0f, -125.0f }, .yaw = 90, + .settings = &N(NpcSettings_StarSpirit), .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, - .drops = NPC_NO_DROPS, + .drops = NO_DROPS, .animations = MISSTAR_ANIMS, }, { .id = NPC_Klevar, - .settings = &N(NpcSettings_StarSpirit), .pos = { 90.0f, 260.0f, -110.0f }, .yaw = 270, + .settings = &N(NpcSettings_StarSpirit), .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, - .drops = NPC_NO_DROPS, + .drops = NO_DROPS, .animations = KLEVAR_ANIMS, }, { .id = NPC_Kalmar, - .settings = &N(NpcSettings_StarSpirit), .pos = { -75.0f, 260.0f, -290.0f }, .yaw = 90, + .settings = &N(NpcSettings_StarSpirit), .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, - .drops = NPC_NO_DROPS, + .drops = NO_DROPS, .animations = KALMAR_ANIMS, }, }; diff --git a/src/world/area_hos/hos_02/hos_02_3_model_fx.c b/src/world/area_hos/hos_02/hos_02_3_model_fx.c index 828e1adc08..b25340d548 100644 --- a/src/world/area_hos/hos_02/hos_02_3_model_fx.c +++ b/src/world/area_hos/hos_02/hos_02_3_model_fx.c @@ -2,7 +2,6 @@ #include "effects.h" #include "world/common/atomic/TexturePan.inc.c" -#include "world/common/atomic/TexturePan.data.inc.c" u16 N(HaloScalePhaseAngle) = 0; diff --git a/src/world/area_hos/hos_02/hos_02_5_npc.c b/src/world/area_hos/hos_02/hos_02_5_npc.c index bc7f8dc7be..9badcb68a2 100644 --- a/src/world/area_hos/hos_02/hos_02_5_npc.c +++ b/src/world/area_hos/hos_02/hos_02_5_npc.c @@ -1,14 +1,11 @@ #include "hos_02.h" -#include "world/common/enemy/complete/Ember.inc.c" +#include "world/common/enemy/Ember.inc.c" -StaticNpc N(NpcData_Ember) = { +NpcData N(NpcData_Ember) = { .id = NPC_Ember_01, - .settings = &N(NpcSettings_Ember), .pos = { -410.0f, -15.0f, 260.0f }, .yaw = 90, - .flags = ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, - .drops = EMBER_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -21,17 +18,17 @@ StaticNpc N(NpcData_Ember) = { .detectSize = { 1000 }, } }, + .settings = &N(NpcSettings_Ember), + .flags = ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = EMBER_DROPS, .animations = EMBER_ANIMS, .aiDetectFlags = AI_DETECT_SENSITIVE_MOTION, }; -StaticNpc N(NpcData_Ember_02) = { +NpcData N(NpcData_Ember_02) = { .id = NPC_Ember_02, - .settings = &N(NpcSettings_Ember), .pos = { 220.0f, 200.0f, -205.0f }, .yaw = 90, - .flags = ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, - .drops = EMBER_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -44,17 +41,17 @@ StaticNpc N(NpcData_Ember_02) = { .detectSize = { 1000 }, } }, + .settings = &N(NpcSettings_Ember), + .flags = ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = EMBER_DROPS, .animations = EMBER_ANIMS, .aiDetectFlags = AI_DETECT_SENSITIVE_MOTION, }; -StaticNpc N(NpcData_Ember_03) = { +NpcData N(NpcData_Ember_03) = { .id = NPC_Ember_03, - .settings = &N(NpcSettings_Ember), .pos = { -135.0f, 370.0f, 270.0f }, .yaw = 90, - .flags = ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, - .drops = EMBER_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -67,6 +64,9 @@ StaticNpc N(NpcData_Ember_03) = { .detectSize = { 1000 }, } }, + .settings = &N(NpcSettings_Ember), + .flags = ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = EMBER_DROPS, .animations = EMBER_ANIMS, .aiDetectFlags = AI_DETECT_SENSITIVE_MOTION, }; diff --git a/src/world/area_hos/hos_03/hos_03.h b/src/world/area_hos/hos_03/hos_03.h index 39a75d73d5..42f1a5d7e9 100644 --- a/src/world/area_hos/hos_03/hos_03.h +++ b/src/world/area_hos/hos_03/hos_03.h @@ -13,14 +13,14 @@ #include "sprite/npc/ChuckQuizmo.h" enum { - NPC_StarMan_01 = 0, - NPC_StarMan_02 = 1, - NPC_StarMan_03 = 2, - NPC_StarMan_04 = 3, - NPC_StarMan_05 = 4, - NPC_StarMan_ToadHouse = 5, - NPC_StarMan_ShopOwner = 6, - NPC_ChuckQuizmo = 7, + NPC_StarMan_01 = 0, + NPC_StarMan_02 = 1, + NPC_StarMan_03 = 2, + NPC_StarMan_04 = 3, + NPC_StarMan_05 = 4, + NPC_StarMan_ToadHouse = 5, + NPC_StarMan_ShopOwner = 6, + NPC_ChuckQuizmo = 7, }; #define NAMESPACE hos_03 diff --git a/src/world/area_hos/hos_03/hos_03_3_model_fx.c b/src/world/area_hos/hos_03/hos_03_3_model_fx.c index 106468f30e..6e4384440d 100644 --- a/src/world/area_hos/hos_03/hos_03_3_model_fx.c +++ b/src/world/area_hos/hos_03/hos_03_3_model_fx.c @@ -1,7 +1,6 @@ #include "hos_03.h" #include "world/common/atomic/TexturePan.inc.c" -#include "world/common/atomic/TexturePan.data.inc.c" u16 N(D_80243BCC_A1ECCC) = 0; u16 N(D_80243BCE_A1ECCE) = 0; diff --git a/src/world/area_hos/hos_03/hos_03_6_npc.c b/src/world/area_hos/hos_03/hos_03_6_npc.c index 66afc2541d..0865c330e0 100644 --- a/src/world/area_hos/hos_03/hos_03_6_npc.c +++ b/src/world/area_hos/hos_03/hos_03_6_npc.c @@ -143,37 +143,33 @@ EvtScript N(EVS_NpcInit_ShopOwner) = { EVT_END }; -StaticNpc N(NpcData_Townsfolk)[] = { +NpcData N(NpcData_Townsfolk)[] = { { .id = NPC_StarMan_01, - .settings = &N(NpcSettings_StarMan), .pos = { -463.0f, 10.0f, 400.0f }, .yaw = 270, - .flags = COMMON_PASSIVE_FLAGS, .init = &N(EVS_NpcInit_StarKid_01), - .drops = STAR_MAN_DROPS, + .settings = &N(NpcSettings_StarMan), + .flags = COMMON_PASSIVE_FLAGS, + .drops = NO_DROPS, .animations = STAR_MAN_ANIMS, .tattle = MSG_NpcTattle_HOS_StarKidA, }, { .id = NPC_StarMan_02, - .settings = &N(NpcSettings_StarMan), .pos = { -325.0f, 10.0f, 600.0f }, .yaw = 270, - .flags = COMMON_PASSIVE_FLAGS, .init = &N(EVS_NpcInit_StarKid_02), - .drops = STAR_MAN_DROPS, + .settings = &N(NpcSettings_StarMan), + .flags = COMMON_PASSIVE_FLAGS, + .drops = NO_DROPS, .animations = STAR_MAN_ANIMS, .tattle = MSG_NpcTattle_HOS_StarKidB, }, { .id = NPC_StarMan_03, - .settings = &N(NpcSettings_StarMan_Wander), .pos = { 0.0f, 10.0f, 300.0f }, .yaw = 270, - .flags = COMMON_PASSIVE_FLAGS, - .init = &N(EVS_NpcInit_StarKid_03), - .drops = STAR_MAN_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -186,17 +182,17 @@ StaticNpc N(NpcData_Townsfolk)[] = { .detectSize = { 30 }, } }, + .init = &N(EVS_NpcInit_StarKid_03), + .settings = &N(NpcSettings_StarMan_Wander), + .flags = COMMON_PASSIVE_FLAGS, + .drops = NO_DROPS, .animations = STAR_MAN_ANIMS, .tattle = MSG_NpcTattle_HOS_StarKidC, }, { .id = NPC_StarMan_04, - .settings = &N(NpcSettings_StarMan_Wander), .pos = { 250.0f, 10.0f, 500.0f }, .yaw = 270, - .flags = COMMON_PASSIVE_FLAGS, - .init = &N(EVS_NpcInit_StarKid_04), - .drops = STAR_MAN_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -209,51 +205,55 @@ StaticNpc N(NpcData_Townsfolk)[] = { .detectSize = { 30 }, } }, + .init = &N(EVS_NpcInit_StarKid_04), + .settings = &N(NpcSettings_StarMan_Wander), + .flags = COMMON_PASSIVE_FLAGS, + .drops = NO_DROPS, .animations = STAR_MAN_ANIMS, .tattle = MSG_NpcTattle_HOS_StarKidD, }, { .id = NPC_StarMan_05, - .settings = &N(NpcSettings_StarMan), .pos = { -485.0f, 335.0f, -100.0f }, .yaw = 270, - .flags = COMMON_PASSIVE_FLAGS, .init = &N(EVS_NpcInit_StarKid_05), - .drops = STAR_MAN_DROPS, + .settings = &N(NpcSettings_StarMan), + .flags = COMMON_PASSIVE_FLAGS, + .drops = NO_DROPS, .animations = STAR_MAN_ANIMS, .tattle = MSG_NpcTattle_HOS_StarKidE, }, { .id = NPC_StarMan_ToadHouse, - .settings = &N(NpcSettings_StarMan), .pos = { 458.0f, 35.0f, 233.0f }, .yaw = 270, - .flags = COMMON_PASSIVE_FLAGS, .init = &N(EVS_NpcInit_ToadHouseKeeper), - .drops = STAR_MAN_DROPS, + .settings = &N(NpcSettings_StarMan), + .flags = COMMON_PASSIVE_FLAGS, + .drops = NO_DROPS, .animations = STAR_MAN_ANIMS, .tattle = MSG_NpcTattle_HOS_ToadHouseStarKid, }, { .id = NPC_StarMan_ShopOwner, - .settings = &N(NpcSettings_StarMan), .pos = { 140.0f, 285.0f, -315.0f }, .yaw = 270, - .flags = COMMON_PASSIVE_FLAGS, .init = &N(EVS_NpcInit_ShopOwner), - .drops = STAR_MAN_DROPS, + .settings = &N(NpcSettings_StarMan), + .flags = COMMON_PASSIVE_FLAGS, + .drops = NO_DROPS, .animations = STAR_MAN_ANIMS, .tattle = MSG_NpcTattle_HOS_ShopOwner, }, { .id = NPC_ChuckQuizmo, - .settings = &N(NpcSettings_ChuckQuizmo), .pos = { -200.0f, 0.0f, 400.0f }, .yaw = 90, - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, .initVarCount = 1, .initVar = { .bytes = { 0, QUIZ_AREA_HOS, QUIZ_COUNT_HOS, QUIZ_MAP_HOS_03 }}, - .drops = QUIZMO_DROPS, + .settings = &N(NpcSettings_ChuckQuizmo), + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, + .drops = NO_DROPS, .animations = QUIZMO_ANIMS, .tattle = MSG_NpcTattle_ChuckQuizmo, }, diff --git a/src/world/area_hos/hos_04/hos_04_3_fountains.c b/src/world/area_hos/hos_04/hos_04_3_fountains.c index e7e6a7caa4..cad40cec68 100644 --- a/src/world/area_hos/hos_04/hos_04_3_fountains.c +++ b/src/world/area_hos/hos_04/hos_04_3_fountains.c @@ -21,7 +21,6 @@ void N(setup_gfx_fountain_stars)(void) { } #include "world/common/atomic/TexturePan.inc.c" -#include "world/common/atomic/TexturePan.data.inc.c" EvtScript N(EVS_SetupFountains) = { EVT_THREAD diff --git a/src/world/area_hos/hos_04/hos_04_6_intro.c b/src/world/area_hos/hos_04/hos_04_6_intro.c index cc5f1dfcc6..da5ecb3e11 100644 --- a/src/world/area_hos/hos_04/hos_04_6_intro.c +++ b/src/world/area_hos/hos_04/hos_04_6_intro.c @@ -205,14 +205,14 @@ EvtScript N(EVS_NpcInit_Twink) = { EVT_END }; -StaticNpc N(NpcData_Twink) = { +NpcData N(NpcData_Twink) = { .id = NPC_Twink, - .settings = &N(NpcSettings_StarSpirit), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_Twink), - .drops = NPC_NO_DROPS, + .settings = &N(NpcSettings_StarSpirit), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_800, + .drops = NO_DROPS, .animations = TWINK_ANIMS, }; diff --git a/src/world/area_hos/hos_05/hos_05.h b/src/world/area_hos/hos_05/hos_05.h index f9dc05d129..3b91880fb2 100644 --- a/src/world/area_hos/hos_05/hos_05.h +++ b/src/world/area_hos/hos_05/hos_05.h @@ -28,7 +28,7 @@ enum { NPC_Misstar = 4, NPC_Klevar = 5, NPC_Kalmar = 6, - NPC_Bowser_Main = 7, + NPC_Bowser_Body = 7, NPC_Bowser_Prop = 8, NPC_Kammy = 9, NPC_StarRod = 10, diff --git a/src/world/area_hos/hos_05/hos_05_3_misc.c b/src/world/area_hos/hos_05/hos_05_3_misc.c index 8617c2bcd2..5ecb0ee950 100644 --- a/src/world/area_hos/hos_05/hos_05_3_misc.c +++ b/src/world/area_hos/hos_05/hos_05_3_misc.c @@ -3,7 +3,6 @@ #include "world/common/atomic/UnkFunc27.inc.c" #include "world/common/atomic/TexturePan.inc.c" -#include "world/common/atomic/TexturePan.data.inc.c" API_CALLABLE(N(AwaitScriptComplete)) { Bytecode* args = script->ptrReadPos; diff --git a/src/world/area_hos/hos_05/hos_05_4_npc.c b/src/world/area_hos/hos_05/hos_05_4_npc.c index b8a74ef7f3..e5d4258173 100644 --- a/src/world/area_hos/hos_05/hos_05_4_npc.c +++ b/src/world/area_hos/hos_05/hos_05_4_npc.c @@ -11,32 +11,11 @@ API_CALLABLE(N(UnlockStarBeam)) { } #include "world/common/npc/StarSpirit.inc.c" +#include "world/common/npc/Bowser.inc.c" -NpcSettings N(NpcSettings_Bowser) = { - .height = 75, - .radius = 72, - .level = 99, -}; +#include "world/common/enemy/Kammy_Flying.inc.c" -NpcSettings N(NpcSettings_Kammy) = { - .height = 34, - .radius = 24, - .level = 26, - .onHit = &EnemyNpcHit, - .onDefeat = &EnemyNpcDefeat, -}; - -EvtScript N(EVS_NpcAuxAI_StarRod) = { - EVT_RETURN - EVT_END -}; - -NpcSettings N(NpcSettings_StarRod) = { - .height = 24, - .radius = 24, - .level = 99, - .otherAI = &N(EVS_NpcAuxAI_StarRod), -}; +#include "world/common/npc/StarRod.inc.c" EvtScript N(EVS_StarSpirit_HoverBobbing) = { EVT_CALL(SetNpcVar, NPC_Eldstar, 0, 0) @@ -335,148 +314,148 @@ EvtScript N(EVS_NpcInit_StarSpirit) = { EVT_END }; -s32 N(ExtraAnims_Eldstar)[] = { +AnimID N(ExtraAnims_Eldstar)[] = { ANIM_WorldEldstar_Idle, ANIM_WorldEldstar_Panic, ANIM_WorldEldstar_Wave, ANIM_WorldEldstar_Angry, ANIM_WorldEldstar_Hurt, ANIM_WorldEldstar_Back, - -1 + ANIM_LIST_END }; -s32 N(ExtraAnims_Mamar)[] = { +AnimID N(ExtraAnims_Mamar)[] = { ANIM_WorldMamar_Idle, ANIM_WorldMamar_Panic, ANIM_WorldMamar_Angry, ANIM_WorldMamar_Hurt, ANIM_WorldMamar_Back, ANIM_WorldMamar_Talk, - -1 + ANIM_LIST_END }; -s32 N(ExtraAnims_Skolar)[] = { +AnimID N(ExtraAnims_Skolar)[] = { ANIM_WorldSkolar_Idle, ANIM_WorldSkolar_IdleSad, ANIM_WorldSkolar_Panic, ANIM_WorldSkolar_Hurt, ANIM_WorldSkolar_Talk, ANIM_WorldSkolar_Back, - -1 + ANIM_LIST_END }; -s32 N(ExtraAnims_Muskular)[] = { +AnimID N(ExtraAnims_Muskular)[] = { ANIM_WorldMuskular_Idle, ANIM_WorldMuskular_Panic, ANIM_WorldMuskular_Hurt, ANIM_WorldMuskular_Happy, ANIM_WorldMuskular_Back, - -1 + ANIM_LIST_END }; -s32 N(ExtraAnims_Misstar)[] = { +AnimID N(ExtraAnims_Misstar)[] = { ANIM_WorldMisstar_Still, ANIM_WorldMisstar_Idle, ANIM_WorldMisstar_Panic, ANIM_WorldMisstar_Hurt, ANIM_WorldMisstar_Happy, ANIM_WorldMisstar_Back, - -1 + ANIM_LIST_END }; -s32 N(ExtraAnims_Klevar)[] = { +AnimID N(ExtraAnims_Klevar)[] = { ANIM_WorldKlevar_Idle, ANIM_WorldKlevar_Panic, ANIM_WorldKlevar_Hurt, ANIM_WorldKlevar_TalkHappy, ANIM_WorldKlevar_Back, - -1 + ANIM_LIST_END }; -s32 N(ExtraAnims_Kalmar)[] = { +AnimID N(ExtraAnims_Kalmar)[] = { ANIM_WorldKalmar_Idle, ANIM_WorldKalmar_Panic, ANIM_WorldKalmar_Hurt, ANIM_WorldKalmar_TalkHappy, ANIM_WorldKalmar_Back, - -1 + ANIM_LIST_END }; -StaticNpc N(NpcData_StarSpirits)[] = { +NpcData N(NpcData_StarSpirits)[] = { { .id = NPC_Mamar, - .settings = &N(NpcSettings_StarSpirit), .pos = { 220.0f, 220.0f, -170.0f }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_200 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_StarSpirit), - .drops = NPC_NO_DROPS, + .settings = &N(NpcSettings_StarSpirit), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_200 | ENEMY_FLAG_800, + .drops = NO_DROPS, .animations = MAMAR_ANIMS, .extraAnimations = N(ExtraAnims_Mamar), }, { .id = NPC_Skolar, - .settings = &N(NpcSettings_StarSpirit), .pos = { -275.0f, 220.0f, 60.0f }, .yaw = 90, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_200 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_StarSpirit), - .drops = NPC_NO_DROPS, + .settings = &N(NpcSettings_StarSpirit), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_200 | ENEMY_FLAG_800, + .drops = NO_DROPS, .animations = SKOLAR_ANIMS, .extraAnimations = N(ExtraAnims_Skolar), }, { .id = NPC_Muskular, - .settings = &N(NpcSettings_StarSpirit), .pos = { 125.0f, 220.0f, 250.0f }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_200 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_StarSpirit), - .drops = NPC_NO_DROPS, + .settings = &N(NpcSettings_StarSpirit), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_200 | ENEMY_FLAG_800, + .drops = NO_DROPS, .animations = MUSKULAR_ANIMS, .extraAnimations = N(ExtraAnims_Muskular), }, { .id = NPC_Misstar, - .settings = &N(NpcSettings_StarSpirit), .pos = { -125.0f, 220.0f, 250.0f }, .yaw = 90, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_200 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_StarSpirit), - .drops = NPC_NO_DROPS, + .settings = &N(NpcSettings_StarSpirit), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_200 | ENEMY_FLAG_800, + .drops = NO_DROPS, .animations = MISSTAR_ANIMS, .extraAnimations = N(ExtraAnims_Misstar), }, { .id = NPC_Klevar, - .settings = &N(NpcSettings_StarSpirit), .pos = { 275.0f, 220.0f, 60.0f }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_200 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_StarSpirit), - .drops = NPC_NO_DROPS, + .settings = &N(NpcSettings_StarSpirit), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_200 | ENEMY_FLAG_800, + .drops = NO_DROPS, .animations = KLEVAR_ANIMS, .extraAnimations = N(ExtraAnims_Klevar), }, { .id = NPC_Kalmar, - .settings = &N(NpcSettings_StarSpirit), .pos = { -220.0f, 220.0f, -170.0f }, .yaw = 90, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_200 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_StarSpirit), - .drops = NPC_NO_DROPS, + .settings = &N(NpcSettings_StarSpirit), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_200 | ENEMY_FLAG_800, + .drops = NO_DROPS, .animations = KALMAR_ANIMS, .extraAnimations = N(ExtraAnims_Kalmar), }, { .id = NPC_Eldstar, - .settings = &N(NpcSettings_StarSpirit), .pos = { 0.0f, 220.0f, -275.0f }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_200 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_StarSpirit), - .drops = NPC_NO_DROPS, + .settings = &N(NpcSettings_StarSpirit), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_200 | ENEMY_FLAG_800, + .drops = NO_DROPS, .animations = ELDSTAR_ANIMS, .extraAnimations = N(ExtraAnims_Eldstar), }, @@ -496,7 +475,7 @@ s32 N(NpcData_ClownCar)[] = { -1 }; -s32 N(ExtraAnims_Kammy)[] = { +AnimID N(ExtraAnims_Kammy)[] = { ANIM_WorldKammy_Anim09, ANIM_WorldKammy_Anim0B, ANIM_WorldKammy_Anim0D, @@ -504,132 +483,48 @@ s32 N(ExtraAnims_Kammy)[] = { ANIM_WorldKammy_Anim11, ANIM_WorldKammy_Anim12, ANIM_WorldKammy_Anim17, - -1 + ANIM_LIST_END }; -StaticNpc N(NpcData_Thieves)[] = { +NpcData N(NpcData_Thieves)[] = { { - .id = NPC_Bowser_Main, - .settings = &N(NpcSettings_Bowser), + .id = NPC_Bowser_Body, .pos = { NPC_DISPOSE_LOCATION }, .yaw = 270, + .settings = &N(NpcSettings_Bowser), .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_200 | ENEMY_FLAG_800, - .drops = { - .dropFlags = NPC_DROP_FLAG_80, - .heartDrops = NO_DROPS, - .flowerDrops = NO_DROPS, - }, - .animations = { - .idle = ANIM_WorldBowser_Idle, - .walk = ANIM_WorldBowser_Idle, - .run = ANIM_WorldBowser_Idle, - .chase = ANIM_WorldBowser_Idle, - .anim_4 = ANIM_WorldBowser_Idle, - .anim_5 = ANIM_WorldBowser_Idle, - .death = ANIM_WorldBowser_Idle, - .hit = ANIM_WorldBowser_Idle, - .anim_8 = ANIM_WorldBowser_Idle, - .anim_9 = ANIM_WorldBowser_Idle, - .anim_A = ANIM_WorldBowser_Idle, - .anim_B = ANIM_WorldBowser_Idle, - .anim_C = ANIM_WorldBowser_Idle, - .anim_D = ANIM_WorldBowser_Idle, - .anim_E = ANIM_WorldBowser_Idle, - .anim_F = ANIM_WorldBowser_Idle, - }, + .drops = NO_DROPS, + .animations = BOWSER_ANIMS, .extraAnimations = N(NpcData_ClownCar), }, { .id = NPC_Bowser_Prop, - .settings = &N(NpcSettings_Bowser), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 270, + .settings = &N(NpcSettings_Bowser), .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_200 | ENEMY_FLAG_800, - .drops = { - .dropFlags = NPC_DROP_FLAG_80, - .heartDrops = NO_DROPS, - .flowerDrops = NO_DROPS, - }, - .animations = { - .idle = ANIM_WorldBowser_Idle, - .walk = ANIM_WorldBowser_Idle, - .run = ANIM_WorldBowser_Idle, - .chase = ANIM_WorldBowser_Idle, - .anim_4 = ANIM_WorldBowser_Idle, - .anim_5 = ANIM_WorldBowser_Idle, - .death = ANIM_WorldBowser_Idle, - .hit = ANIM_WorldBowser_Idle, - .anim_8 = ANIM_WorldBowser_Idle, - .anim_9 = ANIM_WorldBowser_Idle, - .anim_A = ANIM_WorldBowser_Idle, - .anim_B = ANIM_WorldBowser_Idle, - .anim_C = ANIM_WorldBowser_Idle, - .anim_D = ANIM_WorldBowser_Idle, - .anim_E = ANIM_WorldBowser_Idle, - .anim_F = ANIM_WorldBowser_Idle, - }, + .drops = NO_DROPS, + .animations = BOWSER_ANIMS, .extraAnimations = N(NpcData_ClownCar), }, { .id = NPC_Kammy, - .settings = &N(NpcSettings_Kammy), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 270, + .settings = &N(NpcSettings_Kammy_Flying), .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_200 | ENEMY_FLAG_800, - .drops = { - .dropFlags = NPC_DROP_FLAG_80, - .heartDrops = NO_DROPS, - .flowerDrops = NO_DROPS, - }, - .animations = { - .idle = ANIM_WorldKammy_Anim01, - .walk = ANIM_WorldKammy_Anim02, - .run = ANIM_WorldKammy_Anim03, - .chase = ANIM_WorldKammy_Anim03, - .anim_4 = ANIM_WorldKammy_Anim01, - .anim_5 = ANIM_WorldKammy_Anim01, - .death = ANIM_WorldKammy_Anim00, - .hit = ANIM_WorldKammy_Anim00, - .anim_8 = ANIM_WorldKammy_Anim03, - .anim_9 = ANIM_WorldKammy_Anim03, - .anim_A = ANIM_WorldKammy_Anim03, - .anim_B = ANIM_WorldKammy_Anim03, - .anim_C = ANIM_WorldKammy_Anim03, - .anim_D = ANIM_WorldKammy_Anim03, - .anim_E = ANIM_WorldKammy_Anim03, - .anim_F = ANIM_WorldKammy_Anim03, - }, + .drops = NO_DROPS, + .animations = KAMMY_ANIMS, .extraAnimations = N(ExtraAnims_Kammy), }, { .id = NPC_StarRod, - .settings = &N(NpcSettings_StarRod), .pos = { 0.0f, 174.0f, 0.0f }, .yaw = 270, + .settings = &N(NpcSettings_StarRod), .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_200 | ENEMY_FLAG_800, - .drops = { - .dropFlags = NPC_DROP_FLAG_80, - .heartDrops = NO_DROPS, - .flowerDrops = NO_DROPS, - }, - .animations = { - .idle = ANIM_StarRod_Still, - .walk = ANIM_StarRod_Still, - .run = ANIM_StarRod_Still, - .chase = ANIM_StarRod_Still, - .anim_4 = ANIM_StarRod_Still, - .anim_5 = ANIM_StarRod_Still, - .death = ANIM_StarRod_Still, - .hit = ANIM_StarRod_Still, - .anim_8 = ANIM_StarRod_Still, - .anim_9 = ANIM_StarRod_Still, - .anim_A = ANIM_StarRod_Still, - .anim_B = ANIM_StarRod_Still, - .anim_C = ANIM_StarRod_Still, - .anim_D = ANIM_StarRod_Still, - .anim_E = ANIM_StarRod_Still, - .anim_F = ANIM_StarRod_Still, - }, + .drops = NO_DROPS, + .animations = STAR_ROD_ANIMS, }, }; diff --git a/src/world/area_hos/hos_05/hos_05_5_intro.c b/src/world/area_hos/hos_05/hos_05_5_intro.c index c952568467..26d90caf0a 100644 --- a/src/world/area_hos/hos_05/hos_05_5_intro.c +++ b/src/world/area_hos/hos_05/hos_05_5_intro.c @@ -494,7 +494,7 @@ BSS f32 N(UnusedBowserLeapBaseY); // probably for unused 'breaking ceiling' part of the scene API_CALLABLE(N(UnusedBowserLeapDown)) { - Npc* bowserMain = resolve_npc(script, NPC_Bowser_Main); + Npc* bowserMain = resolve_npc(script, NPC_Bowser_Body); Npc* bowserProp = resolve_npc(script, NPC_Bowser_Prop); if (isInitialCall) { @@ -536,7 +536,7 @@ s16 N(BowserHoverOffsets)[] = { BSS f32 N(BowserHoverBaseY); API_CALLABLE(N(AddBowserHoverOffset)) { - Npc* bowserMain = resolve_npc(script, NPC_Bowser_Main); + Npc* bowserMain = resolve_npc(script, NPC_Bowser_Body); Npc* bowserProp = resolve_npc(script, NPC_Bowser_Prop); if (isInitialCall) { @@ -716,7 +716,7 @@ API_CALLABLE(N(CamPushIn_BowserInhale)) { camera->panActive = TRUE; camera->controlSettings.boomLength = N(BoomLengthInhale); if ((N(CamMoveInhaleTime) == ((N(CamMoveInhaleTime) / 5) * 5)) && (N(BoomLengthInhale) != 90.0f)) { - f32 temp_f4 = resolve_npc(script, NPC_Bowser_Main)->pos.y - 150.0f; + f32 temp_f4 = resolve_npc(script, NPC_Bowser_Body)->pos.y - 150.0f; fx_fire_breath( 1, script->varTable[0], @@ -757,7 +757,7 @@ BSS f32 N(FlyToStarRodStartX); BSS f32 N(FlyToStarRodStartZ); API_CALLABLE(N(BowserFlyToStarRod)) { - Npc* bowserMain = resolve_npc(script, NPC_Bowser_Main); + Npc* bowserMain = resolve_npc(script, NPC_Bowser_Body); Npc* bowserProp = resolve_npc(script, NPC_Bowser_Prop); if (isInitialCall) { @@ -1865,7 +1865,7 @@ EvtScript N(EVS_Intro_Main) = { f32 N(AnimBowser_FlyOff_Time) = 0.0; API_CALLABLE(N(AnimBowser_FlyOff)) { - Npc* bowserMain = resolve_npc(script, NPC_Bowser_Main); + Npc* bowserMain = resolve_npc(script, NPC_Bowser_Body); Npc* bowserProp = resolve_npc(script, NPC_Bowser_Prop); if (isInitialCall) { @@ -1945,9 +1945,9 @@ EvtScript N(EVS_Scene_IntroStory) = { EVT_CALL(SetNpcPaletteSwapping, NPC_Klevar, 0, 1, 25, 12, 4, 18, 0, 0) EVT_CALL(SetNpcPaletteSwapping, NPC_Kalmar, 0, 1, 25, 12, 4, 18, 0, 0) EVT_CALL(SetNpcFlagBits, NPC_StarRod, NPC_FLAG_40000, TRUE) - EVT_CALL(SetNpcAnimation, NPC_Bowser_Main, ANIM_WorldBowser_ClownCarStill) + EVT_CALL(SetNpcAnimation, NPC_Bowser_Body, ANIM_WorldBowser_ClownCarStill) EVT_CALL(SetNpcAnimation, NPC_Bowser_Prop, ANIM_WorldBowser_ClownCarPropeller) - EVT_CALL(EnableNpcShadow, NPC_Bowser_Main, FALSE) + EVT_CALL(EnableNpcShadow, NPC_Bowser_Body, FALSE) EVT_CALL(EnableNpcShadow, NPC_Bowser_Prop, FALSE) EVT_CALL(EnableNpcShadow, NPC_StarRod, FALSE) EVT_CALL(EnableNpcShadow, NPC_Eldstar, FALSE) @@ -1961,9 +1961,9 @@ EvtScript N(EVS_Scene_IntroStory) = { EVT_THREAD EVT_CALL(N(ForceStarRodAlwaysFaceCamera)) EVT_END_THREAD - EVT_CALL(InterpNpcYaw, NPC_Bowser_Main, 90, 0) + EVT_CALL(InterpNpcYaw, NPC_Bowser_Body, 90, 0) EVT_CALL(InterpNpcYaw, NPC_Bowser_Prop, 90, 0) - EVT_CALL(SetNpcAnimation, NPC_Bowser_Main, ANIM_WorldBowser_ClownCarTalk) + EVT_CALL(SetNpcAnimation, NPC_Bowser_Body, ANIM_WorldBowser_ClownCarTalk) EVT_CALL(SetNpcAnimation, NPC_Bowser_Prop, ANIM_WorldBowser_ClownCarPropeller) EVT_CALL(SetNpcAnimation, NPC_Kammy, ANIM_WorldKammy_Anim17) EVT_CALL(InterpNpcYaw, NPC_Kammy, 45, 0) @@ -1976,9 +1976,9 @@ EvtScript N(EVS_Scene_IntroStory) = { EVT_CALL(LoadSettings, CAM_DEFAULT, EVT_PTR(N(IntroCamSettings6))) EVT_CALL(N(AnimateStorybookPages)) EVT_WAIT(50) - EVT_CALL(func_802CFD30, NPC_Bowser_Main, FOLD_TYPE_8, 0, 0, 0, 0) + EVT_CALL(func_802CFD30, NPC_Bowser_Body, FOLD_TYPE_8, 0, 0, 0, 0) EVT_CALL(func_802CFD30, NPC_Bowser_Prop, FOLD_TYPE_8, 0, 0, 0, 0) - EVT_CALL(SetNpcPos, NPC_Bowser_Main, -64, 135, 85) + EVT_CALL(SetNpcPos, NPC_Bowser_Body, -64, 135, 85) EVT_CALL(SetNpcPos, NPC_Bowser_Prop, -64, 135, 85) EVT_THREAD EVT_SET(LVar0, 0) @@ -1987,7 +1987,7 @@ EvtScript N(EVS_Scene_IntroStory) = { EVT_IF_GT(LVar0, 255) EVT_SET(LVar0, 255) EVT_END_IF - EVT_CALL(func_802CFD30, NPC_Bowser_Main, FOLD_TYPE_8, 0, 0, 0, LVar0) + EVT_CALL(func_802CFD30, NPC_Bowser_Body, FOLD_TYPE_8, 0, 0, 0, LVar0) EVT_CALL(func_802CFD30, NPC_Bowser_Prop, FOLD_TYPE_8, 0, 0, 0, LVar0) EVT_WAIT(1) EVT_END_LOOP @@ -1997,11 +1997,11 @@ EvtScript N(EVS_Scene_IntroStory) = { EVT_SET(LVar0, 0) EVT_LOOP(40) EVT_ADD(LVar0, 36) - EVT_CALL(SetNpcRotation, NPC_Bowser_Main, 0, LVar0, 0) + EVT_CALL(SetNpcRotation, NPC_Bowser_Body, 0, LVar0, 0) EVT_WAIT(1) EVT_END_LOOP - EVT_CALL(SetNpcRotation, NPC_Bowser_Main, 0, 0, 0) - EVT_CALL(InterpNpcYaw, NPC_Bowser_Main, 90, 0) + EVT_CALL(SetNpcRotation, NPC_Bowser_Body, 0, 0, 0) + EVT_CALL(InterpNpcYaw, NPC_Bowser_Body, 90, 0) EVT_END_THREAD EVT_THREAD EVT_CALL(N(SetWorldColorParams), 117, 28, 42, 0, 0, 0, 15) @@ -2027,7 +2027,7 @@ EvtScript N(EVS_Scene_IntroStory) = { EVT_WAIT(5) EVT_END_LOOP EVT_WAIT(30) - EVT_CALL(func_802CFD30, NPC_Bowser_Main, FOLD_TYPE_8, 0, 0, 0, 255) + EVT_CALL(func_802CFD30, NPC_Bowser_Body, FOLD_TYPE_8, 0, 0, 0, 255) EVT_CALL(func_802CFD30, NPC_Bowser_Prop, FOLD_TYPE_8, 0, 0, 0, 255) EVT_THREAD EVT_SET(LVar0, 0) @@ -2036,7 +2036,7 @@ EvtScript N(EVS_Scene_IntroStory) = { EVT_IF_GT(LVar0, 255) EVT_SET(LVar0, 255) EVT_END_IF - EVT_CALL(func_802CFD30, NPC_Bowser_Main, FOLD_TYPE_8, LVar0, LVar0, LVar0, 255) + EVT_CALL(func_802CFD30, NPC_Bowser_Body, FOLD_TYPE_8, LVar0, LVar0, LVar0, 255) EVT_CALL(func_802CFD30, NPC_Bowser_Prop, FOLD_TYPE_8, LVar0, LVar0, LVar0, 255) EVT_WAIT(1) EVT_END_LOOP @@ -2157,8 +2157,8 @@ EvtScript N(EVS_Scene_IntroStory) = { EVT_CALL(N(AdjustCamVfov), 0, 25) EVT_CALL(SetPanTarget, CAM_DEFAULT, -38, 210, 85) EVT_CALL(LoadSettings, CAM_DEFAULT, EVT_PTR(N(IntroCamSettings8))) - EVT_CALL(SetNpcAnimation, NPC_Bowser_Main, ANIM_WorldBowser_ClownCarCloseMouth) - EVT_CALL(SetNpcPos, NPC_Bowser_Main, -30, 150, 162) + EVT_CALL(SetNpcAnimation, NPC_Bowser_Body, ANIM_WorldBowser_ClownCarCloseMouth) + EVT_CALL(SetNpcPos, NPC_Bowser_Body, -30, 150, 162) EVT_CALL(SetNpcPos, NPC_Bowser_Prop, -30, 150, 162) EVT_CALL(SetNpcAnimation, NPC_Kammy, ANIM_WorldKammy_Anim11) EVT_THREAD @@ -2191,7 +2191,7 @@ EvtScript N(EVS_Scene_IntroStory) = { EVT_SET(LVar5, 153) EVT_CALL(N(CamPushIn_BowserInhale)) EVT_PLAY_EFFECT(EFFECT_FIRE_BREATH, 0, -30, 210, 142, 0, 180, 0, 5, 2, 30) - EVT_CALL(SetNpcAnimation, NPC_Bowser_Main, ANIM_WorldBowser_ClownCarFireBreath) + EVT_CALL(SetNpcAnimation, NPC_Bowser_Body, ANIM_WorldBowser_ClownCarFireBreath) EVT_THREAD EVT_CALL(N(CamPullBack_BowserExhale)) EVT_END_THREAD @@ -2206,7 +2206,7 @@ EvtScript N(EVS_Scene_IntroStory) = { EVT_CALL(SetPanTarget, CAM_DEFAULT, -38, 210, 85) EVT_CALL(LoadSettings, CAM_DEFAULT, EVT_PTR(N(IntroCamSettings9))) EVT_WAIT(20) - EVT_CALL(SetNpcAnimation, NPC_Bowser_Main, ANIM_WorldBowser_ClownCarOpenMouth) + EVT_CALL(SetNpcAnimation, NPC_Bowser_Body, ANIM_WorldBowser_ClownCarOpenMouth) EVT_THREAD EVT_CALL(N(BowserFlyToStarRod)) EVT_END_THREAD @@ -2262,8 +2262,8 @@ EvtScript N(EVS_Scene_IntroStory) = { EVT_CALL(N(AdjustCamVfov), 0, 35) EVT_CALL(SetPanTarget, CAM_DEFAULT, 30, 232, 0) EVT_CALL(LoadSettings, CAM_DEFAULT, EVT_PTR(N(IntroCamSettings11))) - EVT_CALL(SetNpcAnimation, NPC_Bowser_Main, ANIM_WorldBowser_ClownCarBrandish) - EVT_CALL(SetNpcPos, NPC_Bowser_Main, 0, 170, 0) + EVT_CALL(SetNpcAnimation, NPC_Bowser_Body, ANIM_WorldBowser_ClownCarBrandish) + EVT_CALL(SetNpcPos, NPC_Bowser_Body, 0, 170, 0) EVT_CALL(SetNpcPos, NPC_Bowser_Prop, 0, 170, 0) EVT_CALL(SetNpcPos, NPC_StarRod, NPC_DISPOSE_LOCATION) EVT_THREAD @@ -2294,7 +2294,7 @@ EvtScript N(EVS_Scene_IntroStory) = { EVT_CALL(N(AdjustCamVfov), 0, 35) EVT_CALL(SetPanTarget, CAM_DEFAULT, 0, 177, 0) EVT_CALL(LoadSettings, CAM_DEFAULT, EVT_PTR(N(IntroCamSettings12))) - EVT_CALL(SetNpcAnimation, NPC_Bowser_Main, ANIM_WorldBowser_ClownCarStarRod) + EVT_CALL(SetNpcAnimation, NPC_Bowser_Body, ANIM_WorldBowser_ClownCarStarRod) EVT_PLAY_EFFECT(EFFECT_LIGHT_RAYS, 2, 20, 265, -21, EVT_FLOAT(1.0), ArrayVar(18)) EVT_PLAY_EFFECT(EFFECT_BULB_GLOW, 2, 20, 265, -21, EVT_FLOAT(1.0), ArrayVar(19)) EVT_SET(LVar0, 120) @@ -2414,10 +2414,10 @@ EvtScript N(EVS_Scene_IntroStory) = { EVT_CALL(SetPanTarget, CAM_DEFAULT, 40, 200, -40) EVT_CALL(LoadSettings, CAM_DEFAULT, EVT_PTR(N(IntroCamSettings13))) EVT_CALL(RemoveEffect, ArrayVar(16)) - EVT_CALL(SetNpcAnimation, NPC_Bowser_Main, ANIM_WorldBowser_ClownCarIdle) + EVT_CALL(SetNpcAnimation, NPC_Bowser_Body, ANIM_WorldBowser_ClownCarIdle) EVT_THREAD EVT_WAIT(45) - EVT_CALL(NpcFaceNpc, NPC_Bowser_Main, NPC_Eldstar, 0) + EVT_CALL(NpcFaceNpc, NPC_Bowser_Body, NPC_Eldstar, 0) EVT_END_THREAD EVT_CALL(SetNpcAnimation, NPC_Kammy, ANIM_WorldKammy_Anim12) EVT_EXEC(N(EVS_CaptureSpirits)) @@ -2436,7 +2436,7 @@ EvtScript N(EVS_Scene_IntroStory) = { EVT_CALL(N(AdjustCamVfov), 0, 50) EVT_CALL(SetPanTarget, CAM_DEFAULT, 0, 200, 0) EVT_CALL(LoadSettings, CAM_DEFAULT, EVT_PTR(N(IntroCamSettings15))) - EVT_CALL(SetNpcAnimation, NPC_Bowser_Main, ANIM_WorldBowser_ClownCarLaugh) + EVT_CALL(SetNpcAnimation, NPC_Bowser_Body, ANIM_WorldBowser_ClownCarLaugh) EVT_THREAD EVT_CALL(N(CamPullBack_Final)) EVT_END_THREAD @@ -2467,7 +2467,7 @@ EvtScript N(EVS_Scene_IntroStory) = { EVT_CALL(SetNpcJumpscale, NPC_Misstar, EVT_FLOAT(0.0)) EVT_CALL(SetNpcJumpscale, NPC_Klevar, EVT_FLOAT(0.0)) EVT_CALL(SetNpcJumpscale, NPC_Kalmar, EVT_FLOAT(0.0)) - EVT_CALL(SetNpcAnimation, NPC_Bowser_Main, ANIM_WorldBowser_ClownCarStill) + EVT_CALL(SetNpcAnimation, NPC_Bowser_Body, ANIM_WorldBowser_ClownCarStill) EVT_THREAD EVT_CALL(N(AnimBowser_FlyOff)) EVT_END_THREAD diff --git a/src/world/area_hos/hos_05/hos_05_7_model_fx.c b/src/world/area_hos/hos_05/hos_05_7_model_fx.c index 1802037ec3..a0c4438a9e 100644 --- a/src/world/area_hos/hos_05/hos_05_7_model_fx.c +++ b/src/world/area_hos/hos_05/hos_05_7_model_fx.c @@ -9,7 +9,6 @@ MAP_RODATA_PAD(1,unk); #define NAME_SUFFIX _Starship #include "world/common/atomic/UnkFunc27.inc.c" #include "world/common/atomic/TexturePan.inc.c" -#include "world/common/atomic/TexturePan.data.inc.c" API_CALLABLE(N(SetWorldColorParams)) { Bytecode* args; diff --git a/src/world/area_hos/hos_06/hos_06.h b/src/world/area_hos/hos_06/hos_06.h index b992b7095c..62036fc1c7 100644 --- a/src/world/area_hos/hos_06/hos_06.h +++ b/src/world/area_hos/hos_06/hos_06.h @@ -15,16 +15,16 @@ #define MERLOW_BADGE_COUNT 15 enum { - NPC_Merluvlee = 0, - NPC_Merlow = 1, + NPC_Merluvlee = 0, + NPC_Merlow = 1, }; enum { - MV_RitualFXArrayPtr = MapVar(10), + MV_RitualFXArrayPtr = MapVar(10), }; enum { - MF_PurchasedBadge = MapFlag(0), + MF_PurchasedBadge = MapFlag(0), }; #define NAMESPACE hos_06 diff --git a/src/world/area_hos/hos_06/hos_06_2_main.c b/src/world/area_hos/hos_06/hos_06_2_main.c index fbcf92ae55..1871327484 100644 --- a/src/world/area_hos/hos_06/hos_06_2_main.c +++ b/src/world/area_hos/hos_06/hos_06_2_main.c @@ -1,7 +1,6 @@ #include "hos_06.h" #include "world/common/atomic/TexturePan.inc.c" -#include "world/common/atomic/TexturePan.data.inc.c" EvtScript N(EVS_TexPan_MysticPyramid) = { EVT_CALL(EnableTexPanning, MODEL_o185, TRUE) diff --git a/src/world/area_hos/hos_06/hos_06_3_merlow.c b/src/world/area_hos/hos_06/hos_06_3_merlow.c index 6cbd876786..8e0dcf0702 100644 --- a/src/world/area_hos/hos_06/hos_06_3_merlow.c +++ b/src/world/area_hos/hos_06/hos_06_3_merlow.c @@ -252,15 +252,15 @@ EvtScript N(EVS_NpcInit_Merlow) = { EVT_END }; -StaticNpc N(NpcData_Merluvlee)[] = { +NpcData N(NpcData_Merluvlee)[] = { { .id = NPC_Merluvlee, - .settings = &N(NpcSettings_Merluvlee), .pos = { 62.0f, 20.0f, 7.0f }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_Merluvlee_Passthrough), - .drops = NPC_NO_DROPS, + .settings = &N(NpcSettings_Merluvlee), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = NO_DROPS, .animations = { .idle = ANIM_Merluvlee_Idle, }, @@ -268,12 +268,12 @@ StaticNpc N(NpcData_Merluvlee)[] = { }, { .id = NPC_Merlow, - .settings = &N(NpcSettings_Merlow), .pos = { -150.0f, 160.0f, -25.0f }, .yaw = 0, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_Merlow), - .drops = NPC_NO_DROPS, + .settings = &N(NpcSettings_Merlow), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = NO_DROPS, .animations = { .idle = ANIM_Merlow_Idle, }, diff --git a/src/world/area_hos/hos_06/hos_06_6_chest.c b/src/world/area_hos/hos_06/hos_06_6_chest.c index 676fbe9f87..68cd6cdb03 100644 --- a/src/world/area_hos/hos_06/hos_06_6_chest.c +++ b/src/world/area_hos/hos_06/hos_06_6_chest.c @@ -45,7 +45,6 @@ API_CALLABLE(N(ChestItemPrompt)) { PopupMenu *menu; s32 menuIdx; s32 selectIdx; - s32 temp; s32 canUseItem; s32 itemUsedBefore; s32 i; @@ -53,10 +52,10 @@ API_CALLABLE(N(ChestItemPrompt)) { if (isInitialCall) { menu = heap_malloc(sizeof(*menu)); script->functionTempPtr[2] = menu; - temp = script->varTable[0]; script->varTable[10] = script->varTable[0]; - if (temp == 0) { + // NOTE: identical to ChestItemPrompt in kkj_17 EXCEPT here, where varTable[10] is required instead of varTable[0] + if (script->varTable[10] == 0) { // storing items script->varTable[1] = GF_KKJ16_Item_PowerRush; script->varTable[2] = GF_KKJ_Stored_PowerRush; @@ -179,7 +178,7 @@ EvtScript N(EVS_CloseChest) = { EVT_END }; -EvtScript N(EVS_Interact_MagicChest) = { +EvtScript N(EVS_Interact_MagicChest_Mario) = { EVT_CALL(DisablePlayerInput, TRUE) EVT_EXEC_WAIT(N(EVS_OpenChest)) EVT_SET(LVar0, 1) @@ -215,7 +214,7 @@ EvtScript N(EVS_Interact_MagicChest) = { }; EvtScript N(EVS_SetupMagicChest) = { - EVT_BIND_TRIGGER(EVT_PTR(N(EVS_Interact_MagicChest)), TRIGGER_WALL_PRESS_A, COLLIDER_o207, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_Interact_MagicChest_Mario)), TRIGGER_WALL_PRESS_A, COLLIDER_o207, 1, 0) EVT_RETURN EVT_END }; diff --git a/src/world/area_hos/hos_10/hos_10.h b/src/world/area_hos/hos_10/hos_10.h index af14527d95..3210d3d6eb 100644 --- a/src/world/area_hos/hos_10/hos_10.h +++ b/src/world/area_hos/hos_10/hos_10.h @@ -12,20 +12,20 @@ #include "sprite/npc/Twink.h" enum { - NPC_Peach = 0, - NPC_Twink = 1, - NPC_Eldstar = 2, - NPC_Mamar = 3, - NPC_Skolar = 4, - NPC_Muskular = 5, - NPC_Misstar = 6, - NPC_Klevar = 7, - NPC_Kalmar = 8, + NPC_Peach = 0, + NPC_Twink = 1, + NPC_Eldstar = 2, + NPC_Mamar = 3, + NPC_Skolar = 4, + NPC_Muskular = 5, + NPC_Misstar = 6, + NPC_Klevar = 7, + NPC_Kalmar = 8, }; enum { - MV_BubbleFXPtr = MapVar(0), - MV_Unk_01 = MapVar(1), + MV_BubbleFXPtr = MapVar(0), + MV_Unk_01 = MapVar(1), }; #define NAMESPACE hos_10 diff --git a/src/world/area_hos/hos_10/hos_10_2_npc1.c b/src/world/area_hos/hos_10/hos_10_2_npc1.c index 7a829a4345..1f690b08a7 100644 --- a/src/world/area_hos/hos_10/hos_10_2_npc1.c +++ b/src/world/area_hos/hos_10/hos_10_2_npc1.c @@ -65,73 +65,73 @@ EvtScript N(EVS_NpcInit_Kalmar) = { EVT_END }; -s32 N(ExtraAnims_Peach)[] = { +AnimID N(ExtraAnims_Peach)[] = { ANIM_Peach_A0001, ANIM_Peach_A0002, ANIM_Peach_C0000, ANIM_Peach_C0006, ANIM_Peach_C001E, ANIM_Peach_C0026, - -1 + ANIM_LIST_END }; -s32 N(ExtraAnims_Twink)[] = { +AnimID N(ExtraAnims_Twink)[] = { ANIM_Twink_Idle, ANIM_Twink_Talk, - -1 + ANIM_LIST_END }; -s32 N(ExtraAnims_Eldstar)[] = { +AnimID N(ExtraAnims_Eldstar)[] = { ANIM_WorldEldstar_Idle, ANIM_WorldEldstar_Wave, - -1 + ANIM_LIST_END }; -s32 N(ExtraAnims_Mamar)[] = { +AnimID N(ExtraAnims_Mamar)[] = { ANIM_WorldMamar_Idle, ANIM_WorldMamar_TalkHappy, - -1 + ANIM_LIST_END }; -s32 N(ExtraAnims_Skolar)[] = { +AnimID N(ExtraAnims_Skolar)[] = { ANIM_WorldSkolar_Idle, ANIM_WorldSkolar_TalkAngry, - -1 + ANIM_LIST_END }; -s32 N(ExtraAnims_Muskular)[] = { +AnimID N(ExtraAnims_Muskular)[] = { ANIM_WorldMuskular_Idle, ANIM_WorldMuskular_Talk, - -1 + ANIM_LIST_END }; -s32 N(ExtraAnims_Misstar)[] = { +AnimID N(ExtraAnims_Misstar)[] = { ANIM_WorldMisstar_Idle, ANIM_WorldMisstar_Talk, - -1 + ANIM_LIST_END }; -s32 N(ExtraAnims_Klevar)[] = { +AnimID N(ExtraAnims_Klevar)[] = { ANIM_WorldKlevar_Idle, ANIM_WorldKlevar_Talk, - -1 + ANIM_LIST_END }; -s32 N(ExtraAnims_Kalmar)[] = { +AnimID N(ExtraAnims_Kalmar)[] = { ANIM_WorldKalmar_Idle, ANIM_WorldKalmar_Talk, - -1 + ANIM_LIST_END }; -StaticNpc N(NpcData_Spirits)[] = { +NpcData N(NpcData_Spirits)[] = { { .id = NPC_Peach, - .settings = &N(NpcSettings_Dummy), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_20000, .init = &N(EVS_NpcInit_Peach), - .drops = NPC_NO_DROPS, + .settings = &N(NpcSettings_Dummy), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_20000, + .drops = NO_DROPS, .animations = { .idle = ANIM_Peach_A0000, .walk = ANIM_Peach_A0000, @@ -154,89 +154,89 @@ StaticNpc N(NpcData_Spirits)[] = { }, { .id = NPC_Twink, - .settings = &N(NpcSettings_Dummy), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_Twink), - .drops = NPC_NO_DROPS, + .settings = &N(NpcSettings_Dummy), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = NO_DROPS, .animations = TWINK_ANIMS, .extraAnimations = N(ExtraAnims_Twink), }, { .id = NPC_Eldstar, - .settings = &N(NpcSettings_StarSpirit), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_Eldstar), - .drops = NPC_NO_DROPS, + .settings = &N(NpcSettings_StarSpirit), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = NO_DROPS, .animations = ELDSTAR_ANIMS, .extraAnimations = N(ExtraAnims_Eldstar), }, { .id = NPC_Mamar, - .settings = &N(NpcSettings_StarSpirit), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_Mamar), - .drops = NPC_NO_DROPS, + .settings = &N(NpcSettings_StarSpirit), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = NO_DROPS, .animations = MAMAR_ANIMS, .extraAnimations = N(ExtraAnims_Mamar), }, { .id = NPC_Skolar, - .settings = &N(NpcSettings_StarSpirit), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 90, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_Skolar), - .drops = NPC_NO_DROPS, + .settings = &N(NpcSettings_StarSpirit), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = NO_DROPS, .animations = SKOLAR_ANIMS, .extraAnimations = N(ExtraAnims_Skolar), }, { .id = NPC_Muskular, - .settings = &N(NpcSettings_StarSpirit), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_Muskular), - .drops = NPC_NO_DROPS, + .settings = &N(NpcSettings_StarSpirit), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = NO_DROPS, .animations = MUSKULAR_ANIMS, .extraAnimations = N(ExtraAnims_Muskular), }, { .id = NPC_Misstar, - .settings = &N(NpcSettings_StarSpirit), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 90, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_Misstar), - .drops = NPC_NO_DROPS, + .settings = &N(NpcSettings_StarSpirit), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = NO_DROPS, .animations = MISSTAR_ANIMS, .extraAnimations = N(ExtraAnims_Misstar), }, { .id = NPC_Klevar, - .settings = &N(NpcSettings_StarSpirit), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_Klevar), - .drops = NPC_NO_DROPS, + .settings = &N(NpcSettings_StarSpirit), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = NO_DROPS, .animations = KLEVAR_ANIMS, .extraAnimations = N(ExtraAnims_Klevar), }, { .id = NPC_Kalmar, - .settings = &N(NpcSettings_StarSpirit), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 90, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_Kalmar), - .drops = NPC_NO_DROPS, + .settings = &N(NpcSettings_StarSpirit), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = NO_DROPS, .animations = KALMAR_ANIMS, .extraAnimations = N(ExtraAnims_Kalmar), }, diff --git a/src/world/area_hos/hos_10/hos_10_3_npc2.c b/src/world/area_hos/hos_10/hos_10_3_npc2.c index 006eb3daa6..2a677f5af4 100644 --- a/src/world/area_hos/hos_10/hos_10_3_npc2.c +++ b/src/world/area_hos/hos_10/hos_10_3_npc2.c @@ -60,141 +60,141 @@ EvtScript N(EVS_NpcInit_Kalmar) = { EVT_END }; -s32 N(ExtraAnims_Twink)[] = { +AnimID N(ExtraAnims_Twink)[] = { ANIM_Twink_Idle, ANIM_Twink_Talk, ANIM_Twink_Back, - -1 + ANIM_LIST_END }; -s32 N(ExtraAnims_Eldstar)[] = { +AnimID N(ExtraAnims_Eldstar)[] = { ANIM_WorldEldstar_Idle, ANIM_WorldEldstar_Wave, - -1 + ANIM_LIST_END }; -s32 N(ExtraAnims_Mamar)[] = { +AnimID N(ExtraAnims_Mamar)[] = { ANIM_WorldMamar_Idle, ANIM_WorldMamar_TalkHappy, - -1 + ANIM_LIST_END }; -s32 N(ExtraAnims_Skolar)[] = { +AnimID N(ExtraAnims_Skolar)[] = { ANIM_WorldSkolar_Idle, ANIM_WorldSkolar_TalkAngry, - -1 + ANIM_LIST_END }; -s32 N(ExtraAnims_Muskular)[] = { +AnimID N(ExtraAnims_Muskular)[] = { ANIM_WorldMuskular_Idle, ANIM_WorldMuskular_Talk, - -1 + ANIM_LIST_END }; -s32 N(ExtraAnims_Misstar)[] = { +AnimID N(ExtraAnims_Misstar)[] = { ANIM_WorldMisstar_Idle, ANIM_WorldMisstar_Talk, - -1 + ANIM_LIST_END }; -s32 N(ExtraAnims_Klevar)[] = { +AnimID N(ExtraAnims_Klevar)[] = { ANIM_WorldKlevar_Idle, ANIM_WorldKlevar_Talk, - -1 + ANIM_LIST_END }; -s32 N(ExtraAnims_Kalmar)[] = { +AnimID N(ExtraAnims_Kalmar)[] = { ANIM_WorldKalmar_Idle, ANIM_WorldKalmar_Talk, - -1 + ANIM_LIST_END }; -StaticNpc N(NpcData_Spirits)[] = { +NpcData N(NpcData_Spirits)[] = { { .id = NPC_Twink, - .settings = &N(NpcSettings_Dummy), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_Twink), - .drops = NPC_NO_DROPS, + .settings = &N(NpcSettings_Dummy), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = NO_DROPS, .animations = TWINK_ANIMS, .extraAnimations = N(ExtraAnims_Twink), }, { .id = NPC_Eldstar, - .settings = &N(NpcSettings_StarSpirit), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_Eldstar), - .drops = NPC_NO_DROPS, + .settings = &N(NpcSettings_StarSpirit), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = NO_DROPS, .animations = ELDSTAR_ANIMS, .extraAnimations = N(ExtraAnims_Eldstar), }, { .id = NPC_Mamar, - .settings = &N(NpcSettings_StarSpirit), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_Mamar), - .drops = NPC_NO_DROPS, + .settings = &N(NpcSettings_StarSpirit), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = NO_DROPS, .animations = MAMAR_ANIMS, .extraAnimations = N(ExtraAnims_Mamar), }, { .id = NPC_Skolar, - .settings = &N(NpcSettings_StarSpirit), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 90, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_Skolar), - .drops = NPC_NO_DROPS, + .settings = &N(NpcSettings_StarSpirit), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = NO_DROPS, .animations = SKOLAR_ANIMS, .extraAnimations = N(ExtraAnims_Skolar), }, { .id = NPC_Muskular, - .settings = &N(NpcSettings_StarSpirit), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_Muskular), - .drops = NPC_NO_DROPS, + .settings = &N(NpcSettings_StarSpirit), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = NO_DROPS, .animations = MUSKULAR_ANIMS, .extraAnimations = N(ExtraAnims_Muskular), }, { .id = NPC_Misstar, - .settings = &N(NpcSettings_StarSpirit), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 90, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_Misstar), - .drops = NPC_NO_DROPS, + .settings = &N(NpcSettings_StarSpirit), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = NO_DROPS, .animations = MISSTAR_ANIMS, .extraAnimations = N(ExtraAnims_Misstar), }, { .id = NPC_Klevar, - .settings = &N(NpcSettings_StarSpirit), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_Klevar), - .drops = NPC_NO_DROPS, + .settings = &N(NpcSettings_StarSpirit), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = NO_DROPS, .animations = KLEVAR_ANIMS, .extraAnimations = N(ExtraAnims_Klevar), }, { .id = NPC_Kalmar, - .settings = &N(NpcSettings_StarSpirit), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 90, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_Kalmar), - .drops = NPC_NO_DROPS, + .settings = &N(NpcSettings_StarSpirit), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = NO_DROPS, .animations = KALMAR_ANIMS, .extraAnimations = N(ExtraAnims_Kalmar), }, diff --git a/src/world/area_hos/hos_10/hos_10_5_intro.c b/src/world/area_hos/hos_10/hos_10_5_intro.c index 0219641a40..2d328ffa7a 100644 --- a/src/world/area_hos/hos_10/hos_10_5_intro.c +++ b/src/world/area_hos/hos_10/hos_10_5_intro.c @@ -2,7 +2,6 @@ #include "effects.h" #include "world/common/atomic/TexturePan.inc.c" -#include "world/common/atomic/TexturePan.data.inc.c" API_CALLABLE(N(ResumeIntroState)) { if ( diff --git a/src/world/area_hos/hos_10/hos_10_6_pre_title.c b/src/world/area_hos/hos_10/hos_10_6_pre_title.c index de69da7ee6..ae32b3df80 100644 --- a/src/world/area_hos/hos_10/hos_10_6_pre_title.c +++ b/src/world/area_hos/hos_10/hos_10_6_pre_title.c @@ -3,7 +3,6 @@ #define NAME_SUFFIX _PreTitle #include "world/common/atomic/TexturePan.inc.c" -#include "world/common/atomic/TexturePan.data.inc.c" #define NAME_SUFFIX EvtScript N(EVS_Scene_PreTitle) = { diff --git a/src/world/area_hos/hos_20/hos_20_1_main.c b/src/world/area_hos/hos_20/hos_20_1_main.c index 175d2098a4..751698b1b4 100644 --- a/src/world/area_hos/hos_20/hos_20_1_main.c +++ b/src/world/area_hos/hos_20/hos_20_1_main.c @@ -1,7 +1,6 @@ #include "hos_20.h" #include "world/common/atomic/TexturePan.inc.c" -#include "world/common/atomic/TexturePan.data.inc.c" EvtScript N(EVS_TexPan_MotionLines) = { EVT_SET_GROUP(EVT_GROUP_00) diff --git a/src/world/area_isk/isk.h b/src/world/area_isk/isk.h index 6cf1c82bea..315631cc3f 100644 --- a/src/world/area_isk/isk.h +++ b/src/world/area_isk/isk.h @@ -2,22 +2,22 @@ #define _WORLD_AREA_ISK_ISK_H_ enum { - AB_ISK_0 = AreaByte(0), - AB_ISK_1 = AreaByte(1), - AB_ISK_2 = AreaByte(2), - AB_ISK_3 = AreaByte(3), - AB_ISK_4 = AreaByte(4), - AB_ISK_5 = AreaByte(5), - AB_ISK_6 = AreaByte(6), - AB_ISK_7 = AreaByte(7), - AB_ISK_8 = AreaByte(8), - AB_ISK_9 = AreaByte(9), - AB_ISK_A = AreaByte(10), - AB_ISK_B = AreaByte(11), - AB_ISK_C = AreaByte(12), - AB_ISK_D = AreaByte(13), - AB_ISK_E = AreaByte(14), - AB_ISK_F = AreaByte(15), + AB_ISK_Unused_0 = AreaByte(0), + AB_ISK_Unused_1 = AreaByte(1), + AB_ISK_Unused_2 = AreaByte(2), + AB_ISK_Unused_3 = AreaByte(3), + AB_ISK_Unused_4 = AreaByte(4), + AB_ISK_Unused_5 = AreaByte(5), + AB_ISK_Unused_6 = AreaByte(6), + AB_ISK_Unused_7 = AreaByte(7), + AB_ISK_Unused_8 = AreaByte(8), + AB_ISK_Unused_9 = AreaByte(9), + AB_ISK_Unused_A = AreaByte(10), + AB_ISK_Unused_B = AreaByte(11), + AB_ISK_Unused_C = AreaByte(12), + AB_ISK_Unused_D = AreaByte(13), + AB_ISK_Unused_E = AreaByte(14), + AB_ISK_Unused_F = AreaByte(15), }; enum { diff --git a/src/world/area_isk/isk_02/isk_02_5_npc.c b/src/world/area_isk/isk_02/isk_02_5_npc.c index a683b6d0f8..32a945f7df 100644 --- a/src/world/area_isk/isk_02/isk_02_5_npc.c +++ b/src/world/area_isk/isk_02/isk_02_5_npc.c @@ -1,6 +1,6 @@ #include "isk_02.h" -#include "world/common/enemy/complete/PokeyMummy.inc.c" +#include "world/common/enemy/PokeyMummy.inc.c" EvtScript N(EVS_NpcIdle_Pokey_01) = { EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_100000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_10000000, 1) @@ -80,14 +80,10 @@ EvtScript N(EVS_NpcInit_Pokey_03) = { EVT_END }; -StaticNpc N(NpcData_Pokey_01) = { +NpcData N(NpcData_Pokey_01) = { .id = NPC_Pokey_01, - .settings = &N(NpcSettings_PokeyMummy), .pos = { -296.0f, 0.0f, 421.0f }, .yaw = 304, - .flags = ENEMY_FLAG_200 | ENEMY_FLAG_800, - .init = &N(EVS_NpcInit_Pokey_01), - .drops = POKEY_MUMMY_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -100,17 +96,17 @@ StaticNpc N(NpcData_Pokey_01) = { .detectSize = { 400 }, } }, + .init = &N(EVS_NpcInit_Pokey_01), + .settings = &N(NpcSettings_PokeyMummy), + .flags = ENEMY_FLAG_200 | ENEMY_FLAG_800, + .drops = POKEY_MUMMY_DROPS, .animations = POKEY_MUMMY_ANIMS, }; -StaticNpc N(NpcData_Pokey_02) = { +NpcData N(NpcData_Pokey_02) = { .id = NPC_Pokey_02, - .settings = &N(NpcSettings_PokeyMummy), .pos = { -133.0f, 0.0f, 497.0f }, .yaw = 284, - .flags = ENEMY_FLAG_200 | ENEMY_FLAG_800, - .init = &N(EVS_NpcInit_Pokey_02), - .drops = POKEY_MUMMY_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -123,17 +119,17 @@ StaticNpc N(NpcData_Pokey_02) = { .detectSize = { 400 }, } }, + .init = &N(EVS_NpcInit_Pokey_02), + .settings = &N(NpcSettings_PokeyMummy), + .flags = ENEMY_FLAG_200 | ENEMY_FLAG_800, + .drops = POKEY_MUMMY_DROPS, .animations = POKEY_MUMMY_ANIMS, }; -StaticNpc N(NpcData_Pokey_03) = { +NpcData N(NpcData_Pokey_03) = { .id = NPC_Pokey_03, - .settings = &N(NpcSettings_PokeyMummy), .pos = { 45.0f, 0.0f, 505.0f }, .yaw = 264, - .flags = ENEMY_FLAG_200 | ENEMY_FLAG_800, - .init = &N(EVS_NpcInit_Pokey_03), - .drops = POKEY_MUMMY_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -146,6 +142,10 @@ StaticNpc N(NpcData_Pokey_03) = { .detectSize = { 400 }, } }, + .init = &N(EVS_NpcInit_Pokey_03), + .settings = &N(NpcSettings_PokeyMummy), + .flags = ENEMY_FLAG_200 | ENEMY_FLAG_800, + .drops = POKEY_MUMMY_DROPS, .animations = POKEY_MUMMY_ANIMS, }; diff --git a/src/world/area_isk/isk_04/isk_04_2_main.c b/src/world/area_isk/isk_04/isk_04_2_main.c index ab11395d71..b2a0b6d7fe 100644 --- a/src/world/area_isk/isk_04/isk_04_2_main.c +++ b/src/world/area_isk/isk_04/isk_04_2_main.c @@ -28,7 +28,7 @@ EvtScript N(EVS_Main) = { EVT_CALL(SetSpriteShading, SHADING_ISK_04) EVT_SETUP_CAMERA_ALT_NO_LEAD() EVT_CALL(GetDemoState, LVar0) - EVT_IF_NE(LVar0, 0) + EVT_IF_NE(LVar0, DEMO_STATE_NONE) EVT_EXEC_WAIT(N(EVS_SetupObstructions)) EVT_EXEC_WAIT(N(EVS_SetupDemo)) EVT_RETURN diff --git a/src/world/area_isk/isk_04/isk_04_5_npc.c b/src/world/area_isk/isk_04/isk_04_5_npc.c index c6ad25ee5f..b5f91a7696 100644 --- a/src/world/area_isk/isk_04/isk_04_5_npc.c +++ b/src/world/area_isk/isk_04/isk_04_5_npc.c @@ -1,14 +1,11 @@ #include "isk_04.h" -#include "world/common/enemy/complete/SpikeTop.inc.c" +#include "world/common/enemy/SpikeTop.inc.c" -StaticNpc N(NpcData_BuzzyBeetle_01) = { +NpcData N(NpcData_BuzzyBeetle_01) = { .id = NPC_BuzzyBeetle_01, - .settings = &N(NpcSettings_BuzzyBeetle), .pos = { 561.0f, 25.0f, 47.0f }, .yaw = 355, - .flags = ENEMY_FLAG_400, - .drops = ISK_BUZZY_BEETLE_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -21,16 +18,16 @@ StaticNpc N(NpcData_BuzzyBeetle_01) = { .detectSize = { 80 }, } }, + .settings = &N(NpcSettings_BuzzyBeetle), + .flags = ENEMY_FLAG_400, + .drops = ISK_BUZZY_BEETLE_DROPS, .animations = BUZZY_BEETLE_ANIMS, }; -StaticNpc N(NpcData_BuzzyBeetle_02) = { +NpcData N(NpcData_BuzzyBeetle_02) = { .id = NPC_BuzzyBeetle_02, - .settings = &N(NpcSettings_BuzzyBeetle), .pos = { 608.0f, -260.0f, -158.0f }, .yaw = 175, - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, - .drops = ISK_BUZZY_BEETLE_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -43,6 +40,9 @@ StaticNpc N(NpcData_BuzzyBeetle_02) = { .detectSize = { 80 }, } }, + .settings = &N(NpcSettings_BuzzyBeetle), + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = ISK_BUZZY_BEETLE_DROPS, .animations = BUZZY_BEETLE_ANIMS, }; diff --git a/src/world/area_isk/isk_05/isk_05_3_npc.c b/src/world/area_isk/isk_05/isk_05_3_npc.c index 78f09b4b49..2b027e8d9b 100644 --- a/src/world/area_isk/isk_05/isk_05_3_npc.c +++ b/src/world/area_isk/isk_05/isk_05_3_npc.c @@ -1,7 +1,7 @@ #include "isk_05.h" #include "sprite.h" -#include "world/common/enemy/complete/StoneChomp.inc.c" +#include "world/common/enemy/StoneChomp.inc.c" typedef struct StoneChompAmbushIsk05 { /* 0x00 */ s32 foldID; @@ -267,16 +267,10 @@ EvtScript N(EVS_NpcInit_StoneChomp) = { EVT_END }; -StaticNpc N(NpcData_StoneChomp) = { +NpcData N(NpcData_StoneChomp) = { .id = NPC_StoneChomp, - .settings = &N(NpcSettings_StoneChomp), .pos = { 385.0f, 71.0f, -330.0f }, .yaw = 320, - .flags = ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_800 | ENEMY_FLAG_40000, - .init = &N(EVS_NpcInit_StoneChomp), - .initVarCount = 1, - .initVar = { .value = 0 }, - .drops = STONE_CHOMP_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -289,6 +283,12 @@ StaticNpc N(NpcData_StoneChomp) = { .detectSize = { 400 }, } }, + .init = &N(EVS_NpcInit_StoneChomp), + .initVarCount = 1, + .initVar = { .value = 0 }, + .settings = &N(NpcSettings_StoneChomp), + .flags = ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_800 | ENEMY_FLAG_40000, + .drops = STONE_CHOMP_DROPS, .animations = STONE_CHOMP_ANIMS, }; diff --git a/src/world/area_isk/isk_07/isk_07_3_npc.c b/src/world/area_isk/isk_07/isk_07_3_npc.c index 373efe9d8f..68d6caaef7 100644 --- a/src/world/area_isk/isk_07/isk_07_3_npc.c +++ b/src/world/area_isk/isk_07/isk_07_3_npc.c @@ -1,6 +1,6 @@ #include "isk_07.h" -#include "world/common/enemy/complete/PokeyMummy.inc.c" +#include "world/common/enemy/PokeyMummy.inc.c" API_CALLABLE(N(IsLastEnemy)) { EncounterStatus* encounterStatus = &gCurrentEncounter; @@ -172,14 +172,10 @@ EvtScript N(EVS_NpcInit_Pokey_03) = { EVT_END }; -StaticNpc N(NpcData_Pokey_01) = { +NpcData N(NpcData_Pokey_01) = { .id = NPC_Pokey_01, - .settings = &N(NpcSettings_PokeyMummy), .pos = { -132.0f, -390.0f, 492.0f }, .yaw = 304, - .flags = ENEMY_FLAG_200 | ENEMY_FLAG_800, - .init = &N(EVS_NpcInit_Pokey_01), - .drops = POKEY_MUMMY_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -192,17 +188,17 @@ StaticNpc N(NpcData_Pokey_01) = { .detectSize = { 400 }, } }, + .init = &N(EVS_NpcInit_Pokey_01), + .settings = &N(NpcSettings_PokeyMummy), + .flags = ENEMY_FLAG_200 | ENEMY_FLAG_800, + .drops = POKEY_MUMMY_DROPS, .animations = POKEY_MUMMY_ANIMS, }; -StaticNpc N(NpcData_Pokey_02) = { +NpcData N(NpcData_Pokey_02) = { .id = NPC_Pokey_02, - .settings = &N(NpcSettings_PokeyMummy), .pos = { 45.0f, -390.0f, 507.0f }, .yaw = 263, - .flags = ENEMY_FLAG_200 | ENEMY_FLAG_800, - .init = &N(EVS_NpcInit_Pokey_02), - .drops = POKEY_MUMMY_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -215,17 +211,17 @@ StaticNpc N(NpcData_Pokey_02) = { .detectSize = { 150 }, } }, + .init = &N(EVS_NpcInit_Pokey_02), + .settings = &N(NpcSettings_PokeyMummy), + .flags = ENEMY_FLAG_200 | ENEMY_FLAG_800, + .drops = POKEY_MUMMY_DROPS, .animations = POKEY_MUMMY_ANIMS, }; -StaticNpc N(NpcData_Pokey_03) = { +NpcData N(NpcData_Pokey_03) = { .id = NPC_Pokey_03, - .settings = &N(NpcSettings_PokeyMummy), .pos = { 220.0f, -389.0f, 467.0f }, .yaw = 244, - .flags = ENEMY_FLAG_200 | ENEMY_FLAG_800, - .init = &N(EVS_NpcInit_Pokey_03), - .drops = POKEY_MUMMY_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -238,6 +234,10 @@ StaticNpc N(NpcData_Pokey_03) = { .detectSize = { 150 }, } }, + .init = &N(EVS_NpcInit_Pokey_03), + .settings = &N(NpcSettings_PokeyMummy), + .flags = ENEMY_FLAG_200 | ENEMY_FLAG_800, + .drops = POKEY_MUMMY_DROPS, .animations = POKEY_MUMMY_ANIMS, }; diff --git a/src/world/area_isk/isk_08/isk_08_2_npc.c b/src/world/area_isk/isk_08/isk_08_2_npc.c index f7ad8c5c5e..732e61efb3 100644 --- a/src/world/area_isk/isk_08/isk_08_2_npc.c +++ b/src/world/area_isk/isk_08/isk_08_2_npc.c @@ -1,14 +1,11 @@ #include "isk_08.h" -#include "world/common/enemy/complete/SpikeTop.inc.c" +#include "world/common/enemy/SpikeTop.inc.c" -StaticNpc N(NpcData_BuzzyBeetle) = { +NpcData N(NpcData_BuzzyBeetle) = { .id = NPC_BuzzyBeetle, - .settings = &N(NpcSettings_BuzzyBeetle), .pos = { -415.0f, -520.0f, 355.0f }, .yaw = 0, - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, - .drops = ISK_BUZZY_BEETLE_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -21,6 +18,9 @@ StaticNpc N(NpcData_BuzzyBeetle) = { .detectSize = { 60 }, } }, + .settings = &N(NpcSettings_BuzzyBeetle), + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = ISK_BUZZY_BEETLE_DROPS, .animations = BUZZY_BEETLE_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, }; 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 172af13386..a55c2aed26 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 @@ -1,7 +1,7 @@ #include "isk_13.h" #include "sprite.h" -#include "world/common/enemy/complete/StoneChomp.inc.c" +#include "world/common/enemy/StoneChomp.inc.c" typedef struct StoneChompAmbushIsk13 { /* 0x00 */ s32 useBitingAnim; @@ -295,16 +295,10 @@ EvtScript N(EVS_NpcInit_StoneChomp) = { EVT_END }; -StaticNpc N(NpcData_StoneChomp) = { +NpcData N(NpcData_StoneChomp) = { .id = NPC_StoneChomp, - .settings = &N(NpcSettings_StoneChomp), .pos = { 440.0f, -470.0f, -300.0f }, .yaw = 320, - .flags = ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000, - .init = &N(EVS_NpcInit_StoneChomp), - .initVarCount = 1, - .initVar = { .value = -650 }, - .drops = STONE_CHOMP_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -317,6 +311,12 @@ StaticNpc N(NpcData_StoneChomp) = { .detectSize = { 400 }, } }, + .init = &N(EVS_NpcInit_StoneChomp), + .initVarCount = 1, + .initVar = { .value = -650 }, + .settings = &N(NpcSettings_StoneChomp), + .flags = ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000, + .drops = STONE_CHOMP_DROPS, .animations = STONE_CHOMP_ANIMS, }; diff --git a/src/world/area_isk/isk_14/isk_14_3_npc.c b/src/world/area_isk/isk_14/isk_14_3_npc.c index 40caf70544..ef2f6d5b5e 100644 --- a/src/world/area_isk/isk_14/isk_14_3_npc.c +++ b/src/world/area_isk/isk_14/isk_14_3_npc.c @@ -1,7 +1,7 @@ #include "isk_14.h" #include "sprite.h" -#include "world/common/enemy/complete/StoneChomp.inc.c" +#include "world/common/enemy/StoneChomp.inc.c" typedef struct StoneChompAmbushIsk14 { /* 0x00 */ s32 foldID; @@ -215,16 +215,10 @@ EvtScript N(EVS_NpcInit_StoneChomp) = { EVT_END }; -StaticNpc N(NpcData_StoneChomp) = { +NpcData N(NpcData_StoneChomp) = { .id = NPC_StoneChomp, - .settings = &N(NpcSettings_StoneChomp), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 218, - .flags = ENEMY_FLAG_100 | ENEMY_FLAG_800 | ENEMY_FLAG_40000, - .init = &N(EVS_NpcInit_StoneChomp), - .initVarCount = 1, - .initVar = { .value = -780 }, - .drops = STONE_CHOMP_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -237,6 +231,12 @@ StaticNpc N(NpcData_StoneChomp) = { .detectSize = { 400 }, } }, + .init = &N(EVS_NpcInit_StoneChomp), + .initVarCount = 1, + .initVar = { .value = -780 }, + .settings = &N(NpcSettings_StoneChomp), + .flags = ENEMY_FLAG_100 | ENEMY_FLAG_800 | ENEMY_FLAG_40000, + .drops = STONE_CHOMP_DROPS, .animations = STONE_CHOMP_ANIMS, }; diff --git a/src/world/area_isk/isk_16/isk_16.h b/src/world/area_isk/isk_16/isk_16.h index f041fd64b3..62d07fbf2b 100644 --- a/src/world/area_isk/isk_16/isk_16.h +++ b/src/world/area_isk/isk_16/isk_16.h @@ -18,6 +18,10 @@ enum { NPC_ChainChomp = 2, }; +enum { + MV_Unk_01 = MapVar(1), +}; + #define NAMESPACE isk_16 extern EvtScript N(EVS_Main); diff --git a/src/world/area_isk/isk_16/isk_16_1_main.c b/src/world/area_isk/isk_16/isk_16_1_main.c index a813f7391c..5e5f7c0a57 100644 --- a/src/world/area_isk/isk_16/isk_16_1_main.c +++ b/src/world/area_isk/isk_16/isk_16_1_main.c @@ -1,5 +1,6 @@ #include "isk_16.h" +#define STAR_SPIRIT_DATA_VAR MV_Unk_01 #include "world/common/todo/StarSpiritEffectFunc.inc.c" EvtScript N(EVS_SpawnStarCard) = { diff --git a/src/world/area_isk/isk_16/isk_16_2_npc.c b/src/world/area_isk/isk_16/isk_16_2_npc.c index 7cab0738e2..23575d15e8 100644 --- a/src/world/area_isk/isk_16/isk_16_2_npc.c +++ b/src/world/area_isk/isk_16/isk_16_2_npc.c @@ -16,7 +16,7 @@ EvtScript N(EVS_NpcDefeat_Tutankoopa_01) = { EVT_CALL(GetBattleOutcome, LVar0) EVT_SWITCH(LVar0) EVT_CASE_EQ(OUTCOME_PLAYER_WON) - EVT_CALL(SetEncounterStatusFlags, 1, TRUE) + EVT_CALL(SetEncounterStatusFlags, ENCOUNTER_STATUS_FLAG_1, TRUE) EVT_CALL(InterpPlayerYaw, 90, 0) EVT_EXEC_WAIT(N(EVS_Scene_TutankoopaDefeated)) EVT_EXEC(N(EVS_SpawnStarCard)) @@ -63,21 +63,17 @@ NpcSettings N(NpcSettings_Tutankoopa_02) = { .radius = 36, }; -StaticNpc N(NpcData_Tutankoopa)[] = { +NpcData N(NpcData_Tutankoopa)[] = { { .id = NPC_Tutankoopa_01, - .settings = &N(NpcSettings_Tutankoopa_01), .pos = { 457.0f, -1300.0f, 316.0f }, .yaw = 230, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_200 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_Tutankoopa_01), .initVarCount = 1, .initVar = { .value = 0 }, - .drops = { - .dropFlags = NPC_DROP_FLAG_80, - .heartDrops = NO_DROPS, - .flowerDrops = NO_DROPS, - }, + .settings = &N(NpcSettings_Tutankoopa_01), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_200 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_400000, + .drops = NO_DROPS, .animations = { .idle = ANIM_Tutankoopa_Anim01, .walk = ANIM_Tutankoopa_Anim01, @@ -99,15 +95,11 @@ StaticNpc N(NpcData_Tutankoopa)[] = { }, { .id = NPC_Tutankoopa_02, - .settings = &N(NpcSettings_Tutankoopa_02), .pos = { 500.0f, -1300.0f, 316.0f }, .yaw = 230, + .settings = &N(NpcSettings_Tutankoopa_02), .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_200 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_400000, - .drops = { - .dropFlags = NPC_DROP_FLAG_80, - .heartDrops = NO_DROPS, - .flowerDrops = NO_DROPS, - }, + .drops = NO_DROPS, .animations = { .idle = ANIM_Tutankoopa_Anim01, .walk = ANIM_Tutankoopa_Anim01, @@ -129,18 +121,14 @@ StaticNpc N(NpcData_Tutankoopa)[] = { }, }; -StaticNpc N(NpcData_ChainChomp) = { +NpcData N(NpcData_ChainChomp) = { .id = NPC_ChainChomp, - .settings = &N(NpcSettings_ChainChomp), .pos = { 457.0f, -1300.0f, 316.0f }, .yaw = 230, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_200 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_ChainChomp), - .drops = { - .dropFlags = NPC_DROP_FLAG_80, - .heartDrops = NO_DROPS, - .flowerDrops = NO_DROPS, - }, + .settings = &N(NpcSettings_ChainChomp), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_200 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_400000, + .drops = NO_DROPS, .animations = { .idle = ANIM_ChainChomp_Anim00, .walk = ANIM_ChainChomp_Anim00, diff --git a/src/world/area_isk/isk_18/isk_18_2_npc.c b/src/world/area_isk/isk_18/isk_18_2_npc.c index afe28cf088..9a69c090af 100644 --- a/src/world/area_isk/isk_18/isk_18_2_npc.c +++ b/src/world/area_isk/isk_18/isk_18_2_npc.c @@ -1,16 +1,11 @@ #include "isk_18.h" -#include "world/common/enemy/complete/SpikeTop.inc.c" +#include "world/common/enemy/SpikeTop.inc.c" -StaticNpc N(NpcData_BuzzyBeetle_01) = { +NpcData N(NpcData_BuzzyBeetle_01) = { .id = NPC_BuzzyBeetle_01, - .settings = &N(NpcSettings_BuzzyBeetle_Ceiling), .pos = { -372.0f, -700.0f, 439.0f }, .yaw = 0, - .flags = ENEMY_FLAG_400, - .initVarCount = 1, - .initVar = { .value = BTL_ISK_PART_1_FORMATION_0E }, - .drops = ISK_BUZZY_BEETLE_DROPS, .territory = { .wander = { .isFlying = FALSE, @@ -23,18 +18,18 @@ StaticNpc N(NpcData_BuzzyBeetle_01) = { .detectSize = { 200 }, } }, + .initVarCount = 1, + .initVar = { .value = BTL_ISK_PART_1_FORMATION_0E }, + .settings = &N(NpcSettings_BuzzyBeetle_Ceiling), + .flags = ENEMY_FLAG_400, + .drops = ISK_BUZZY_BEETLE_DROPS, .animations = BUZZY_BEETLE_ANIMS, }; -StaticNpc N(NpcData_BuzzyBeetle_02) = { +NpcData N(NpcData_BuzzyBeetle_02) = { .id = NPC_BuzzyBeetle_02, - .settings = &N(NpcSettings_BuzzyBeetle_Ceiling), .pos = { -58.0f, -700.0f, 591.0f }, .yaw = 0, - .flags = ENEMY_FLAG_400, - .initVarCount = 1, - .initVar = { .value = BTL_ISK_PART_1_FORMATION_0B }, - .drops = ISK_BUZZY_BEETLE_DROPS, .territory = { .wander = { .isFlying = FALSE, @@ -47,16 +42,18 @@ StaticNpc N(NpcData_BuzzyBeetle_02) = { .detectSize = { 200 }, } }, + .initVarCount = 1, + .initVar = { .value = BTL_ISK_PART_1_FORMATION_0B }, + .settings = &N(NpcSettings_BuzzyBeetle_Ceiling), + .flags = ENEMY_FLAG_400, + .drops = ISK_BUZZY_BEETLE_DROPS, .animations = BUZZY_BEETLE_ANIMS, }; -StaticNpc N(NpcData_BuzzyBeetle_03) = { +NpcData N(NpcData_BuzzyBeetle_03) = { .id = NPC_BuzzyBeetle_03, - .settings = &N(NpcSettings_BuzzyBeetle), .pos = { 292.0f, -780.0f, 488.0f }, .yaw = 0, - .flags = ENEMY_FLAG_400, - .drops = ISK_BUZZY_BEETLE_DROPS, .territory = { .wander = { .isFlying = FALSE, @@ -69,6 +66,9 @@ StaticNpc N(NpcData_BuzzyBeetle_03) = { .detectSize = { 200 }, } }, + .settings = &N(NpcSettings_BuzzyBeetle), + .flags = ENEMY_FLAG_400, + .drops = ISK_BUZZY_BEETLE_DROPS, .animations = BUZZY_BEETLE_ANIMS, }; diff --git a/src/world/area_iwa/iwa.h b/src/world/area_iwa/iwa.h index 04ccfda78f..aca68c6c73 100644 --- a/src/world/area_iwa/iwa.h +++ b/src/world/area_iwa/iwa.h @@ -2,22 +2,22 @@ #define _WORLD_AREA_IWA_IWA_H_ enum { - AB_IWA_0 = AreaByte(0), - AB_IWA_1 = AreaByte(1), - AB_IWA_2 = AreaByte(2), - AB_IWA_3 = AreaByte(3), - AB_IWA_4 = AreaByte(4), - AB_IWA_5 = AreaByte(5), - AB_IWA_6 = AreaByte(6), - AB_IWA_7 = AreaByte(7), - AB_IWA_8 = AreaByte(8), - AB_IWA_9 = AreaByte(9), - AB_IWA_A = AreaByte(10), - AB_IWA_B = AreaByte(11), - AB_IWA_C = AreaByte(12), - AB_IWA_D = AreaByte(13), - AB_IWA_E = AreaByte(14), - AB_IWA_F = AreaByte(15), + AB_IWA_Unused_0 = AreaByte(0), + AB_IWA_Unused_1 = AreaByte(1), + AB_IWA_Unused_2 = AreaByte(2), + AB_IWA_Unused_3 = AreaByte(3), + AB_IWA_Unused_4 = AreaByte(4), + AB_IWA_Unused_5 = AreaByte(5), + AB_IWA_Unused_6 = AreaByte(6), + AB_IWA_Unused_7 = AreaByte(7), + AB_IWA_Unused_8 = AreaByte(8), + AB_IWA_Unused_9 = AreaByte(9), + AB_IWA_Unused_A = AreaByte(10), + AB_IWA_Unused_B = AreaByte(11), + AB_IWA_Unused_C = AreaByte(12), + AB_IWA_Unused_D = AreaByte(13), + AB_IWA_Unused_E = AreaByte(14), + AB_IWA_Unused_F = AreaByte(15), }; enum { diff --git a/src/world/area_iwa/iwa_00/iwa_00_3_npc.c b/src/world/area_iwa/iwa_00/iwa_00_3_npc.c index f331672876..274b287632 100644 --- a/src/world/area_iwa/iwa_00/iwa_00_3_npc.c +++ b/src/world/area_iwa/iwa_00/iwa_00_3_npc.c @@ -1,9 +1,9 @@ #include "iwa_00.h" #include "effects.h" -#include "world/common/enemy/complete/MontyMole_GroundAmbush.inc.c" -#include "world/common/enemy/complete/MontyMole_WallAmbush.inc.c" -#include "world/common/enemy/complete/Whacka.inc.c" +#include "world/common/enemy/MontyMole_GroundAmbush.inc.c" +#include "world/common/enemy/MontyMole_WallAmbush.inc.c" +#include "world/common/enemy/Whacka.inc.c" #include "world/common/complete/GiveReward.inc.c" @@ -43,14 +43,11 @@ API_CALLABLE(N(func_80240118_90CD58)) { } } -StaticNpc N(NpcData_MontyMole_GroundAmbush)[] = { +NpcData N(NpcData_MontyMole_GroundAmbush)[] = { { .id = NPC_MontyMole_01, - .settings = &N(NpcSettings_MontyMole_GroundAmbush), .pos = { 880.0f, 70.0f, 67.0f }, .yaw = 0, - .flags = ENEMY_FLAG_400, - .drops = MONTY_MOLE_DROPS, .territory = { .wander = { .isFlying = FALSE, @@ -63,20 +60,16 @@ StaticNpc N(NpcData_MontyMole_GroundAmbush)[] = { .detectSize = { 120 }, } }, + .settings = &N(NpcSettings_MontyMole_GroundAmbush), + .flags = ENEMY_FLAG_400, + .drops = MONTY_MOLE_DROPS, .animations = MONTY_MOLE_AMBUSH_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, }, { .id = NPC_MontyMole_01_Hole, - .settings = &N(NpcSettings_MontyMole_GroundAmbush_Hole), .pos = { 880.0f, 70.0f, 67.0f }, .yaw = 0, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DISABLE_AI | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, - .drops = { - .dropFlags = NPC_DROP_FLAG_80, - .heartDrops = NO_DROPS, - .flowerDrops = NO_DROPS, - }, .territory = { .wander = { .isFlying = TRUE, @@ -89,18 +82,18 @@ StaticNpc N(NpcData_MontyMole_GroundAmbush)[] = { .detectSize = { 0 }, } }, + .settings = &N(NpcSettings_MontyMole_GroundAmbush_Hole), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DISABLE_AI | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = NO_DROPS, .animations = MONTY_MOLE_AMBUSH_ANIMS, }, }; -StaticNpc N(NpcData_MontyMole_WallAmbush)[] = { +NpcData N(NpcData_MontyMole_WallAmbush)[] = { { .id = NPC_MontyMole_02, - .settings = &N(NpcSettings_MontyMole_WallAmbush), .pos = { 1220.0f, -30.0f, 70.0f }, .yaw = 0, - .flags = ENEMY_FLAG_400, - .drops = MONTY_MOLE_DROPS, .territory = { .wander = { .isFlying = FALSE, @@ -113,20 +106,16 @@ StaticNpc N(NpcData_MontyMole_WallAmbush)[] = { .detectSize = { 120 }, } }, + .settings = &N(NpcSettings_MontyMole_WallAmbush), + .flags = ENEMY_FLAG_400, + .drops = MONTY_MOLE_DROPS, .animations = MONTY_MOLE_AMBUSH_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, }, { .id = NPC_MontyMole_02_Hole, - .settings = &N(NpcSettings_MontyMole_WallAmbush_Hole), .pos = { 1220.0f, -30.0f, 70.0f }, .yaw = 0, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DISABLE_AI | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, - .drops = { - .dropFlags = NPC_DROP_FLAG_80, - .heartDrops = NO_DROPS, - .flowerDrops = NO_DROPS, - }, .territory = { .wander = { .isFlying = TRUE, @@ -139,6 +128,9 @@ StaticNpc N(NpcData_MontyMole_WallAmbush)[] = { .detectSize = { 0 }, } }, + .settings = &N(NpcSettings_MontyMole_WallAmbush_Hole), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DISABLE_AI | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = NO_DROPS, .animations = MONTY_MOLE_AMBUSH_ANIMS, }, }; @@ -342,26 +334,26 @@ EvtScript N(EVS_NpcInit_Whacka_02) = { EVT_END }; -StaticNpc N(NpcData_Whacka)[] = { +NpcData N(NpcData_Whacka)[] = { { .id = NPC_Whacka_01, - .settings = &N(NpcSettings_Whacka), .pos = { 725.0f, -30.0f, 225.0f }, .yaw = 90, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_Whacka_01), - .drops = WHACKA_DROPS, + .settings = &N(NpcSettings_Whacka), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_400000, + .drops = NO_DROPS, .animations = WHACKA_ANIMS, .tattle = MSG_NpcTattle_Whacka, }, { .id = NPC_Whacka_02, - .settings = &N(NpcSettings_Whacka), .pos = { 725.0f, -30.0f, 225.0f }, .yaw = 90, - .flags = ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_4000 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, .init = &N(EVS_NpcInit_Whacka_02), - .drops = WHACKA_DROPS, + .settings = &N(NpcSettings_Whacka), + .flags = ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_4000 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, + .drops = NO_DROPS, .animations = WHACKA_ANIMS, .tattle = MSG_NpcTattle_Whacka, }, diff --git a/src/world/area_iwa/iwa_01/iwa_01_4_npc.c b/src/world/area_iwa/iwa_01/iwa_01_4_npc.c index 64e13fd0d7..61f79a7999 100644 --- a/src/world/area_iwa/iwa_01/iwa_01_4_npc.c +++ b/src/world/area_iwa/iwa_01/iwa_01_4_npc.c @@ -1,18 +1,15 @@ #include "iwa_01.h" -#include "world/common/enemy/complete/MontyMole_StoneThrower.inc.c" -#include "world/common/enemy/complete/MontyMole_GroundAmbush.inc.c" -#include "world/common/enemy/complete/MontyMole_WallAmbush.inc.c" -#include "world/common/enemy/complete/Cleft.inc.c" +#include "world/common/enemy/MontyMole_StoneThrower.inc.c" +#include "world/common/enemy/MontyMole_GroundAmbush.inc.c" +#include "world/common/enemy/MontyMole_WallAmbush.inc.c" +#include "world/common/enemy/Cleft.inc.c" -StaticNpc N(NpcData_MontyMole_WallAmbush)[] = { +NpcData N(NpcData_MontyMole_WallAmbush)[] = { { .id = NPC_MontyMole_01, - .settings = &N(NpcSettings_MontyMole_WallAmbush), .pos = { 340.0f, 70.0f, 101.0f }, .yaw = 0, - .flags = ENEMY_FLAG_400, - .drops = MONTY_MOLE_DROPS, .territory = { .wander = { .isFlying = FALSE, @@ -25,20 +22,16 @@ StaticNpc N(NpcData_MontyMole_WallAmbush)[] = { .detectSize = { 145, 300 }, } }, + .settings = &N(NpcSettings_MontyMole_WallAmbush), + .flags = ENEMY_FLAG_400, + .drops = MONTY_MOLE_DROPS, .animations = MONTY_MOLE_AMBUSH_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, }, { .id = NPC_MontyMole_01_Hole, - .settings = &N(NpcSettings_MontyMole_WallAmbush_Hole), .pos = { 340.0f, 70.0f, 101.0f }, .yaw = 0, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DISABLE_AI | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_NO_DROPS, - .drops = { - .dropFlags = NPC_DROP_FLAG_80, - .heartDrops = NO_DROPS, - .flowerDrops = NO_DROPS, - }, .territory = { .wander = { .isFlying = TRUE, @@ -51,19 +44,19 @@ StaticNpc N(NpcData_MontyMole_WallAmbush)[] = { .detectSize = { 0 }, } }, + .settings = &N(NpcSettings_MontyMole_WallAmbush_Hole), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DISABLE_AI | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_NO_DROPS, + .drops = NO_DROPS, .animations = MONTY_MOLE_AMBUSH_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, }, }; -StaticNpc N(NpcData_MontyMole_StoneThrower_01)[] = { +NpcData N(NpcData_MontyMole_StoneThrower_01)[] = { { .id = NPC_MontyMole_02, - .settings = &N(NpcSettings_MontyMole_StoneThrower), .pos = { -250.0f, 10.0f, 260.0f }, .yaw = 90, - .flags = ENEMY_FLAG_800, - .drops = MONTY_MOLE_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -76,20 +69,20 @@ StaticNpc N(NpcData_MontyMole_StoneThrower_01)[] = { .detectSize = { 180 }, } }, + .settings = &N(NpcSettings_MontyMole_StoneThrower), + .flags = ENEMY_FLAG_800, + .drops = MONTY_MOLE_DROPS, .animations = MONTY_MOLE_THROWER_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, }, MONTY_MOLE_STONE_HITBOX(NPC_MontyMole_02_Stone) }; -StaticNpc N(NpcData_MontyMole_StoneThrower_02)[] = { +NpcData N(NpcData_MontyMole_StoneThrower_02)[] = { { .id = NPC_MontyMole_03, - .settings = &N(NpcSettings_MontyMole_StoneThrower), .pos = { -175.0f, 10.0f, 240.0f }, .yaw = 270, - .flags = ENEMY_FLAG_800, - .drops = MONTY_MOLE_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -102,20 +95,20 @@ StaticNpc N(NpcData_MontyMole_StoneThrower_02)[] = { .detectSize = { 180 }, } }, + .settings = &N(NpcSettings_MontyMole_StoneThrower), + .flags = ENEMY_FLAG_800, + .drops = MONTY_MOLE_DROPS, .animations = MONTY_MOLE_THROWER_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, }, MONTY_MOLE_STONE_HITBOX(NPC_MontyMole_03_Stone) }; -StaticNpc N(NpcData_MontyMole_StoneThrower_03)[] = { +NpcData N(NpcData_MontyMole_StoneThrower_03)[] = { { .id = NPC_MontyMole_04, - .settings = &N(NpcSettings_MontyMole_StoneThrower), .pos = { -55.0f, 10.0f, 180.0f }, .yaw = 270, - .flags = ENEMY_FLAG_800, - .drops = MONTY_MOLE_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -128,19 +121,19 @@ StaticNpc N(NpcData_MontyMole_StoneThrower_03)[] = { .detectSize = { 180 }, } }, + .settings = &N(NpcSettings_MontyMole_StoneThrower), + .flags = ENEMY_FLAG_800, + .drops = MONTY_MOLE_DROPS, .animations = MONTY_MOLE_THROWER_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, }, MONTY_MOLE_STONE_HITBOX(NPC_MontyMole_04_Stone) }; -StaticNpc N(NpcData_Cleft) = { +NpcData N(NpcData_Cleft) = { .id = NPC_Cleft, - .settings = &N(NpcSettings_Cleft), .pos = { -657.0f, 163.0f, 155.0f }, .yaw = 0, - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, - .drops = CLEFT_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -153,6 +146,9 @@ StaticNpc N(NpcData_Cleft) = { .detectSize = { 125, 125 }, } }, + .settings = &N(NpcSettings_Cleft), + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = CLEFT_DROPS, .animations = CLEFT_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, }; diff --git a/src/world/area_iwa/iwa_02/iwa_02_3_npc.c b/src/world/area_iwa/iwa_02/iwa_02_3_npc.c index 7166221dfd..51b0826f55 100644 --- a/src/world/area_iwa/iwa_02/iwa_02_3_npc.c +++ b/src/world/area_iwa/iwa_02/iwa_02_3_npc.c @@ -1,19 +1,16 @@ #include "iwa_02.h" -#include "world/common/enemy/complete/MontyMole_GroundAmbush.inc.c" -#include "world/common/enemy/complete/MontyMole_WallAmbush.inc.c" -#include "world/common/enemy/complete/Cleft.inc.c" +#include "world/common/enemy/MontyMole_GroundAmbush.inc.c" +#include "world/common/enemy/MontyMole_WallAmbush.inc.c" +#include "world/common/enemy/Cleft.inc.c" #include "world/common/npc/Bubulb.inc.c" #include "world/common/complete/GiveReward.inc.c" -StaticNpc N(NpcData_Cleft_01) = { +NpcData N(NpcData_Cleft_01) = { .id = NPC_Cleft_01, - .settings = &N(NpcSettings_Cleft), .pos = { 526.0f, 238.0f, 69.0f }, .yaw = 0, - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_2000, - .drops = CLEFT_DROPS, .territory = { .wander = { .isFlying = FALSE, @@ -26,17 +23,17 @@ StaticNpc N(NpcData_Cleft_01) = { .detectSize = { 200 }, } }, + .settings = &N(NpcSettings_Cleft), + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_2000, + .drops = CLEFT_DROPS, .animations = CLEFT_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, }; -StaticNpc N(NpcData_Cleft_02) = { +NpcData N(NpcData_Cleft_02) = { .id = NPC_Cleft_02, - .settings = &N(NpcSettings_Cleft), .pos = { 450.0f, 50.0f, 215.0f }, .yaw = 90, - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_2000, - .drops = CLEFT_DROPS, .territory = { .wander = { .isFlying = FALSE, @@ -49,17 +46,17 @@ StaticNpc N(NpcData_Cleft_02) = { .detectSize = { 200 }, } }, + .settings = &N(NpcSettings_Cleft), + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_2000, + .drops = CLEFT_DROPS, .animations = CLEFT_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, }; -StaticNpc N(NpcData_Cleft_03) = { +NpcData N(NpcData_Cleft_03) = { .id = NPC_Cleft_03, - .settings = &N(NpcSettings_Cleft), .pos = { 90.0f, 0.0f, 160.0f }, .yaw = 270, - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_2000, - .drops = CLEFT_DROPS, .territory = { .wander = { .isFlying = FALSE, @@ -72,18 +69,18 @@ StaticNpc N(NpcData_Cleft_03) = { .detectSize = { 200 }, } }, + .settings = &N(NpcSettings_Cleft), + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_2000, + .drops = CLEFT_DROPS, .animations = CLEFT_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, }; -StaticNpc N(NpcData_MontyMole_01)[] = { +NpcData N(NpcData_MontyMole_01)[] = { { .id = NPC_MontyMole, - .settings = &N(NpcSettings_MontyMole_WallAmbush), .pos = { 867.0f, 0.0f, 101.0f }, .yaw = 0, - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, - .drops = MONTY_MOLE_DROPS, .territory = { .wander = { .isFlying = FALSE, @@ -96,20 +93,16 @@ StaticNpc N(NpcData_MontyMole_01)[] = { .detectSize = { 150 }, } }, + .settings = &N(NpcSettings_MontyMole_WallAmbush), + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = MONTY_MOLE_DROPS, .animations = MONTY_MOLE_AMBUSH_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, }, { .id = NPC_MontyMole_Hole, - .settings = &N(NpcSettings_MontyMole_WallAmbush_Hole), .pos = { 867.0f, 0.0f, 101.0f }, .yaw = 0, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DISABLE_AI | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, - .drops = { - .dropFlags = NPC_DROP_FLAG_80, - .heartDrops = NO_DROPS, - .flowerDrops = NO_DROPS, - }, .territory = { .wander = { .isFlying = TRUE, @@ -122,6 +115,9 @@ StaticNpc N(NpcData_MontyMole_01)[] = { .detectSize = { 0 }, } }, + .settings = &N(NpcSettings_MontyMole_WallAmbush_Hole), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DISABLE_AI | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = NO_DROPS, .animations = MONTY_MOLE_AMBUSH_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, }, @@ -184,14 +180,14 @@ EvtScript N(EVS_NpcInit_Bubulb) = { EVT_END }; -StaticNpc N(NpcData_Bubulb) = { +NpcData N(NpcData_Bubulb) = { .id = NPC_Bubulb, - .settings = &N(NpcSettings_Bubulb), .pos = { 1075.0f, 50.0f, 230.0f }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_Bubulb), - .drops = BUBULB_DROPS, + .settings = &N(NpcSettings_Bubulb), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_800, + .drops = NO_DROPS, .animations = BUBULB_PURPLE_ANIMS, .tattle = MSG_NpcTattle_IWA_Bubulb_Revealed, }; diff --git a/src/world/area_iwa/iwa_03/iwa_03_3_npc.c b/src/world/area_iwa/iwa_03/iwa_03_3_npc.c index e136ae3d44..13e9df1ae0 100644 --- a/src/world/area_iwa/iwa_03/iwa_03_3_npc.c +++ b/src/world/area_iwa/iwa_03/iwa_03_3_npc.c @@ -1,15 +1,12 @@ #include "iwa_03.h" -#include "world/common/enemy/complete/MontyMole_GroundAmbush.inc.c" -#include "world/common/enemy/complete/Cleft.inc.c" +#include "world/common/enemy/MontyMole_GroundAmbush.inc.c" +#include "world/common/enemy/Cleft.inc.c" -StaticNpc N(NpcData_Cleft_01) = { +NpcData N(NpcData_Cleft_01) = { .id = NPC_Cleft_01, - .settings = &N(NpcSettings_Cleft), .pos = { -525.0f, -75.0f, 60.0f }, .yaw = 0, - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, - .drops = CLEFT_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -22,17 +19,17 @@ StaticNpc N(NpcData_Cleft_01) = { .detectSize = { 250 }, } }, + .settings = &N(NpcSettings_Cleft), + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = CLEFT_DROPS, .animations = CLEFT_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, }; -StaticNpc N(NpcData_Cleft_02) = { +NpcData N(NpcData_Cleft_02) = { .id = NPC_Cleft_02, - .settings = &N(NpcSettings_Cleft), .pos = { -1686.0f, -60.0f, 180.0f }, .yaw = 0, - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, - .drops = CLEFT_DROPS, .territory = { .wander = { .isFlying = FALSE, @@ -45,17 +42,17 @@ StaticNpc N(NpcData_Cleft_02) = { .detectSize = { 250 }, } }, + .settings = &N(NpcSettings_Cleft), + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = CLEFT_DROPS, .animations = CLEFT_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, }; -StaticNpc N(NpcData_Cleft_03) = { +NpcData N(NpcData_Cleft_03) = { .id = NPC_Cleft_03, - .settings = &N(NpcSettings_Cleft), .pos = { -1300.0f, 408.0f, -125.0f }, .yaw = 0, - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, - .drops = CLEFT_DROPS, .territory = { .wander = { .isFlying = FALSE, @@ -68,18 +65,18 @@ StaticNpc N(NpcData_Cleft_03) = { .detectSize = { 140 }, } }, + .settings = &N(NpcSettings_Cleft), + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = CLEFT_DROPS, .animations = CLEFT_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, }; -StaticNpc N(NpcData_MontyMole)[] = { +NpcData N(NpcData_MontyMole)[] = { { .id = NPC_MontyMole, - .settings = &N(NpcSettings_MontyMole_GroundAmbush), .pos = { -1000.0f, 23.0f, 60.0f }, .yaw = 0, - .flags = ENEMY_FLAG_400, - .drops = MONTY_MOLE_DROPS, .territory = { .wander = { .isFlying = FALSE, @@ -92,20 +89,16 @@ StaticNpc N(NpcData_MontyMole)[] = { .detectSize = { 250 }, } }, + .settings = &N(NpcSettings_MontyMole_GroundAmbush), + .flags = ENEMY_FLAG_400, + .drops = MONTY_MOLE_DROPS, .animations = MONTY_MOLE_AMBUSH_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, }, { .id = NPC_MontyMole_Hole, - .settings = &N(NpcSettings_MontyMole_GroundAmbush_Hole), .pos = { -1000.0f, 23.0f, 60.0f }, .yaw = 0, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DISABLE_AI | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, - .drops = { - .dropFlags = NPC_DROP_FLAG_80, - .heartDrops = NO_DROPS, - .flowerDrops = NO_DROPS, - }, .territory = { .wander = { .isFlying = TRUE, @@ -118,6 +111,9 @@ StaticNpc N(NpcData_MontyMole)[] = { .detectSize = { 0 }, } }, + .settings = &N(NpcSettings_MontyMole_GroundAmbush_Hole), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DISABLE_AI | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = NO_DROPS, .animations = MONTY_MOLE_AMBUSH_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, }, diff --git a/src/world/area_iwa/iwa_04/iwa_04_4_npc.c b/src/world/area_iwa/iwa_04/iwa_04_4_npc.c index d78d43f064..72926d8d77 100644 --- a/src/world/area_iwa/iwa_04/iwa_04_4_npc.c +++ b/src/world/area_iwa/iwa_04/iwa_04_4_npc.c @@ -1,6 +1,6 @@ #include "iwa_04.h" -#include "world/common/enemy/complete/Cleft.inc.c" +#include "world/common/enemy/Cleft.inc.c" API_CALLABLE(N(func_80241060_91C940)) { gCameras[CAM_DEFAULT].unk_498 = 1.0f; @@ -277,13 +277,10 @@ NpcSettings N(NpcSettings_Buzzar) = { .onDefeat = &N(EVS_NpcDefeat_Buzzar), }; -StaticNpc N(NpcData_Cleft) = { +NpcData N(NpcData_Cleft) = { .id = NPC_Cleft, - .settings = &N(NpcSettings_Cleft), .pos = { -412.0f, -250.0f, 143.0f }, .yaw = 0, - .flags = ENEMY_FLAG_100 | ENEMY_FLAG_800, - .drops = CLEFT_DROPS, .territory = { .wander = { .isFlying = FALSE, @@ -296,15 +293,18 @@ StaticNpc N(NpcData_Cleft) = { .detectSize = { 175, 195 }, } }, + .settings = &N(NpcSettings_Cleft), + .flags = ENEMY_FLAG_100 | ENEMY_FLAG_800, + .drops = CLEFT_DROPS, .animations = CLEFT_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, }; -StaticNpc N(NpcData_Buzzar) = { +NpcData N(NpcData_Buzzar) = { .id = NPC_Buzzar, - .settings = &N(NpcSettings_Buzzar), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 270, + .settings = &N(NpcSettings_Buzzar), .flags = ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_200000 | ENEMY_FLAG_NO_DROPS, .drops = { .dropFlags = NPC_DROP_FLAG_80, diff --git a/src/world/area_iwa/iwa_10/iwa_10.h b/src/world/area_iwa/iwa_10/iwa_10.h index 77dd14f285..fdd8043069 100644 --- a/src/world/area_iwa/iwa_10/iwa_10.h +++ b/src/world/area_iwa/iwa_10/iwa_10.h @@ -59,5 +59,5 @@ extern EvtScript N(EVS_MakeEntities); extern NpcGroupList N(DefaultNPCs); extern EvtScript N(EVS_NpcIdle_Parakarry); -extern StaticNpc N(NpcData_Parakarry); +extern NpcData N(NpcData_Parakarry); API_CALLABLE(N(LoadPartyImage)); 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 4c048ebfd7..33ae38ffd5 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 @@ -122,102 +122,98 @@ EvtScript N(EVS_NpcInit_ThreeSisters_01) = { EVT_END }; -StaticNpc N(NpcData_TrainToad)[] = { +NpcData N(NpcData_TrainToad)[] = { { .id = NPC_TrainToad_01, - .settings = &N(NpcSettings_TrainToad), .pos = { -440.0f, 20.0f, 110.0f }, .yaw = 90, - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_TrainToad_01), - .drops = TRAIN_CONDUCTOR_DROPS, + .settings = &N(NpcSettings_TrainToad), + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, + .drops = NO_DROPS, .animations = TRAIN_TOAD_WHITE_ANIMS, .tattle = MSG_NpcTattle_IWA_StationMaster, }, { .id = NPC_TrainToad_02, - .settings = &N(NpcSettings_TrainToad), .pos = { -425.0f, 70.0f, -20.0f }, .yaw = 0, - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_TrainToad_02), - .drops = TRAIN_CONDUCTOR_DROPS, + .settings = &N(NpcSettings_TrainToad), + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, + .drops = NO_DROPS, .animations = TRAIN_CONDUCTOR_ANIMS, }, }; -StaticNpc N(NpcData_Toad) = { +NpcData N(NpcData_Toad) = { .id = NPC_Toad, - .settings = &N(NpcSettings_Toad_Stationary), .pos = { -254.0f, 20.0f, 165.0f }, .yaw = 270, - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_Toad), - .drops = { - .dropFlags = NPC_DROP_FLAG_80, - .heartDrops = NO_DROPS, - .flowerDrops = NO_DROPS, - }, + .settings = &N(NpcSettings_Toad_Stationary), + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, + .drops = NO_DROPS, .animations = TOAD_RED_ANIMS, .tattle = MSG_NpcTattle_IWA_TravelAgent, }; -StaticNpc N(NpcData_ThreeSisters)[] = { +NpcData N(NpcData_ThreeSisters)[] = { { .id = NPC_ThreeSisters_02, - .settings = &N(NpcSettings_Toad_Stationary), .pos = { -562.0f, 0.0f, 384.0f }, .yaw = 90, - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_ThreeSisters_02), - .drops = TOADETTE_DROPS, + .settings = &N(NpcSettings_Toad_Stationary), + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, + .drops = NO_DROPS, .animations = TOADETTE_PINK_ANIMS, .tattle = MSG_NpcTattle_TravelingMaidA, }, { .id = NPC_ThreeSisters_03, - .settings = &N(NpcSettings_Toad_Stationary), .pos = { -582.0f, 0.0f, 406.0f }, .yaw = 90, - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_ThreeSisters_02), - .drops = TOADETTE_DROPS, + .settings = &N(NpcSettings_Toad_Stationary), + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, + .drops = NO_DROPS, .animations = TOADETTE_PINK_ANIMS, .tattle = MSG_NpcTattle_TravelingMaidB, }, { .id = NPC_ThreeSisters_04, - .settings = &N(NpcSettings_Toad_Stationary), .pos = { -524.0f, 0.0f, 411.0f }, .yaw = 270, - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_ThreeSisters_02), - .drops = TOADETTE_DROPS, + .settings = &N(NpcSettings_Toad_Stationary), + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, + .drops = NO_DROPS, .animations = TOADETTE_PINK_ANIMS, .tattle = MSG_NpcTattle_TravelingMaidC, }, }; -StaticNpc N(NpcData_Dryite)[] = { +NpcData N(NpcData_Dryite)[] = { { .id = NPC_Dryite, - .settings = &N(NpcSettings_Dryite), .pos = { -344.0f, 0.0f, 379.0f }, .yaw = 270, - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_Dryite), - .drops = DRYITE_DROPS, + .settings = &N(NpcSettings_Dryite), + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, + .drops = NO_DROPS, .animations = DRYITE_GREEN_ANIMS, .tattle = MSG_NpcTattle_IWA_StationLoiterer, }, { .id = NPC_ThreeSisters_01, - .settings = &N(NpcSettings_Toad_Stationary), .pos = { -760.0f, 0.0f, 160.0f }, .yaw = 90, - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_ThreeSisters_01), - .drops = TOADETTE_DROPS, + .settings = &N(NpcSettings_Toad_Stationary), + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, + .drops = NO_DROPS, .animations = TOADETTE_GREEN_ANIMS, .tattle = MSG_NpcTattle_IWA_Conservationist, }, 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 7ab8b0afd5..c27fa6bba7 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 @@ -305,18 +305,14 @@ EvtScript N(EVS_NpcInit_Parakarry) = { EVT_END }; -StaticNpc N(NpcData_Parakarry) = { +NpcData N(NpcData_Parakarry) = { .id = NPC_Parakarry, - .settings = &N(NpcSettings_Parakarry), .pos = { -610.0f, 230.0f, -485.0f }, .yaw = 0, - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_200000, .init = &N(EVS_NpcInit_Parakarry), - .drops = { - .dropFlags = NPC_DROP_FLAG_80, - .heartDrops = NO_DROPS, - .flowerDrops = NO_DROPS, - }, + .settings = &N(NpcSettings_Parakarry), + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_200000, + .drops = NO_DROPS, .animations = PARAKARRY_ANIMS, .tattle = MSG_NpcTattle_IWA_Parakarry, }; 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 39e18d2c36..8df60832e7 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 @@ -18,14 +18,14 @@ EvtScript N(EVS_NpcInit_TrainToad) = { EVT_END }; -StaticNpc N(NpcData_TrainToad) = { +NpcData N(NpcData_TrainToad) = { .id = NPC_TrainToad, - .settings = &N(NpcSettings_TrainToad), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 90, - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_TrainToad), - .drops = TRAIN_CONDUCTOR_DROPS, + .settings = &N(NpcSettings_TrainToad), + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, + .drops = NO_DROPS, .animations = TRAIN_CONDUCTOR_ANIMS, }; diff --git a/src/world/area_jan/jan_00/jan_00_1_main.c b/src/world/area_jan/jan_00/jan_00_1_main.c index 38f4b5c87f..6a09833d10 100644 --- a/src/world/area_jan/jan_00/jan_00_1_main.c +++ b/src/world/area_jan/jan_00/jan_00_1_main.c @@ -11,7 +11,6 @@ extern EvtScript N(EVS_802467AC); extern EvtScript N(EVS_80247A2C); #include "world/common/atomic/TexturePan.inc.c" -#include "world/common/atomic/TexturePan.data.inc.c" API_CALLABLE(func_8024030C_B2084C) { fx_sun_undeclared(FX_SUN_FROM_LEFT, 0, 0, 0, 0, 0); diff --git a/src/world/area_jan/jan_00/jan_00_2_npc.c b/src/world/area_jan/jan_00/jan_00_2_npc.c index 5f82b6c98b..7226613736 100644 --- a/src/world/area_jan/jan_00/jan_00_2_npc.c +++ b/src/world/area_jan/jan_00/jan_00_2_npc.c @@ -10,7 +10,7 @@ NpcSettings N(NpcSettings_Kolorado_01) = { #include "world/common/npc/Kolorado.inc.c" #include "world/common/npc/JrTroopa.inc.c" -#include "world/common/enemy/complete/HeartPlant.inc.c" +#include "world/common/enemy/HeartPlant.inc.c" #include "world/common/complete/LetterDelivery.inc.c" @@ -638,92 +638,92 @@ EvtScript N(EVS_NpcInit_JrTroopa) = { EVT_END }; -StaticNpc N(NpcData_Characters)[] = { +NpcData N(NpcData_Characters)[] = { { .id = NPC_Whale, - .settings = &N(NpcSettings_Kolorado_01), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 90, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_Kolorado_01), - .drops = NPC_NO_DROPS, + .settings = &N(NpcSettings_Kolorado_01), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_400000, + .drops = NO_DROPS, .animations = KOLORADO_ANIMS, .tattle = MSG_NpcTattle_Whale, }, { .id = NPC_Kolorado_02, - .settings = &N(NpcSettings_Kolorado), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 90, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_800 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_Kolorado_02), - .drops = NPC_NO_DROPS, + .settings = &N(NpcSettings_Kolorado), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_800 | ENEMY_FLAG_400000, + .drops = NO_DROPS, .animations = KOLORADO_ANIMS, .tattle = MSG_NpcTattle_Kolorado, }, { .id = NPC_JrTroopa, - .settings = &N(NpcSettings_JrTroopa), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 90, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_800 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_JrTroopa), - .drops = NPC_NO_DROPS, + .settings = &N(NpcSettings_JrTroopa), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_800 | ENEMY_FLAG_400000, + .drops = NO_DROPS, .animations = JR_TROOPA_ANIMS, }, }; -StaticNpc N(NpcData_HeartPlant_01) = { +NpcData N(NpcData_HeartPlant_01) = { .id = NPC_HeartPlant_01, - .settings = &N(NpcSettings_HeartPlant), .pos = { 455.0f, 0.0f, 115.0f }, .yaw = 270, + .settings = &N(NpcSettings_HeartPlant), .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_800 | ENEMY_FLAG_8000 | ENEMY_FLAG_400000, - .drops = NPC_NO_DROPS, + .drops = NO_DROPS, .animations = HEART_PLANT_ANIMS, .tattle = MSG_NpcTattle_HeartPlant, }; -StaticNpc N(NpcData_HeartPlant_02) = { +NpcData N(NpcData_HeartPlant_02) = { .id = NPC_HeartPlant_02, - .settings = &N(NpcSettings_HeartPlant), .pos = { 167.0f, 0.0f, 404.0f }, .yaw = 270, + .settings = &N(NpcSettings_HeartPlant), .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_800 | ENEMY_FLAG_8000 | ENEMY_FLAG_400000, - .drops = NPC_NO_DROPS, + .drops = NO_DROPS, .animations = HEART_PLANT_ANIMS, .tattle = MSG_NpcTattle_HeartPlant, }; -StaticNpc N(NpcData_HeartPlant_03) = { +NpcData N(NpcData_HeartPlant_03) = { .id = NPC_HeartPlant_03, - .settings = &N(NpcSettings_HeartPlant), .pos = { 90.0f, 0.0f, 316.0f }, .yaw = 270, + .settings = &N(NpcSettings_HeartPlant), .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_800 | ENEMY_FLAG_8000 | ENEMY_FLAG_400000, - .drops = NPC_NO_DROPS, + .drops = NO_DROPS, .animations = HEART_PLANT_ANIMS, .tattle = MSG_NpcTattle_HeartPlant, }; -StaticNpc N(NpcData_HeartPlant_04) = { +NpcData N(NpcData_HeartPlant_04) = { .id = NPC_HeartPlant_04, - .settings = &N(NpcSettings_HeartPlant), .pos = { 424.0f, 0.0f, 182.0f }, .yaw = 270, + .settings = &N(NpcSettings_HeartPlant), .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_800 | ENEMY_FLAG_8000 | ENEMY_FLAG_400000, - .drops = NPC_NO_DROPS, + .drops = NO_DROPS, .animations = HEART_PLANT_ANIMS, .tattle = MSG_NpcTattle_HeartPlant, }; -StaticNpc N(NpcData_HeartPlant_05) = { +NpcData N(NpcData_HeartPlant_05) = { .id = NPC_HeartPlant_05, - .settings = &N(NpcSettings_HeartPlant), .pos = { 143.0f, 0.0f, 260.0f }, .yaw = 270, + .settings = &N(NpcSettings_HeartPlant), .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_800 | ENEMY_FLAG_8000 | ENEMY_FLAG_400000, - .drops = NPC_NO_DROPS, + .drops = NO_DROPS, .animations = HEART_PLANT_ANIMS, .tattle = MSG_NpcTattle_HeartPlant, }; diff --git a/src/world/area_jan/jan_01/jan_01_2_main.c b/src/world/area_jan/jan_01/jan_01_2_main.c index d4798fef51..5d73cdf321 100644 --- a/src/world/area_jan/jan_01/jan_01_2_main.c +++ b/src/world/area_jan/jan_01/jan_01_2_main.c @@ -2,7 +2,6 @@ #include "effects.h" #include "world/common/atomic/TexturePan.inc.c" -#include "world/common/atomic/TexturePan.data.inc.c" API_CALLABLE(N(SpawnSunEffect)) { fx_sun_undeclared(FX_SUN_FROM_LEFT, 0, 0, 0, 0, 0); diff --git a/src/world/area_jan/jan_01/jan_01_3_npc.c b/src/world/area_jan/jan_01/jan_01_3_npc.c index 5bec0f09a1..f7ec98593b 100644 --- a/src/world/area_jan/jan_01/jan_01_3_npc.c +++ b/src/world/area_jan/jan_01/jan_01_3_npc.c @@ -1,8 +1,8 @@ #include "jan_01.h" #include "effects.h" -#include "world/common/enemy/complete/JungleFuzzy_Wander.inc.c" -#include "world/common/enemy/complete/JungleFuzzy.inc.c" +#include "world/common/enemy/JungleFuzzy_Wander.inc.c" +#include "world/common/enemy/JungleFuzzy.inc.c" #include "world/common/npc/Kolorado.inc.c" #include "world/common/todo/SetCamera0Flag1000.inc.c" #include "world/common/todo/UnsetCamera0Flag1000.inc.c" @@ -269,26 +269,26 @@ EvtScript N(EVS_NpcInit_JungleFuzzy_01) = { EVT_END }; -StaticNpc N(NpcData_Kolorado) = { +NpcData N(NpcData_Kolorado) = { .id = NPC_Kolorado, - .settings = &N(NpcSettings_Kolorado), .pos = { -70.0f, -9.0f, 90.0f }, .yaw = 90, - .flags = ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_20000000, .init = &N(EVS_NpcInit_Kolorado), - .drops = NPC_NO_DROPS, + .settings = &N(NpcSettings_Kolorado), + .flags = ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_20000000, + .drops = NO_DROPS, .animations = KOLORADO_ANIMS, .tattle = MSG_NpcTattle_Kolorado, }; -StaticNpc N(NpcData_JungleFuzzy_01) = { +NpcData N(NpcData_JungleFuzzy_01) = { .id = NPC_JungleFuzzy_01, - .settings = &N(NpcSettings_JungleFuzzy), .pos = { -30.0f, 0.0f, 90.0f }, .yaw = 270, - .flags = ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_40000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS, .init = &N(EVS_NpcInit_JungleFuzzy_01), - .drops = NPC_NO_DROPS, + .settings = &N(NpcSettings_JungleFuzzy), + .flags = ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_40000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS, + .drops = NO_DROPS, .animations = JUNGLE_FUZZY_ANIMS, }; @@ -300,14 +300,10 @@ EvtScript N(EVS_NpcInit_JungleFuzzy_02) = { EVT_END }; -StaticNpc N(NpcData_JungleFuzzy_02) = { +NpcData N(NpcData_JungleFuzzy_02) = { .id = NPC_JungleFuzzy_02, - .settings = &N(NpcSettings_JungleFuzzy_Wander), .pos = { -350.0f, 3.0f, 40.0f }, .yaw = 270, - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_400000, - .init = &N(EVS_NpcInit_JungleFuzzy_02), - .drops = JUNGLE_FUZZY_DROPS, .territory = { .wander = { .isFlying = FALSE, @@ -320,18 +316,18 @@ StaticNpc N(NpcData_JungleFuzzy_02) = { .detectSize = { 200 }, } }, + .init = &N(EVS_NpcInit_JungleFuzzy_02), + .settings = &N(NpcSettings_JungleFuzzy_Wander), + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_400000, + .drops = JUNGLE_FUZZY_DROPS, .animations = JUNGLE_FUZZY_ANIMS, .aiDetectFlags = AI_DETECT_SENSITIVE_MOTION, }; -StaticNpc N(NpcData_JungleFuzzy_03) = { +NpcData N(NpcData_JungleFuzzy_03) = { .id = NPC_JungleFuzzy_03, - .settings = &N(NpcSettings_JungleFuzzy_Wander), .pos = { 0.0f, -10.0f, 110.0f }, .yaw = 90, - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_400000, - .init = &N(EVS_NpcInit_JungleFuzzy_02), - .drops = JUNGLE_FUZZY_DROPS, .territory = { .wander = { .isFlying = FALSE, @@ -344,18 +340,18 @@ StaticNpc N(NpcData_JungleFuzzy_03) = { .detectSize = { 200 }, } }, + .init = &N(EVS_NpcInit_JungleFuzzy_02), + .settings = &N(NpcSettings_JungleFuzzy_Wander), + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_400000, + .drops = JUNGLE_FUZZY_DROPS, .animations = JUNGLE_FUZZY_ANIMS, .aiDetectFlags = AI_DETECT_SENSITIVE_MOTION, }; -StaticNpc N(NpcData_JungleFuzzy_04) = { +NpcData N(NpcData_JungleFuzzy_04) = { .id = NPC_JungleFuzzy_04, - .settings = &N(NpcSettings_JungleFuzzy_Wander), .pos = { 350.0f, 3.0f, 40.0f }, .yaw = 270, - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_400000, - .init = &N(EVS_NpcInit_JungleFuzzy_02), - .drops = JUNGLE_FUZZY_DROPS, .territory = { .wander = { .isFlying = FALSE, @@ -368,6 +364,10 @@ StaticNpc N(NpcData_JungleFuzzy_04) = { .detectSize = { 200, 125 }, } }, + .init = &N(EVS_NpcInit_JungleFuzzy_02), + .settings = &N(NpcSettings_JungleFuzzy_Wander), + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_400000, + .drops = JUNGLE_FUZZY_DROPS, .animations = JUNGLE_FUZZY_ANIMS, .aiDetectFlags = AI_DETECT_SENSITIVE_MOTION, }; diff --git a/src/world/area_jan/jan_02/jan_02_2_main.c b/src/world/area_jan/jan_02/jan_02_2_main.c index 463a75312e..21ea56c82c 100644 --- a/src/world/area_jan/jan_02/jan_02_2_main.c +++ b/src/world/area_jan/jan_02/jan_02_2_main.c @@ -2,7 +2,6 @@ #include "effects.h" #include "world/common/atomic/TexturePan.inc.c" -#include "world/common/atomic/TexturePan.data.inc.c" extern s32 N(PrevPalmTreeVisibility); diff --git a/src/world/area_jan/jan_02/jan_02_3_npc.c b/src/world/area_jan/jan_02/jan_02_3_npc.c index 522c8c4f85..ec818c47cb 100644 --- a/src/world/area_jan/jan_02/jan_02_3_npc.c +++ b/src/world/area_jan/jan_02/jan_02_3_npc.c @@ -380,46 +380,42 @@ EvtScript N(EVS_NpcInit_Yoshi_03) = { EVT_END }; -s32 N(ExtraAnims_Councillor)[] = { +AnimID N(ExtraAnims_Councillor)[] = { ANIM_LeadersFriend_TalkSit, ANIM_LeadersFriend_TalkSitSad, ANIM_LeadersFriend_IdleSit, ANIM_LeadersFriend_BowSit, - -1 + ANIM_LIST_END }; -StaticNpc N(NpcData_Townsfolk)[] = { +NpcData N(NpcData_Townsfolk)[] = { { .id = NPC_YoshiLeader, - .settings = &N(NpcSettings_Yoshi), .pos = { 323.0f, 30.0f, 412.0f }, .yaw = 270, - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_VillageLeader), - .drops = NPC_NO_DROPS, + .settings = &N(NpcSettings_Yoshi), + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, + .drops = NO_DROPS, .animations = YOSHI_LEADER_ANIMS, .tattle = MSG_NpcTattle_VillageLeader, }, { .id = NPC_YoshiCouncillor, - .settings = &N(NpcSettings_Yoshi), .pos = { 172.0f, 30.0f, 418.0f }, .yaw = 90, - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_Councillor), - .drops = NPC_NO_DROPS, + .settings = &N(NpcSettings_Yoshi), + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, + .drops = NO_DROPS, .animations = YOSHI_COUNCILLOR_ANIMS, .extraAnimations = N(ExtraAnims_Councillor), .tattle = MSG_NpcTattle_LeadersFriend, }, { .id = NPC_Yoshi_01, - .settings = &N(NpcSettings_Yoshi_Patrol), .pos = { -520.0f, 0.0f, -270.0f }, .yaw = 90, - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, - .init = &N(EVS_NpcInit_Yoshi_01), - .drops = NPC_NO_DROPS, .territory = { .patrol = { .isFlying = TRUE, @@ -434,17 +430,17 @@ StaticNpc N(NpcData_Townsfolk)[] = { .detectSize = { 100 }, } }, + .init = &N(EVS_NpcInit_Yoshi_01), + .settings = &N(NpcSettings_Yoshi_Patrol), + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, + .drops = NO_DROPS, .animations = YOSHI_RED_ANIMS, .tattle = MSG_NpcTattle_EntranceYoshi, }, { .id = NPC_Yoshi_02, - .settings = &N(NpcSettings_Yoshi_Patrol), .pos = { 180.0f, 0.0f, -520.0f }, .yaw = 270, - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, - .init = &N(EVS_NpcInit_Yoshi_02), - .drops = NPC_NO_DROPS, .territory = { .patrol = { .isFlying = TRUE, @@ -460,17 +456,17 @@ StaticNpc N(NpcData_Townsfolk)[] = { .detectSize = { 100 }, } }, + .init = &N(EVS_NpcInit_Yoshi_02), + .settings = &N(NpcSettings_Yoshi_Patrol), + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, + .drops = NO_DROPS, .animations = YOSHI_BLUE_ANIMS, .tattle = MSG_NpcTattle_BlueYoshi, }, { .id = NPC_Yoshi_03, - .settings = &N(NpcSettings_Yoshi_Patrol), .pos = { 600.0f, 0.0f, -150.0f }, .yaw = 270, - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, - .init = &N(EVS_NpcInit_Yoshi_03), - .drops = NPC_NO_DROPS, .territory = { .patrol = { .isFlying = TRUE, @@ -485,20 +481,24 @@ StaticNpc N(NpcData_Townsfolk)[] = { .detectSize = { 100 }, } }, + .init = &N(EVS_NpcInit_Yoshi_03), + .settings = &N(NpcSettings_Yoshi_Patrol), + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, + .drops = NO_DROPS, .animations = YOSHI_PURPLE_ANIMS, .tattle = MSG_NpcTattle_LikeableYoshi, }, }; -StaticNpc N(NpcData_ChuckQuizmo) = { +NpcData N(NpcData_ChuckQuizmo) = { .id = NPC_ChuckQuizmo, - .settings = &N(NpcSettings_ChuckQuizmo), .pos = { -150.0f, 15.0f, 300.0f }, .yaw = 90, - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, .initVarCount = 1, .initVar = { .bytes = { 0, QUIZ_AREA_JAN, QUIZ_COUNT_JAN, QUIZ_MAP_JAN_02 }}, - .drops = NPC_NO_DROPS, + .settings = &N(NpcSettings_ChuckQuizmo), + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, + .drops = NO_DROPS, .animations = QUIZMO_ANIMS, .tattle = MSG_NpcTattle_ChuckQuizmo, }; diff --git a/src/world/area_jan/jan_03/jan_03_2_main.c b/src/world/area_jan/jan_03/jan_03_2_main.c index accc0c2926..5813dd0065 100644 --- a/src/world/area_jan/jan_03/jan_03_2_main.c +++ b/src/world/area_jan/jan_03/jan_03_2_main.c @@ -4,7 +4,6 @@ #include "world/common/entity/Pipe.inc.c" #include "world/common/atomic/TexturePan.inc.c" -#include "world/common/atomic/TexturePan.data.inc.c" API_CALLABLE(N(SpawnSunEffect)) { fx_sun_undeclared(FX_SUN_FROM_LEFT, 0, 0, 0, 0, 0); diff --git a/src/world/area_jan/jan_03/jan_03_4_npc.c b/src/world/area_jan/jan_03/jan_03_4_npc.c index ffb68d1f93..9ab57308ea 100644 --- a/src/world/area_jan/jan_03/jan_03_4_npc.c +++ b/src/world/area_jan/jan_03/jan_03_4_npc.c @@ -744,7 +744,7 @@ EvtScript N(EVS_NpcInit_Sushie) = { #include "world/common/npc/Raven.inc.c" -s32 N(ExtraAnims_VillageLeader)[] = { +AnimID N(ExtraAnims_VillageLeader)[] = { ANIM_VillageLeader_Idle, ANIM_VillageLeader_IdleSad, ANIM_VillageLeader_Walk, @@ -754,94 +754,90 @@ s32 N(ExtraAnims_VillageLeader)[] = { ANIM_VillageLeader_Shout, ANIM_VillageLeader_Celebrate, ANIM_VillageLeader_CrossArms, - -1 + ANIM_LIST_END }; -StaticNpc N(NpcData_VillageLeader) = { +NpcData N(NpcData_VillageLeader) = { .id = NPC_VillageLeader, - .settings = &N(NpcSettings_Yoshi), .pos = { -300.0f, 0.0f, -70.0f }, .yaw = 270, - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_VillageLeader), - .drops = NPC_NO_DROPS, + .settings = &N(NpcSettings_Yoshi), + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, + .drops = NO_DROPS, .animations = YOSHI_LEADER_ANIMS, .extraAnimations = N(ExtraAnims_VillageLeader), .tattle = MSG_NpcTattle_VillageLeader, }; -s32 N(ExtraAnims_Sushie)[] = { +AnimID N(ExtraAnims_Sushie)[] = { ANIM_WorldSushie_Idle, ANIM_WorldSushie_Run, ANIM_WorldSushie_Talk, - -1 + ANIM_LIST_END }; -StaticNpc N(NpcData_Sushie) = { +NpcData N(NpcData_Sushie) = { .id = NPC_Sushie, - .settings = &N(NpcSettings_Sushie), .pos = { -425.0f, 0.0f, -350.0f }, .yaw = 90, - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_Sushie), - .drops = NPC_NO_DROPS, + .settings = &N(NpcSettings_Sushie), + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, + .drops = NO_DROPS, .animations = SUSHIE_ANIMS, .extraAnimations = N(ExtraAnims_Sushie), .tattle = MSG_NpcTattle_Sushie, }; -s32 N(ExtraAnims_Kolorado)[] = { +AnimID N(ExtraAnims_Kolorado)[] = { ANIM_Kolorado_Idle, ANIM_Kolorado_IdleSad, ANIM_Kolorado_Walk, ANIM_Kolorado_Talk, - -1 + ANIM_LIST_END }; -StaticNpc N(NpcData_Kolorado) = { +NpcData N(NpcData_Kolorado) = { .id = NPC_Kolorado, - .settings = &N(NpcSettings_Kolorado), .pos = { -475.0f, 0.0f, -75.0f }, .yaw = 90, - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_Kolorado), - .drops = NPC_NO_DROPS, + .settings = &N(NpcSettings_Kolorado), + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, + .drops = NO_DROPS, .animations = KOLORADO_ANIMS, .extraAnimations = N(ExtraAnims_Kolorado), .tattle = MSG_NpcTattle_Kolorado, }; -StaticNpc N(NpcData_Toad)[] = { +NpcData N(NpcData_Toad)[] = { { .id = NPC_Toad, - .settings = &N(NpcSettings_Toad_Stationary), .pos = { 275.0f, 0.0f, -70.0f }, .yaw = 0, - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_Toad), - .drops = NPC_NO_DROPS, + .settings = &N(NpcSettings_Toad_Stationary), + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, + .drops = NO_DROPS, .animations = TOAD_RED_ANIMS, .tattle = MSG_NpcTattle_JAN_ToadHouseToad, }, { .id = NPC_Yoshi_01, - .settings = &N(NpcSettings_Yoshi), .pos = { 125.0f, 30.0f, -425.0f }, .yaw = 270, - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_Yoshi_01), - .drops = NPC_NO_DROPS, + .settings = &N(NpcSettings_Yoshi), + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, + .drops = NO_DROPS, .animations = YOSHI_BLUE_ANIMS, .tattle = MSG_NpcTattle_JAN_ShopOwner, }, { .id = NPC_Yoshi_02, - .settings = &N(NpcSettings_Yoshi_Patrol), .pos = { -350.0f, 0.0f, -220.0f }, .yaw = 90, - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, - .init = &N(EVS_NpcInit_Yoshi_02), - .drops = NPC_NO_DROPS, .territory = { .patrol = { .isFlying = TRUE, @@ -856,17 +852,17 @@ StaticNpc N(NpcData_Toad)[] = { .detectSize = { 0 }, } }, + .init = &N(EVS_NpcInit_Yoshi_02), + .settings = &N(NpcSettings_Yoshi_Patrol), + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, + .drops = NO_DROPS, .animations = YOSHI_GREEN_ANIMS, .tattle = MSG_NpcTattle_GenericYoshi, }, { .id = NPC_Yoshi_03, - .settings = &N(NpcSettings_Yoshi_Patrol), .pos = { -100.0f, 0.0f, -80.0f }, .yaw = 270, - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, - .init = &N(EVS_NpcInit_Yoshi_03), - .drops = NPC_NO_DROPS, .territory = { .patrol = { .isFlying = TRUE, @@ -881,17 +877,17 @@ StaticNpc N(NpcData_Toad)[] = { .detectSize = { 0 }, } }, + .init = &N(EVS_NpcInit_Yoshi_03), + .settings = &N(NpcSettings_Yoshi_Patrol), + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, + .drops = NO_DROPS, .animations = YOSHI_YELLOW_ANIMS, .tattle = MSG_NpcTattle_FoodLovingYoshi, }, { .id = NPC_YoshiKid_01, - .settings = &N(NpcSettings_YoshiKid_Patrol), .pos = { -450.0f, 0.0f, -160.0f }, .yaw = 90, - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, - .init = &N(EVS_NpcInit_YoshiKid_01), - .drops = NPC_NO_DROPS, .territory = { .patrol = { .isFlying = TRUE, @@ -909,17 +905,17 @@ StaticNpc N(NpcData_Toad)[] = { .detectSize = { 0 }, } }, + .init = &N(EVS_NpcInit_YoshiKid_01), + .settings = &N(NpcSettings_YoshiKid_Patrol), + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, + .drops = NO_DROPS, .animations = YOSHI_KID_GREEN_ANIMS, .tattle = MSG_NpcTattle_GreenYoshiKid, }, { .id = NPC_YoshiKid_02, - .settings = &N(NpcSettings_YoshiKid_Patrol), .pos = { -340.0f, 0.0f, -385.0f }, .yaw = 90, - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, - .init = &N(EVS_NpcInit_YoshiKid_02), - .drops = NPC_NO_DROPS, .territory = { .patrol = { .isFlying = TRUE, @@ -935,17 +931,17 @@ StaticNpc N(NpcData_Toad)[] = { .detectSize = { 0 }, } }, + .init = &N(EVS_NpcInit_YoshiKid_02), + .settings = &N(NpcSettings_YoshiKid_Patrol), + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, + .drops = NO_DROPS, .animations = YOSHI_KID_RED_ANIMS, .tattle = MSG_NpcTattle_RedYoshiKid, }, { .id = NPC_YoshiKid_03, - .settings = &N(NpcSettings_YoshiKid_Patrol), .pos = { -260.0f, 0.0f, -220.0f }, .yaw = 270, - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, - .init = &N(EVS_NpcInit_YoshiKid_03), - .drops = NPC_NO_DROPS, .territory = { .patrol = { .isFlying = TRUE, @@ -961,17 +957,17 @@ StaticNpc N(NpcData_Toad)[] = { .detectSize = { 0 }, } }, + .init = &N(EVS_NpcInit_YoshiKid_03), + .settings = &N(NpcSettings_YoshiKid_Patrol), + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, + .drops = NO_DROPS, .animations = YOSHI_KID_BLUE_ANIMS, .tattle = MSG_NpcTattle_BlueYoshiKid, }, { .id = NPC_YoshiKid_04, - .settings = &N(NpcSettings_YoshiKid_Patrol), .pos = { -460.0f, 0.0f, 150.0f }, .yaw = 90, - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, - .init = &N(EVS_NpcInit_YoshiKid_04), - .drops = NPC_NO_DROPS, .territory = { .patrol = { .isFlying = TRUE, @@ -987,17 +983,17 @@ StaticNpc N(NpcData_Toad)[] = { .detectSize = { 0 }, } }, + .init = &N(EVS_NpcInit_YoshiKid_04), + .settings = &N(NpcSettings_YoshiKid_Patrol), + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, + .drops = NO_DROPS, .animations = YOSHI_KID_YELLOW_ANIMS, .tattle = MSG_NpcTattle_YellowYoshiKid, }, { .id = NPC_YoshiKid_05, - .settings = &N(NpcSettings_YoshiKid_Patrol), .pos = { -320.0f, 0.0f, 80.0f }, .yaw = 270, - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, - .init = &N(EVS_NpcInit_YoshiKid_05), - .drops = NPC_NO_DROPS, .territory = { .patrol = { .isFlying = TRUE, @@ -1013,85 +1009,89 @@ StaticNpc N(NpcData_Toad)[] = { .detectSize = { 0 }, } }, + .init = &N(EVS_NpcInit_YoshiKid_05), + .settings = &N(NpcSettings_YoshiKid_Patrol), + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, + .drops = NO_DROPS, .animations = YOSHI_KID_PURPLE_ANIMS, .tattle = MSG_NpcTattle_PurpleYoshiKid, }, }; -s32 N(ExtraAnims_Raven)[] = { +AnimID N(ExtraAnims_Raven)[] = { ANIM_Raven_Still, ANIM_Raven_Idle, ANIM_Raven_Talk, - -1 + ANIM_LIST_END }; -StaticNpc N(NpcData_Ravens)[] = { +NpcData N(NpcData_Ravens)[] = { { .id = NPC_Raven_01, - .settings = &N(NpcSettings_Raven), .pos = { -650.0f, 374.0f, -150.0f }, .yaw = 90, - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_Raven), - .drops = NPC_NO_DROPS, + .settings = &N(NpcSettings_Raven), + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, + .drops = NO_DROPS, .animations = RAVEN_ANIMS, .extraAnimations = N(ExtraAnims_Raven), .tattle = MSG_NpcTattle_RavenA, }, { .id = NPC_Raven_02, - .settings = &N(NpcSettings_Raven), .pos = { -645.0f, 457.0f, -255.0f }, .yaw = 90, - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_Raven), - .drops = NPC_NO_DROPS, + .settings = &N(NpcSettings_Raven), + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, + .drops = NO_DROPS, .animations = RAVEN_ANIMS, }, { .id = NPC_Raven_03, - .settings = &N(NpcSettings_Raven), .pos = { -570.0f, 374.0f, -300.0f }, .yaw = 90, - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_Raven), - .drops = NPC_NO_DROPS, + .settings = &N(NpcSettings_Raven), + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, + .drops = NO_DROPS, .animations = RAVEN_ANIMS, .tattle = MSG_NpcTattle_RavenC, }, { .id = NPC_Raven_04, - .settings = &N(NpcSettings_Raven), .pos = { -500.0f, 374.0f, -285.0f }, .yaw = 270, - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_Raven), - .drops = NPC_NO_DROPS, + .settings = &N(NpcSettings_Raven), + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, + .drops = NO_DROPS, .animations = RAVEN_ANIMS, .tattle = MSG_NpcTattle_RavenD, }, { .id = NPC_Raven_05, - .settings = &N(NpcSettings_Raven), .pos = { -450.0f, 374.0f, -175.0f }, .yaw = 270, - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_Raven), - .drops = NPC_NO_DROPS, + .settings = &N(NpcSettings_Raven), + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, + .drops = NO_DROPS, .animations = RAVEN_ANIMS, .tattle = MSG_NpcTattle_RavenE, }, }; -StaticNpc N(NpcData_ChuckQuizmo) = { +NpcData N(NpcData_ChuckQuizmo) = { .id = NPC_ChuckQuizmo, - .settings = &N(NpcSettings_ChuckQuizmo), .pos = { 300.0f, 0.0f, 400.0f }, .yaw = 90, - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, .initVarCount = 1, .initVar = { .bytes = { 0, QUIZ_AREA_JAN, QUIZ_COUNT_JAN, QUIZ_MAP_JAN_03 }}, - .drops = NPC_NO_DROPS, + .settings = &N(NpcSettings_ChuckQuizmo), + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, + .drops = NO_DROPS, .animations = QUIZMO_ANIMS, .tattle = MSG_NpcTattle_ChuckQuizmo, }; diff --git a/src/world/area_jan/jan_04/jan_04_2_main.c b/src/world/area_jan/jan_04/jan_04_2_main.c index 3cd8e02e0f..e2ecbb041c 100644 --- a/src/world/area_jan/jan_04/jan_04_2_main.c +++ b/src/world/area_jan/jan_04/jan_04_2_main.c @@ -1,7 +1,6 @@ #include "jan_04.h" #include "world/common/atomic/TexturePan.inc.c" -#include "world/common/atomic/TexturePan.data.inc.c" EvtScript N(EVS_GotoMap_kmr_24_0) = { EVT_CALL(FadeOutMusic, 0, 1500) @@ -74,7 +73,7 @@ EvtScript N(EVS_Main) = { EVT_EXEC(N(EVS_UpdateTexturePan)) EVT_END_THREAD EVT_CALL(GetDemoState, LVar0) - EVT_IF_NE(LVar0, 0) + EVT_IF_NE(LVar0, DEMO_STATE_NONE) EVT_EXEC_WAIT(N(EVS_PlayDemoScene)) EVT_RETURN EVT_END_IF diff --git a/src/world/area_jan/jan_04/jan_04_4_npc.c b/src/world/area_jan/jan_04/jan_04_4_npc.c index bffb930391..5cff5dad80 100644 --- a/src/world/area_jan/jan_04/jan_04_4_npc.c +++ b/src/world/area_jan/jan_04/jan_04_4_npc.c @@ -250,78 +250,78 @@ EvtScript N(EVS_NpcInit_Bubulb) = { EVT_END }; -StaticNpc N(NpcData_Characters)[] = { +NpcData N(NpcData_Characters)[] = { { .id = NPC_Sushie, - .settings = &N(NpcSettings_Sushie), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 90, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_Sushie), - .drops = NPC_NO_DROPS, + .settings = &N(NpcSettings_Sushie), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_400000, + .drops = NO_DROPS, .animations = SUSHIE_ANIMS, }, { .id = NPC_Bubulb, - .settings = &N(NpcSettings_Bubulb), .pos = { -230.0f, 0.0f, -320.0f }, .yaw = 90, - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_Bubulb), - .drops = NPC_NO_DROPS, + .settings = &N(NpcSettings_Bubulb), + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_400000, + .drops = NO_DROPS, .animations = BUBULB_YELLOW_ANIMS, .tattle = MSG_NpcTattle_JAN_Bubulb_Revealed, }, }; -StaticNpc N(NpcData_YoshiKids)[] = { +NpcData N(NpcData_YoshiKids)[] = { { .id = NPC_YoshiKid_01, - .settings = &N(NpcSettings_YoshiKid), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 90, + .settings = &N(NpcSettings_YoshiKid), .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4, - .drops = NPC_NO_DROPS, + .drops = NO_DROPS, .animations = YOSHI_KID_GREEN_ANIMS, .tattle = MSG_NpcTattle_GreenYoshiKid, }, { .id = NPC_YoshiKid_02, - .settings = &N(NpcSettings_YoshiKid), .pos = { 45.0f, 0.0f, -70.0f }, .yaw = 90, + .settings = &N(NpcSettings_YoshiKid), .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4, - .drops = NPC_NO_DROPS, + .drops = NO_DROPS, .animations = YOSHI_KID_RED_ANIMS, .tattle = MSG_NpcTattle_RedYoshiKid, }, { .id = NPC_YoshiKid_03, - .settings = &N(NpcSettings_YoshiKid), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 90, + .settings = &N(NpcSettings_YoshiKid), .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4, - .drops = NPC_NO_DROPS, + .drops = NO_DROPS, .animations = YOSHI_KID_BLUE_ANIMS, .tattle = MSG_NpcTattle_BlueYoshiKid, }, { .id = NPC_YoshiKid_04, - .settings = &N(NpcSettings_YoshiKid), .pos = { 20.0f, 0.0f, -70.0f }, .yaw = 270, + .settings = &N(NpcSettings_YoshiKid), .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4, - .drops = NPC_NO_DROPS, + .drops = NO_DROPS, .animations = YOSHI_KID_YELLOW_ANIMS, .tattle = MSG_NpcTattle_YellowYoshiKid, }, { .id = NPC_YoshiKid_05, - .settings = &N(NpcSettings_YoshiKid), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 90, + .settings = &N(NpcSettings_YoshiKid), .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4, - .drops = NPC_NO_DROPS, + .drops = NO_DROPS, .animations = YOSHI_KID_PURPLE_ANIMS, .tattle = MSG_NpcTattle_PurpleYoshiKid, }, diff --git a/src/world/area_jan/jan_05/jan_05_2_main.c b/src/world/area_jan/jan_05/jan_05_2_main.c index 488a2ba440..5281f21594 100644 --- a/src/world/area_jan/jan_05/jan_05_2_main.c +++ b/src/world/area_jan/jan_05/jan_05_2_main.c @@ -1,7 +1,6 @@ #include "jan_05.h" #include "world/common/atomic/TexturePan.inc.c" -#include "world/common/atomic/TexturePan.data.inc.c" EvtScript N(EVS_ExitWalk_jan_03_1) = EVT_EXIT_WALK(60, jan_05_ENTRY_0, "jan_03", jan_03_ENTRY_1); EvtScript N(EVS_ExitWalk_jan_08_1) = EVT_EXIT_WALK(60, jan_05_ENTRY_1, "jan_08", jan_08_ENTRY_1); diff --git a/src/world/area_jan/jan_05/jan_05_5_npc.c b/src/world/area_jan/jan_05/jan_05_5_npc.c index f194c63e82..7bff0835e3 100644 --- a/src/world/area_jan/jan_05/jan_05_5_npc.c +++ b/src/world/area_jan/jan_05/jan_05_5_npc.c @@ -1,11 +1,11 @@ #include "jan_05.h" -#include "world/common/enemy/complete/MBush.inc.c" +#include "world/common/enemy/MBush.inc.c" #include "world/common/npc/YoshiKid.inc.c" -#include "world/common/enemy/complete/HeartPlant.inc.c" -#include "world/common/enemy/complete/HurtPlant.inc.c" -#include "world/common/enemy/complete/JungleFuzzy_Wander.inc.c" -#include "world/common/enemy/complete/SpearGuy_Wander.inc.c" +#include "world/common/enemy/HeartPlant.inc.c" +#include "world/common/enemy/HurtPlant.inc.c" +#include "world/common/enemy/JungleFuzzy_Wander.inc.c" +#include "world/common/enemy/SpearGuy_Wander.inc.c" EvtScript N(EVS_NpcIdle_JungleFuzzy) = { EVT_CALL(SetNpcPos, NPC_SELF, NPC_DISPOSE_LOCATION) @@ -219,33 +219,30 @@ EvtScript N(EVS_NpcInit_YoshiKid) = { EVT_END }; -StaticNpc N(NpcData_YoshiKid) = { +NpcData N(NpcData_YoshiKid) = { .id = NPC_YoshiKid, - .settings = &N(NpcSettings_YoshiKid), .pos = { -320.0f, 0.0f, 80.0f }, .yaw = 270, - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_YoshiKid), - .drops = NPC_NO_DROPS, + .settings = &N(NpcSettings_YoshiKid), + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_400000, + .drops = NO_DROPS, .animations = YOSHI_KID_PURPLE_ANIMS, .tattle = MSG_NpcTattle_PurpleYoshiKid, }; -s32 N(ExtraAnims_JungleFuzzy)[] = { +AnimID N(ExtraAnims_JungleFuzzy)[] = { ANIM_Fuzzy_Jungle_Idle, ANIM_Fuzzy_Jungle_Walk, ANIM_Fuzzy_Jungle_Run, ANIM_Fuzzy_Jungle_Hurt, - -1 + ANIM_LIST_END }; -StaticNpc N(NpcData_JungleFuzzy) = { +NpcData N(NpcData_JungleFuzzy) = { .id = NPC_JungleFuzzy, - .settings = &N(NpcSettings_JungleFuzzy_Wander), .pos = { 0.0f, 0.0f, 0.0f }, .yaw = 270, - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_400000, - .init = &N(EVS_NpcInit_JungleFuzzy), .territory = { .wander = { .isFlying = TRUE, @@ -258,13 +255,16 @@ StaticNpc N(NpcData_JungleFuzzy) = { .detectSize = { 200 }, } }, + .init = &N(EVS_NpcInit_JungleFuzzy), + .settings = &N(NpcSettings_JungleFuzzy_Wander), + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_400000, .drops = JUNGLE_FUZZY_DROPS, .animations = JUNGLE_FUZZY_ANIMS, .extraAnimations = N(ExtraAnims_JungleFuzzy), .aiDetectFlags = AI_DETECT_SIGHT | AI_DETECT_SENSITIVE_MOTION, }; -StaticNpc N(NpcData_SpearGuy)[] = { +NpcData N(NpcData_SpearGuy)[] = { { .id = NPC_SpearGuy, .pos = { 0.0f, 0.0f, 0.0f }, @@ -287,29 +287,29 @@ StaticNpc N(NpcData_SpearGuy)[] = { SPEAR_GUY_HITBOX(NPC_SpearGuy_Hitbox) }; -StaticNpc N(NpcData_HeartPlant) = { +NpcData N(NpcData_HeartPlant) = { .id = NPC_HeartPlant, - .settings = &N(NpcSettings_HeartPlant), .pos = { 430.0f, 0.0f, 205.0f }, .yaw = 270, + .settings = &N(NpcSettings_HeartPlant), .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_8000 | ENEMY_FLAG_400000, - .drops = NPC_NO_DROPS, + .drops = NO_DROPS, .animations = HEART_PLANT_ANIMS, .tattle = MSG_NpcTattle_HeartPlant, }; -StaticNpc N(NpcData_HurtPlant) = { +NpcData N(NpcData_HurtPlant) = { .id = NPC_HurtPlant, .pos = { 375.0f, 0.0f, 260.0f }, .yaw = 270, HURT_PLANT_NPC_DATA }; -StaticNpc N(NpcData_MBush) = { +NpcData N(NpcData_MBush) = { .id = NPC_MBush, - .settings = &N(NpcSettings_MBush), .pos = { 400.0f, 0.0f, -75.0f }, .yaw = 90, + .settings = &N(NpcSettings_MBush), .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_8000 | ENEMY_FLAG_400000, .drops = MBUSH_DROPS, .animations = MBUSH_ANIMS, diff --git a/src/world/area_jan/jan_06/jan_06_1_main.c b/src/world/area_jan/jan_06/jan_06_1_main.c index b5d07e78c3..9c490e1a2e 100644 --- a/src/world/area_jan/jan_06/jan_06_1_main.c +++ b/src/world/area_jan/jan_06/jan_06_1_main.c @@ -1,7 +1,6 @@ #include "jan_06.h" #include "world/common/atomic/TexturePan.inc.c" -#include "world/common/atomic/TexturePan.data.inc.c" EvtScript N(EVS_ExitWalk_jan_05_3) = EVT_EXIT_WALK(60, jan_06_ENTRY_0, "jan_05", jan_05_ENTRY_3); EvtScript N(EVS_ExitWalk_jan_07_0) = EVT_EXIT_WALK(60, jan_06_ENTRY_1, "jan_07", jan_07_ENTRY_0); diff --git a/src/world/area_jan/jan_06/jan_06_6_npc.c b/src/world/area_jan/jan_06/jan_06_6_npc.c index f7b3894c1e..b6ef939adf 100644 --- a/src/world/area_jan/jan_06/jan_06_6_npc.c +++ b/src/world/area_jan/jan_06/jan_06_6_npc.c @@ -1,25 +1,22 @@ #include "jan_06.h" -#include "world/common/enemy/complete/JungleFuzzy_Wander.inc.c" -#include "world/common/enemy/complete/HeartPlant.inc.c" -#include "world/common/enemy/complete/HurtPlant.inc.c" -#include "world/common/enemy/complete/SpearGuy_Wander.inc.c" +#include "world/common/enemy/JungleFuzzy_Wander.inc.c" +#include "world/common/enemy/HeartPlant.inc.c" +#include "world/common/enemy/HurtPlant.inc.c" +#include "world/common/enemy/SpearGuy_Wander.inc.c" -s32 N(ExtraAnims_JungleFuzzy)[] = { +AnimID N(ExtraAnims_JungleFuzzy)[] = { ANIM_Fuzzy_Blue_Idle, ANIM_Fuzzy_Blue_Walk, ANIM_Fuzzy_Blue_Run, ANIM_Fuzzy_Blue_Hurt, - -1 + ANIM_LIST_END }; -StaticNpc N(NpcData_JungleFuzzy) = { +NpcData N(NpcData_JungleFuzzy) = { .id = NPC_JungleFuzzy, - .settings = &N(NpcSettings_JungleFuzzy_Wander), .pos = { 310.0f, 24.0f, 35.0f }, .yaw = 270, - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_400000, - .drops = JUNGLE_FUZZY_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -32,12 +29,15 @@ StaticNpc N(NpcData_JungleFuzzy) = { .detectSize = { 150 }, } }, + .settings = &N(NpcSettings_JungleFuzzy_Wander), + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_400000, + .drops = JUNGLE_FUZZY_DROPS, .animations = JUNGLE_FUZZY_ANIMS, .extraAnimations = N(ExtraAnims_JungleFuzzy), .aiDetectFlags = AI_DETECT_SIGHT | AI_DETECT_SENSITIVE_MOTION, }; -s32 N(ExtraAnims_SpearGuy_Custom)[] = { +AnimID N(ExtraAnims_SpearGuy_Custom)[] = { ANIM_SpearGuy_Anim03, ANIM_SpearGuy_Anim04, ANIM_SpearGuy_Anim05, @@ -50,10 +50,10 @@ s32 N(ExtraAnims_SpearGuy_Custom)[] = { ANIM_SpearGuy_Anim0D, ANIM_SpearGuy_Anim1A, ANIM_SpearGuy_Anim1B, - -1 + ANIM_LIST_END }; -StaticNpc N(NpcData_SpearGuy)[] = { +NpcData N(NpcData_SpearGuy)[] = { { .id = NPC_SpearGuy, .pos = { -298.0f, 35.0f, 37.0f }, @@ -80,18 +80,18 @@ StaticNpc N(NpcData_SpearGuy)[] = { SPEAR_GUY_HITBOX(NPC_SpearGuy_Hitbox), }; -StaticNpc N(NpcData_HeartPlant) = { +NpcData N(NpcData_HeartPlant) = { .id = NPC_HeartPlant, .pos = { 410.0f, 0.0f, -30.0f }, .yaw = 270, .settings = &N(NpcSettings_HeartPlant), .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_8000 | ENEMY_FLAG_400000, - .drops = NPC_NO_DROPS, + .drops = NO_DROPS, .animations = HEART_PLANT_ANIMS, .tattle = MSG_NpcTattle_HeartPlant, }; -StaticNpc N(NpcData_HurtPlant_01) = { +NpcData N(NpcData_HurtPlant_01) = { .id = NPC_HurtPlant_01, .pos = { 110.0f, 0.0f, 55.0f }, .yaw = 90, @@ -102,7 +102,7 @@ StaticNpc N(NpcData_HurtPlant_01) = { .tattle = MSG_NpcTattle_HeartPlant, }; -StaticNpc N(NpcData_HurtPlant_02) = { +NpcData N(NpcData_HurtPlant_02) = { .id = NPC_HurtPlant_02, .pos = { -430.0f, 0.0f, -80.0f }, .yaw = 90, diff --git a/src/world/area_jan/jan_07/jan_07_3_npc.c b/src/world/area_jan/jan_07/jan_07_3_npc.c index 7b59a58b27..7705b01ff2 100644 --- a/src/world/area_jan/jan_07/jan_07_3_npc.c +++ b/src/world/area_jan/jan_07/jan_07_3_npc.c @@ -2,7 +2,7 @@ #include "world/common/npc/YoshiKid.inc.c" -#include "world/common/enemy/complete/PutridPiranha.h" +#include "world/common/enemy/PutridPiranha.h" NpcSettings N(NpcSettings_PutridPiranha) = { .height = 24, @@ -10,7 +10,7 @@ NpcSettings N(NpcSettings_PutridPiranha) = { .level = 99, }; -#include "world/common/enemy/complete/SpearGuy_Wander.inc.c" +#include "world/common/enemy/SpearGuy_Wander.inc.c" EvtScript N(EVS_YoshiKid_CryForHelp) = { EVT_SET(AF_JAN_02, FALSE) @@ -287,14 +287,11 @@ EvtScript N(EVS_NpcInit_SpearGuy_Hitbox) = { EVT_END }; -StaticNpc N(NpcData_SpearGuy)[] = { +NpcData N(NpcData_SpearGuy)[] = { { .id = NPC_SpearGuy, - .settings = &N(NpcSettings_SpearGuy_Wander), .pos = { -28.0f, 0.0f, 13.0f }, .yaw = 90, - .flags = ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, - .drops = SPEAR_GUY_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -307,51 +304,54 @@ StaticNpc N(NpcData_SpearGuy)[] = { .detectSize = { 150 }, } }, + .settings = &N(NpcSettings_SpearGuy_Wander), + .flags = ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = SPEAR_GUY_DROPS, .animations = SPEAR_GUY_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT | AI_DETECT_SENSITIVE_MOTION, }, { .id = NPC_SpearGuy_Hitbox, - .settings = &N(NpcSettings_SpearGuy_Hitbox), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_SpearGuy_Hitbox), - .drops = NPC_NO_DROPS, + .settings = &N(NpcSettings_SpearGuy_Hitbox), + .flags = ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = NO_DROPS, .animations = SPEAR_GUY_ANIMS, }, }; -StaticNpc N(NpcData_PutridPiranhas)[] = { +NpcData N(NpcData_PutridPiranhas)[] = { { .id = NPC_PutridPiranha_01, - .settings = &N(NpcSettings_PutridPiranha), .pos = { -20.0f, 0.0f, 20.0f }, .yaw = 90, - .flags = ENEMY_FLAG_100 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS, .init = &N(EVS_NpcInit_PutridPiranha), - .drops = NPC_NO_DROPS, + .settings = &N(NpcSettings_PutridPiranha), + .flags = ENEMY_FLAG_100 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS, + .drops = NO_DROPS, .animations = PUTRID_PIRANHA_ANIMS, }, { .id = NPC_PutridPiranha_02, - .settings = &N(NpcSettings_PutridPiranha), .pos = { 80.0f, 0.0f, 20.0f }, .yaw = 270, + .settings = &N(NpcSettings_PutridPiranha), .flags = ENEMY_FLAG_100 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS, - .drops = NPC_NO_DROPS, + .drops = NO_DROPS, .animations = PUTRID_PIRANHA_ANIMS, }, }; -StaticNpc N(NpcData_YoshiKid) = { +NpcData N(NpcData_YoshiKid) = { .id = NPC_YoshiKid, - .settings = &N(NpcSettings_YoshiKid), .pos = { 30.0f, 0.0f, 20.0f }, .yaw = 90, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_800 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_YoshiKid), - .drops = NPC_NO_DROPS, + .settings = &N(NpcSettings_YoshiKid), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_800 | ENEMY_FLAG_400000, + .drops = NO_DROPS, .animations = YOSHI_KID_YELLOW_ANIMS, .tattle = MSG_NpcTattle_YellowYoshiKid, }; diff --git a/src/world/area_jan/jan_08/jan_08_2_main.c b/src/world/area_jan/jan_08/jan_08_2_main.c index 1f9d734bee..35a2a9a345 100644 --- a/src/world/area_jan/jan_08/jan_08_2_main.c +++ b/src/world/area_jan/jan_08/jan_08_2_main.c @@ -1,7 +1,6 @@ #include "jan_08.h" #include "world/common/atomic/TexturePan.inc.c" -#include "world/common/atomic/TexturePan.data.inc.c" EvtScript N(EVS_ExitWalk_jan_00_2) = EVT_EXIT_WALK(60, jan_08_ENTRY_0, "jan_00", jan_00_ENTRY_2); EvtScript N(EVS_ExitWalk_jan_05_1) = EVT_EXIT_WALK(60, jan_08_ENTRY_1, "jan_05", jan_05_ENTRY_1); diff --git a/src/world/area_jan/jan_08/jan_08_5_npc.c b/src/world/area_jan/jan_08/jan_08_5_npc.c index a46ba8fbd0..d85ca9be1d 100644 --- a/src/world/area_jan/jan_08/jan_08_5_npc.c +++ b/src/world/area_jan/jan_08/jan_08_5_npc.c @@ -1,11 +1,11 @@ #include "jan_08.h" #include "world/common/npc/YoshiKid.inc.c" -#include "world/common/enemy/complete/MBush.inc.c" -#include "world/common/enemy/complete/HeartPlant.inc.c" +#include "world/common/enemy/MBush.inc.c" +#include "world/common/enemy/HeartPlant.inc.c" -#include "world/common/enemy/complete/HurtPlant.inc.c" -#include "world/common/enemy/complete/SpearGuy_Wander.inc.c" +#include "world/common/enemy/HurtPlant.inc.c" +#include "world/common/enemy/SpearGuy_Wander.inc.c" EvtScript N(EVS_YoshiKid_CryForHelp) = { EVT_SET(AF_JAN_02, FALSE) @@ -140,7 +140,7 @@ EvtScript N(EVS_NpcInit_MBush_01) = { EVT_END }; -StaticNpc N(NpcData_SpearGuy)[] = { +NpcData N(NpcData_SpearGuy)[] = { { .id = NPC_SpearGuy, .pos = { 255.0f, 15.0f, -65.0f }, @@ -163,50 +163,50 @@ StaticNpc N(NpcData_SpearGuy)[] = { SPEAR_GUY_HITBOX(NPC_SpearGuy_Hitbox) }; -StaticNpc N(NpcData_HurtPlant) = { +NpcData N(NpcData_HurtPlant) = { .id = NPC_HurtPlant, .pos = { 400.0f, 0.0f, 235.0f }, .yaw = 270, HURT_PLANT_NPC_DATA }; -StaticNpc N(NpcData_MBush_01) = { +NpcData N(NpcData_MBush_01) = { .id = NPC_MBush_01, - .init = &N(EVS_NpcInit_MBush_01), .pos = { -407.0f, 0.0f, -42.0f }, .yaw = 90, MBUSH_NPC_DATA + .init = &N(EVS_NpcInit_MBush_01), }; -StaticNpc N(NpcData_MBush_02) = { +NpcData N(NpcData_MBush_02) = { .id = NPC_MBush_02, .pos = { -120.0f, 0.0f, -395.0f }, .yaw = 90, MBUSH_NPC_DATA }; -StaticNpc N(NpcData_HeartPlant_01) = { +NpcData N(NpcData_HeartPlant_01) = { .id = NPC_HeartPlant_01, .pos = { -219.0f, 0.0f, 420.0f }, .yaw = 270, HEART_PLANT_NPC_DATA }; -StaticNpc N(NpcData_HeartPlant_02) = { +NpcData N(NpcData_HeartPlant_02) = { .id = NPC_HeartPlant_02, .pos = { -157.0f, 0.0f, 452.0f }, .yaw = 270, HEART_PLANT_NPC_DATA }; -StaticNpc N(NpcData_YoshiKid) = { +NpcData N(NpcData_YoshiKid) = { .id = NPC_YoshiKid, .pos = { -450.0f, 0.0f, -290.0f }, .yaw = 90, - .settings = &N(NpcSettings_YoshiKid), .init = &N(EVS_NpcInit_YoshiKid), + .settings = &N(NpcSettings_YoshiKid), .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_400000, - .drops = NPC_NO_DROPS, + .drops = NO_DROPS, .animations = YOSHI_KID_RED_ANIMS, .tattle = MSG_NpcTattle_RedYoshiKid, }; diff --git a/src/world/area_jan/jan_09/jan_09_1_main.c b/src/world/area_jan/jan_09/jan_09_1_main.c index be70b27b2c..a054433c59 100644 --- a/src/world/area_jan/jan_09/jan_09_1_main.c +++ b/src/world/area_jan/jan_09/jan_09_1_main.c @@ -3,7 +3,6 @@ #include "world/common/entity/Pipe.inc.c" #include "world/common/atomic/TexturePan.inc.c" -#include "world/common/atomic/TexturePan.data.inc.c" EvtScript N(EVS_ExitWalk_jan_10_0) = EVT_EXIT_WALK(60, jan_09_ENTRY_2, "jan_10", jan_10_ENTRY_0); EvtScript N(EVS_ExitWalk_jan_08_2) = EVT_EXIT_WALK(60, jan_09_ENTRY_0, "jan_08", jan_08_ENTRY_2); diff --git a/src/world/area_jan/jan_09/jan_09_3_npc.c b/src/world/area_jan/jan_09/jan_09_3_npc.c index 79a9278af0..a4aa4c93d0 100644 --- a/src/world/area_jan/jan_09/jan_09_3_npc.c +++ b/src/world/area_jan/jan_09/jan_09_3_npc.c @@ -1,16 +1,13 @@ #include "jan_09.h" -#include "world/common/enemy/complete/MBush.inc.c" -#include "world/common/enemy/complete/SpearGuy_Wander.inc.c" +#include "world/common/enemy/MBush.inc.c" +#include "world/common/enemy/SpearGuy_Wander.inc.c" -StaticNpc N(NpcData_SpearGuy)[] = { +NpcData N(NpcData_SpearGuy)[] = { { .id = NPC_SpearGuy, - .settings = &N(NpcSettings_SpearGuy_Wander), .pos = { -200.0f, 90.0f, -330.0f }, .yaw = 90, - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, - .drops = SPEAR_GUY_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -23,20 +20,23 @@ StaticNpc N(NpcData_SpearGuy)[] = { .detectSize = { 212, 100 }, } }, + .settings = &N(NpcSettings_SpearGuy_Wander), + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .drops = SPEAR_GUY_DROPS, .animations = SPEAR_GUY_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT | AI_DETECT_SENSITIVE_MOTION, }, SPEAR_GUY_HITBOX(NPC_SpearGuy_Hitbox) }; -StaticNpc N(NpcData_MBush_01) = { +NpcData N(NpcData_MBush_01) = { .id = NPC_MBush_01, .pos = { 335.0f, 0.0f, -40.0f }, .yaw = 90, MBUSH_NPC_DATA }; -StaticNpc N(NpcData_MBush_02) = { +NpcData N(NpcData_MBush_02) = { .id = NPC_MBush_02, .pos = { 415.0f, 0.0f, -65.0f }, .yaw = 90, diff --git a/src/world/area_jan/jan_10/jan_10_2_main.c b/src/world/area_jan/jan_10/jan_10_2_main.c index 91682b6e05..7f800231d0 100644 --- a/src/world/area_jan/jan_10/jan_10_2_main.c +++ b/src/world/area_jan/jan_10/jan_10_2_main.c @@ -1,7 +1,6 @@ #include "jan_10.h" #include "world/common/atomic/TexturePan.inc.c" -#include "world/common/atomic/TexturePan.data.inc.c" EvtScript N(EVS_ExitWalk_jan_09_2) = EVT_EXIT_WALK(60, jan_10_ENTRY_0, "jan_09", jan_09_ENTRY_2); diff --git a/src/world/area_jan/jan_10/jan_10_3_npc.c b/src/world/area_jan/jan_10/jan_10_3_npc.c index 1971a1b9c3..cdc63c42c8 100644 --- a/src/world/area_jan/jan_10/jan_10_3_npc.c +++ b/src/world/area_jan/jan_10/jan_10_3_npc.c @@ -1,6 +1,6 @@ #include "jan_10.h" -#include "world/common/enemy/complete/JungleFuzzy_Wander.inc.c" +#include "world/common/enemy/JungleFuzzy_Wander.inc.c" #include "world/common/npc/YoshiKid.inc.c" EvtScript N(EVS_NpcIdle_JungleFuzzy) = { @@ -104,26 +104,22 @@ EvtScript N(EVS_NpcInit_YoshiKid) = { EVT_END }; -StaticNpc N(NpcData_YoshiKid) = { +NpcData N(NpcData_YoshiKid) = { .id = NPC_YoshiKid, - .settings = &N(NpcSettings_YoshiKid), .pos = { -260.0f, 0.0f, -220.0f }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_800 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_YoshiKid), - .drops = NPC_NO_DROPS, + .settings = &N(NpcSettings_YoshiKid), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_800 | ENEMY_FLAG_400000, + .drops = NO_DROPS, .animations = YOSHI_KID_BLUE_ANIMS, .tattle = MSG_NpcTattle_BlueYoshiKid, }; -StaticNpc N(NpcData_JungleFuzzy) = { +NpcData N(NpcData_JungleFuzzy) = { .id = NPC_JungleFuzzy, - .settings = &N(NpcSettings_JungleFuzzy_Wander), .pos = { 0.0f, 0.0f, 0.0f }, .yaw = 270, - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_400000, - .init = &N(EVS_NpcInit_JungleFuzzy), - .drops = JUNGLE_FUZZY_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -136,6 +132,10 @@ StaticNpc N(NpcData_JungleFuzzy) = { .detectSize = { 200 }, } }, + .init = &N(EVS_NpcInit_JungleFuzzy), + .settings = &N(NpcSettings_JungleFuzzy_Wander), + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_400000, + .drops = JUNGLE_FUZZY_DROPS, .animations = JUNGLE_FUZZY_ANIMS, }; diff --git a/src/world/area_jan/jan_11/jan_11_3_npc.c b/src/world/area_jan/jan_11/jan_11_3_npc.c index 68b7701480..8dc4a07833 100644 --- a/src/world/area_jan/jan_11/jan_11_3_npc.c +++ b/src/world/area_jan/jan_11/jan_11_3_npc.c @@ -120,14 +120,14 @@ EvtScript N(EVS_NpcInit_YoshiKid) = { EVT_END }; -StaticNpc N(NpcData_YoshiKid) = { +NpcData N(NpcData_YoshiKid) = { .id = NPC_YoshiKid, .pos = { -450.0f, 0.0f, -160.0f }, .yaw = 90, .init = &N(EVS_NpcInit_YoshiKid), .settings = &N(NpcSettings_YoshiKid), .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_800 | ENEMY_FLAG_400000, - .drops = NPC_NO_DROPS, + .drops = NO_DROPS, .animations = YOSHI_KID_GREEN_ANIMS, .tattle = MSG_NpcTattle_GreenYoshiKid, }; diff --git a/src/world/area_jan/jan_12/jan_12_5_npc.c b/src/world/area_jan/jan_12/jan_12_5_npc.c index 87eb74b637..f1db7d6b77 100644 --- a/src/world/area_jan/jan_12/jan_12_5_npc.c +++ b/src/world/area_jan/jan_12/jan_12_5_npc.c @@ -1,8 +1,8 @@ #include "jan_12.h" -#include "world/common/enemy/complete/SpearGuy_Wander.inc.c" +#include "world/common/enemy/SpearGuy_Wander.inc.c" -StaticNpc N(NpcData_SpearGuy)[] = { +NpcData N(NpcData_SpearGuy)[] = { { .id = NPC_SpearGuy, .pos = { 165.0f, 0.0f, 15.0f }, diff --git a/src/world/area_jan/jan_14/jan_14_4_npc.c b/src/world/area_jan/jan_14/jan_14_4_npc.c index 099508bb91..7aafd0e9eb 100644 --- a/src/world/area_jan/jan_14/jan_14_4_npc.c +++ b/src/world/area_jan/jan_14/jan_14_4_npc.c @@ -1,10 +1,10 @@ #include "jan_14.h" -#include "world/common/enemy/complete/JungleFuzzy.h" +#include "world/common/enemy/JungleFuzzy.h" // uses base fuzzy includes instead of JungleFuzzy! -#include "world/common/enemy/complete/Fuzzy_Wander.inc.c" -#include "world/common/enemy/complete/Fuzzy.inc.c" +#include "world/common/enemy/Fuzzy_Wander.inc.c" +#include "world/common/enemy/Fuzzy.inc.c" EvtScript N(EVS_NpcIdle_JungleFuzzy) = { EVT_LABEL(0) @@ -38,25 +38,25 @@ EvtScript N(EVS_NpcInit_JungleFuzzy) = { EVT_END }; -StaticNpc N(NpcData_JungleFuzzy_01) = { +NpcData N(NpcData_JungleFuzzy_01) = { .id = NPC_JungleFuzzy_01, - .settings = &N(NpcSettings_Fuzzy), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 270, - .flags = ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_JungleFuzzy), + .settings = &N(NpcSettings_Fuzzy), + .flags = ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .drops = JUNGLE_FUZZY_DROPS, .animations = JUNGLE_FUZZY_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT | AI_DETECT_SENSITIVE_MOTION, }; -StaticNpc N(NpcData_JungleFuzzy_02) = { +NpcData N(NpcData_JungleFuzzy_02) = { .id = NPC_JungleFuzzy_02, - .settings = &N(NpcSettings_Fuzzy), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 270, - .flags = ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_JungleFuzzy), + .settings = &N(NpcSettings_Fuzzy), + .flags = ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .drops = JUNGLE_FUZZY_DROPS, .animations = JUNGLE_FUZZY_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT | AI_DETECT_SENSITIVE_MOTION, diff --git a/src/world/area_jan/jan_15/jan_15_2_npc.c b/src/world/area_jan/jan_15/jan_15_2_npc.c index 3515221935..dd22b5bde6 100644 --- a/src/world/area_jan/jan_15/jan_15_2_npc.c +++ b/src/world/area_jan/jan_15/jan_15_2_npc.c @@ -1,7 +1,7 @@ #include "jan_15.h" -#include "world/common/enemy/complete/PutridPiranhaSentinel.inc.c" -#include "world/common/enemy/complete/HeartPlant.inc.c" +#include "world/common/enemy/PutridPiranhaSentinel.inc.c" +#include "world/common/enemy/HeartPlant.inc.c" EvtScript N(EVS_PutridPiranhas_IdleChomping) = { EVT_CHILD_THREAD @@ -174,55 +174,55 @@ EvtScript N(EVS_NpcInit_PutridPiranha) = { EVT_END }; -StaticNpc N(NpcData_Piranhas)[] = { +NpcData N(NpcData_Piranhas)[] = { { .id = NPC_PutridPiranha_01, - .settings = &N(NpcSettings_PutridPiranhaSentinel), .pos = { 365.0f, 0.0f, -45.0f }, .yaw = 270, - .flags = ENEMY_FLAG_800 | ENEMY_FLAG_40000, .init = &N(EVS_NpcInit_PutridPiranha), - .drops = PIRANHA_SENTINEL_DROPS, + .settings = &N(NpcSettings_PutridPiranhaSentinel), + .flags = ENEMY_FLAG_800 | ENEMY_FLAG_40000, + .drops = PIRANHA_NO_DROPS, .animations = PIRANHA_SENTINEL_ANIMS, }, { .id = NPC_PutridPiranha_02, - .settings = &N(NpcSettings_PutridPiranhaSentinel), .pos = { 325.0f, 0.0f, 0.0f }, .yaw = 270, + .settings = &N(NpcSettings_PutridPiranhaSentinel), .flags = ENEMY_FLAG_800 | ENEMY_FLAG_40000, - .drops = PIRANHA_SENTINEL_DROPS, + .drops = PIRANHA_NO_DROPS, .animations = PIRANHA_SENTINEL_ANIMS, }, { .id = NPC_PutridPiranha_03, - .settings = &N(NpcSettings_PutridPiranhaSentinel), .pos = { 375.0f, 0.0f, 45.0f }, .yaw = 270, + .settings = &N(NpcSettings_PutridPiranhaSentinel), .flags = ENEMY_FLAG_800 | ENEMY_FLAG_40000, - .drops = PIRANHA_SENTINEL_DROPS, + .drops = PIRANHA_NO_DROPS, .animations = PIRANHA_SENTINEL_ANIMS, }, }; -StaticNpc N(NpcData_HeartPlant_01) = { +NpcData N(NpcData_HeartPlant_01) = { .id = NPC_HeartPlant_01, - .settings = &N(NpcSettings_HeartPlant), .pos = { -183.0f, 0.0f, 47.0f }, .yaw = 270, + .settings = &N(NpcSettings_HeartPlant), .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_800 | ENEMY_FLAG_8000 | ENEMY_FLAG_400000, - .drops = NPC_NO_DROPS, + .drops = NO_DROPS, .animations = HEART_PLANT_ANIMS, .tattle = MSG_NpcTattle_HeartPlant, }; -StaticNpc N(NpcData_HeartPlant_02) = { +NpcData N(NpcData_HeartPlant_02) = { .id = NPC_HeartPlant_02, - .settings = &N(NpcSettings_HeartPlant), .pos = { -124.0f, 0.0f, 20.0f }, .yaw = 270, + .settings = &N(NpcSettings_HeartPlant), .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_800 | ENEMY_FLAG_8000 | ENEMY_FLAG_400000, - .drops = NPC_NO_DROPS, + .drops = NO_DROPS, .animations = HEART_PLANT_ANIMS, .tattle = MSG_NpcTattle_HeartPlant, }; diff --git a/src/world/area_jan/jan_16/jan_16_3_npc.c b/src/world/area_jan/jan_16/jan_16_3_npc.c index 09a83a3c3f..78658eeb18 100644 --- a/src/world/area_jan/jan_16/jan_16_3_npc.c +++ b/src/world/area_jan/jan_16/jan_16_3_npc.c @@ -191,7 +191,7 @@ EvtScript N(EVS_NpcInteract_RaphaelRaven) = { EVT_CALL(SetNpcSpeed, NPC_RaphaelRaven, EVT_FLOAT(4.0)) EVT_CALL(NpcMoveTo, NPC_SELF, 340, 270, 0) EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_GRAVITY, FALSE) - EVT_CALL(SetNpcPos, NPC_SELF, 0, -1000, 0) + EVT_CALL(SetNpcPos, NPC_SELF, NPC_DISPOSE_LOCATION) EVT_CALL(ResetCam, CAM_DEFAULT, 5) EVT_SET(GB_StoryProgress, STORY_CH5_RAFAEL_MOVED_ROOT) EVT_CALL(DisablePlayerInput, FALSE) @@ -217,19 +217,15 @@ EvtScript N(EVS_NpcInit_RaphaelRaven) = { EVT_END }; -StaticNpc N(NpcData_RaphaelRaven)[] = { +NpcData N(NpcData_RaphaelRaven)[] = { { .id = NPC_RaphaelRaven, - .settings = &N(NpcSettings_RaphaelRaven), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_GRAVITY | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_RaphaelRaven), - .drops = { - .dropFlags = NPC_DROP_FLAG_80, - .heartDrops = NO_DROPS, - .flowerDrops = NO_DROPS, - }, + .settings = &N(NpcSettings_RaphaelRaven), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_GRAVITY | ENEMY_FLAG_400000, + .drops = NO_DROPS, .animations = { .idle = ANIM_RaphaelRaven_Idle, .walk = ANIM_RaphaelRaven_Idle, @@ -252,16 +248,12 @@ StaticNpc N(NpcData_RaphaelRaven)[] = { }, { .id = NPC_Raven_01, - .settings = &N(NpcSettings_Raven), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 90, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400, .init = &N(EVS_NpcInit_Raven), - .drops = { - .dropFlags = NPC_DROP_FLAG_80, - .heartDrops = NO_DROPS, - .flowerDrops = NO_DROPS, - }, + .settings = &N(NpcSettings_Raven), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400, + .drops = NO_DROPS, .animations = { .idle = ANIM_Raven_Idle, .walk = ANIM_Raven_Idle, @@ -284,16 +276,12 @@ StaticNpc N(NpcData_RaphaelRaven)[] = { }, { .id = NPC_Raven_02, - .settings = &N(NpcSettings_Raven), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 90, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400, .init = &N(EVS_NpcInit_Raven), - .drops = { - .dropFlags = NPC_DROP_FLAG_80, - .heartDrops = NO_DROPS, - .flowerDrops = NO_DROPS, - }, + .settings = &N(NpcSettings_Raven), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400, + .drops = NO_DROPS, .animations = { .idle = ANIM_Raven_Idle, .walk = ANIM_Raven_Idle, @@ -316,16 +304,12 @@ StaticNpc N(NpcData_RaphaelRaven)[] = { }, { .id = NPC_Raven_03, - .settings = &N(NpcSettings_Raven), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 90, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400, .init = &N(EVS_NpcInit_Raven), - .drops = { - .dropFlags = NPC_DROP_FLAG_80, - .heartDrops = NO_DROPS, - .flowerDrops = NO_DROPS, - }, + .settings = &N(NpcSettings_Raven), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400, + .drops = NO_DROPS, .animations = { .idle = ANIM_Raven_Idle, .walk = ANIM_Raven_Idle, @@ -348,16 +332,12 @@ StaticNpc N(NpcData_RaphaelRaven)[] = { }, { .id = NPC_Raven_04, - .settings = &N(NpcSettings_Raven), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 90, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400, .init = &N(EVS_NpcInit_Raven), - .drops = { - .dropFlags = NPC_DROP_FLAG_80, - .heartDrops = NO_DROPS, - .flowerDrops = NO_DROPS, - }, + .settings = &N(NpcSettings_Raven), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400, + .drops = NO_DROPS, .animations = { .idle = ANIM_Raven_Idle, .walk = ANIM_Raven_Idle, @@ -380,16 +360,12 @@ StaticNpc N(NpcData_RaphaelRaven)[] = { }, { .id = NPC_Raven_05, - .settings = &N(NpcSettings_Raven), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 90, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400, .init = &N(EVS_NpcInit_Raven), - .drops = { - .dropFlags = NPC_DROP_FLAG_80, - .heartDrops = NO_DROPS, - .flowerDrops = NO_DROPS, - }, + .settings = &N(NpcSettings_Raven), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400, + .drops = NO_DROPS, .animations = { .idle = ANIM_Raven_Idle, .walk = ANIM_Raven_Idle, diff --git a/src/world/area_jan/jan_22/jan_22_3_npc.c b/src/world/area_jan/jan_22/jan_22_3_npc.c index 6a8843de06..f8814f78eb 100644 --- a/src/world/area_jan/jan_22/jan_22_3_npc.c +++ b/src/world/area_jan/jan_22/jan_22_3_npc.c @@ -1,7 +1,7 @@ #include "jan_22.h" #include "world/common/npc/Kolorado.inc.c" -#include "world/common/enemy/complete/SpearGuy_Patrol.inc.c" +#include "world/common/enemy/SpearGuy_Patrol.inc.c" #include "world/common/npc/RaphaelRaven.inc.c" #include "world/common/npc/Raven.inc.c" #include "world/common/npc/StarSpirit.inc.c" @@ -1079,9 +1079,9 @@ EvtScript N(EVS_NpcIdle_SpearGuy) = { EVT_IF_EQ(LVar9, 0) EVT_THREAD EVT_WAIT(40) - EVT_CALL(ShowSweat, 0, 1, -45, 1, 0, 0, 0, 0, 20) + EVT_CALL(ShowSweat, NPC_Kolorado_01, 1, -45, EMOTER_NPC, 0, 0, 0, 0, 20) EVT_END_THREAD - EVT_CALL(ShowSweat, 0, 1, 45, 1, 0, 0, 0, 0, 20) + EVT_CALL(ShowSweat, NPC_Kolorado_01, 1, 45, EMOTER_NPC, 0, 0, 0, 0, 20) EVT_SET(LVar9, 3) EVT_ELSE EVT_SUB(LVar9, 1) @@ -1416,54 +1416,54 @@ EvtScript N(EVS_NpcInit_Misstar) = { EVT_END }; -StaticNpc N(NpcData_Kolorado)[] = { +NpcData N(NpcData_Kolorado)[] = { { .id = NPC_Kolorado_01, - .settings = &N(NpcSettings_Kolorado), .pos = { -100.0f, 0.0f, 10.0f }, .yaw = 90, - .flags = ENEMY_FLAG_100 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_20000000, .init = &N(EVS_NpcInit_Kolorado_HeldCaptive), - .drops = NPC_NO_DROPS, + .settings = &N(NpcSettings_Kolorado), + .flags = ENEMY_FLAG_100 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_20000000, + .drops = NO_DROPS, .animations = KOLORADO_ANIMS, .tattle = MSG_NpcTattle_Kolorado, }, { .id = NPC_Kolorado_02, - .settings = &N(NpcSettings_Kolorado), .pos = { -100.0f, 0.0f, 10.0f }, .yaw = 90, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_Kolorado_WaitingToExplore), - .drops = NPC_NO_DROPS, + .settings = &N(NpcSettings_Kolorado), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000, + .drops = NO_DROPS, .animations = KOLORADO_ANIMS, .tattle = MSG_NpcTattle_Kolorado, }, { .id = NPC_ZiplineDummy1, - .settings = &N(NpcSettings_Dummy), .pos = { -100.0f, 0.0f, 10.0f }, .yaw = 90, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_200000, .init = &N(EVS_NpcInit_ZiplineDummy), - .drops = NPC_NO_DROPS, + .settings = &N(NpcSettings_Dummy), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_200000, + .drops = NO_DROPS, .animations = KOLORADO_ANIMS, .tattle = MSG_NpcTattle_Kolorado, }, { .id = NPC_ZiplineDummy2, - .settings = &N(NpcSettings_Dummy), .pos = { -100.0f, 0.0f, 10.0f }, .yaw = 90, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_200000, .init = &N(EVS_NpcInit_ZiplineDummy), - .drops = NPC_NO_DROPS, + .settings = &N(NpcSettings_Dummy), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_200000, + .drops = NO_DROPS, .animations = KOLORADO_ANIMS, .tattle = MSG_NpcTattle_Kolorado, }, }; -StaticNpc N(NpcData_SpearGuy) = { +NpcData N(NpcData_SpearGuy) = { .id = NPC_SpearGuy, .pos = { -70.0f, 0.0f, 10.0f }, .yaw = 270, @@ -1482,22 +1482,22 @@ StaticNpc N(NpcData_SpearGuy) = { .detectSize = { 100 }, } }, + .init = &N(EVS_NpcInit_SpearGuy), .settings = &N(NpcSettings_SpearGuy_Patrol), .flags = ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_40000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS, - .init = &N(EVS_NpcInit_SpearGuy), - .drops = NPC_NO_DROPS, + .drops = NO_DROPS, .animations = SPEAR_GUY_ANIMS, }; -StaticNpc N(NpcData_RaphaelRaven)[] = { +NpcData N(NpcData_RaphaelRaven)[] = { { .id = NPC_RaphaelRaven, .pos = { NPC_DISPOSE_LOCATION }, .yaw = 270, + .init = &N(EVS_NpcInit_RaphaelRaven), .settings = &N(NpcSettings_RaphaelRaven), .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_400000, - .init = &N(EVS_NpcInit_RaphaelRaven), - .drops = NPC_NO_DROPS, + .drops = NO_DROPS, .animations = RAPHAEL_RAVEN_ANIMS, .tattle = MSG_NpcTattle_RaphaelRaven, }, @@ -1505,10 +1505,10 @@ StaticNpc N(NpcData_RaphaelRaven)[] = { .id = NPC_Raven_01, .pos = { NPC_DISPOSE_LOCATION }, .yaw = 270, + .init = &N(EVS_NpcInit_Raven), .settings = &N(NpcSettings_Raven), .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400, - .init = &N(EVS_NpcInit_Raven), - .drops = NPC_NO_DROPS, + .drops = NO_DROPS, .animations = RAVEN_ANIMS, .tattle = MSG_NpcTattle_RavenA, }, @@ -1518,7 +1518,7 @@ StaticNpc N(NpcData_RaphaelRaven)[] = { .yaw = 270, .settings = &N(NpcSettings_Raven), .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400, - .drops = NPC_NO_DROPS, + .drops = NO_DROPS, .animations = RAVEN_ANIMS, }, { @@ -1527,7 +1527,7 @@ StaticNpc N(NpcData_RaphaelRaven)[] = { .yaw = 270, .settings = &N(NpcSettings_Raven), .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400, - .drops = NPC_NO_DROPS, + .drops = NO_DROPS, .animations = RAVEN_ANIMS, .tattle = MSG_NpcTattle_RavenC, }, @@ -1537,7 +1537,7 @@ StaticNpc N(NpcData_RaphaelRaven)[] = { .yaw = 270, .settings = &N(NpcSettings_Raven), .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400, - .drops = NPC_NO_DROPS, + .drops = NO_DROPS, .animations = RAVEN_ANIMS, .tattle = MSG_NpcTattle_RavenD, }, @@ -1547,20 +1547,20 @@ StaticNpc N(NpcData_RaphaelRaven)[] = { .yaw = 270, .settings = &N(NpcSettings_Raven), .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400, - .drops = NPC_NO_DROPS, + .drops = NO_DROPS, .animations = RAVEN_ANIMS, .tattle = MSG_NpcTattle_RavenE, }, }; -StaticNpc N(NpcData_Misstar) = { +NpcData N(NpcData_Misstar) = { .id = NPC_Misstar, - .settings = &N(NpcSettings_StarSpirit), .pos = { 1075.0f, 120.0f, 130.0f }, .yaw = 90, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_Misstar), - .drops = NPC_NO_DROPS, + .settings = &N(NpcSettings_StarSpirit), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_400000, + .drops = NO_DROPS, .animations = MISSTAR_ANIMS, }; diff --git a/src/world/area_jan/jan_23/jan_23_3_npc.c b/src/world/area_jan/jan_23/jan_23_3_npc.c index 65804ab973..e34d64c804 100644 --- a/src/world/area_jan/jan_23/jan_23_3_npc.c +++ b/src/world/area_jan/jan_23/jan_23_3_npc.c @@ -205,7 +205,7 @@ EvtScript N(EVS_Raven4_MoveToMeetingPos) = { EvtScript N(EVS_Raven5_Sweat) = { EVT_LABEL(0) - EVT_CALL(ShowSweat, NPC_Raven_05, 1, -45, 1, 0, 0, 0, 0, 20) + EVT_CALL(ShowSweat, NPC_Raven_05, 1, -45, EMOTER_NPC, 0, 0, 0, 0, 20) EVT_WAIT(8) EVT_GOTO(0) EVT_RETURN @@ -588,69 +588,69 @@ EvtScript N(EVS_NpcInit_Raven_05) = { EVT_END }; -StaticNpc N(NpcData_Ravens)[] = { +NpcData N(NpcData_Ravens)[] = { { .id = NPC_RaphaelRaven, - .settings = &N(NpcSettings_RaphaelRaven), .pos = { 590.0f, 210.0f, 0.0f }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_GRAVITY, .init = &N(EVS_NpcInit_RaphaelRaven), - .drops = NPC_NO_DROPS, + .settings = &N(NpcSettings_RaphaelRaven), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_GRAVITY, + .drops = NO_DROPS, .animations = RAPHAEL_RAVEN_ANIMS, .tattle = MSG_NpcTattle_RaphaelRaven, }, { .id = NPC_Raven_01, - .settings = &N(NpcSettings_Raven), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400, .init = &N(EVS_NpcInit_Raven_01), - .drops = NPC_NO_DROPS, + .settings = &N(NpcSettings_Raven), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400, + .drops = NO_DROPS, .animations = RAVEN_ANIMS, .tattle = MSG_NpcTattle_RavenA, }, { .id = NPC_Raven_02, - .settings = &N(NpcSettings_Raven), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400, .init = &N(EVS_NpcInit_Raven_02), - .drops = NPC_NO_DROPS, + .settings = &N(NpcSettings_Raven), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400, + .drops = NO_DROPS, .animations = RAVEN_ANIMS, }, { .id = NPC_Raven_03, - .settings = &N(NpcSettings_Raven), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400, .init = &N(EVS_NpcInit_Raven_03), - .drops = NPC_NO_DROPS, + .settings = &N(NpcSettings_Raven), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400, + .drops = NO_DROPS, .animations = RAVEN_ANIMS, .tattle = MSG_NpcTattle_RavenC, }, { .id = NPC_Raven_04, - .settings = &N(NpcSettings_Raven), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400, .init = &N(EVS_NpcInit_Raven_04), - .drops = NPC_NO_DROPS, + .settings = &N(NpcSettings_Raven), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400, + .drops = NO_DROPS, .animations = RAVEN_ANIMS, .tattle = MSG_NpcTattle_RavenD, }, { .id = NPC_Raven_05, - .settings = &N(NpcSettings_Raven), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400, .init = &N(EVS_NpcInit_Raven_05), - .drops = NPC_NO_DROPS, + .settings = &N(NpcSettings_Raven), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400, + .drops = NO_DROPS, .animations = RAVEN_ANIMS, .tattle = MSG_NpcTattle_RavenE, }, diff --git a/src/world/area_kgr/kgr.h b/src/world/area_kgr/kgr.h index ca669c8f3d..6c8e5a5b85 100644 --- a/src/world/area_kgr/kgr.h +++ b/src/world/area_kgr/kgr.h @@ -2,22 +2,22 @@ #define _WORLD_AREA_KGR_KGR_H_ enum { - AB_KGR_0 = AreaByte(0), - AB_KGR_1 = AreaByte(1), - AB_KGR_2 = AreaByte(2), - AB_KGR_3 = AreaByte(3), - AB_KGR_4 = AreaByte(4), - AB_KGR_5 = AreaByte(5), - AB_KGR_6 = AreaByte(6), - AB_KGR_7 = AreaByte(7), - AB_KGR_8 = AreaByte(8), - AB_KGR_9 = AreaByte(9), - AB_KGR_A = AreaByte(10), - AB_KGR_B = AreaByte(11), - AB_KGR_C = AreaByte(12), - AB_KGR_D = AreaByte(13), - AB_KGR_E = AreaByte(14), - AB_KGR_F = AreaByte(15), + AB_KGR_Unused_0 = AreaByte(0), + AB_KGR_Unused_1 = AreaByte(1), + AB_KGR_Unused_2 = AreaByte(2), + AB_KGR_Unused_3 = AreaByte(3), + AB_KGR_Unused_4 = AreaByte(4), + AB_KGR_Unused_5 = AreaByte(5), + AB_KGR_Unused_6 = AreaByte(6), + AB_KGR_Unused_7 = AreaByte(7), + AB_KGR_Unused_8 = AreaByte(8), + AB_KGR_Unused_9 = AreaByte(9), + AB_KGR_Unused_A = AreaByte(10), + AB_KGR_Unused_B = AreaByte(11), + AB_KGR_Unused_C = AreaByte(12), + AB_KGR_Unused_D = AreaByte(13), + AB_KGR_Unused_E = AreaByte(14), + AB_KGR_Unused_F = AreaByte(15), }; #define AF_KGR(index) AreaFlag(index) diff --git a/src/world/area_kgr/kgr_02/kgr_02_3_npc.c b/src/world/area_kgr/kgr_02/kgr_02_3_npc.c index 1e4d07e47b..f84092c2f5 100644 --- a/src/world/area_kgr/kgr_02/kgr_02_3_npc.c +++ b/src/world/area_kgr/kgr_02/kgr_02_3_npc.c @@ -286,17 +286,13 @@ NpcSettings N(NpcSettings_Fuzzipede) = { .unk_24 = 100, }; -StaticNpc N(NpcData_Fuzzipede) = { +NpcData N(NpcData_Fuzzipede) = { .id = NPC_Fuzzipede, - .settings = &N(NpcSettings_Fuzzipede), .pos = { 333.0f, -10.0f, -130.0f }, .yaw = 90, + .settings = &N(NpcSettings_Fuzzipede), .flags = ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_800 | ENEMY_FLAG_8000 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_10000000, - .drops = { - .dropFlags = NPC_DROP_FLAG_80, - .heartDrops = NO_DROPS, - .flowerDrops = NO_DROPS, - }, + .drops = NO_DROPS, .animations = { .idle = ANIM_Fuzzipede_Anim04, }, diff --git a/src/world/common/todo/UnkGooberFunc.inc.c b/src/world/area_kkj/common/ApproachPlayer100Units.inc.c similarity index 58% rename from src/world/common/todo/UnkGooberFunc.inc.c rename to src/world/area_kkj/common/ApproachPlayer100Units.inc.c index d9bcea9509..0164d0305b 100644 --- a/src/world/common/todo/UnkGooberFunc.inc.c +++ b/src/world/area_kkj/common/ApproachPlayer100Units.inc.c @@ -1,7 +1,7 @@ #include "common.h" #include "npc.h" -ApiStatus N(UnkGooberFunc)(Evt* script, s32 isInitialCall) { +ApiStatus N(ApproachPlayer100Units)(Evt* script, s32 isInitialCall) { PlayerStatus* playerStatus = &gPlayerStatus; Bytecode* args = script->ptrReadPos; s32 npcID = evt_get_variable(script, *args++); @@ -9,26 +9,26 @@ ApiStatus N(UnkGooberFunc)(Evt* script, s32 isInitialCall) { s32 outVar2 = *args++; s32 outVar3 = *args++; Npc* npc = resolve_npc(script, npcID); - s32 phi_s4; + s32 isCloseToPlayer; f32 angle; - f32 x; - f32 z; + f32 posX; + f32 posZ; if (npc == NULL) { return ApiStatus_DONE2; } if (dist2D(playerStatus->position.x, playerStatus->position.z, npc->pos.x, npc->pos.z) < 100.0f) { - phi_s4 = FALSE; + isCloseToPlayer = FALSE; } else { - phi_s4 = TRUE; + isCloseToPlayer = TRUE; } angle = clamp_angle(atan2(playerStatus->position.x, playerStatus->position.z, npc->pos.x, npc->pos.z)); - x = playerStatus->position.x + (sin_deg(angle) * 100.0f); - z = playerStatus->position.z - (cos_deg(angle) * 100.0f); - evt_set_variable(script, outVar1, phi_s4); - evt_set_variable(script, outVar2, x); - evt_set_variable(script, outVar3, z); + posX = playerStatus->position.x + (sin_deg(angle) * 100.0f); + posZ = playerStatus->position.z - (cos_deg(angle) * 100.0f); + evt_set_variable(script, outVar1, isCloseToPlayer); + evt_set_variable(script, outVar2, posX); + evt_set_variable(script, outVar3, posZ); return ApiStatus_DONE2; } diff --git a/src/world/common/todo/UnkGooberFunc50.inc.c b/src/world/area_kkj/common/ApproachPlayer50Units.inc.c similarity index 85% rename from src/world/common/todo/UnkGooberFunc50.inc.c rename to src/world/area_kkj/common/ApproachPlayer50Units.inc.c index ceac82633f..c7efac7fdb 100644 --- a/src/world/common/todo/UnkGooberFunc50.inc.c +++ b/src/world/area_kkj/common/ApproachPlayer50Units.inc.c @@ -1,8 +1,8 @@ #include "common.h" #include "npc.h" -// Similar to UnkGooberFunc but compares with 50.0f instead of 100.0f. TODO maybe turn into a define? -ApiStatus N(UnkGooberFunc50)(Evt* script, s32 isInitialCall) { +// Similar to ApproachPlayer100Units but compares with 50.0f instead of 100.0f. TODO maybe turn into a define? +API_CALLABLE(N(ApproachPlayer50Units)) { PlayerStatus* playerStatus = &gPlayerStatus; Bytecode* args = script->ptrReadPos; s32 npcID = evt_get_variable(script, *args++); diff --git a/src/world/area_kkj/common/RestoreFromPeachState.inc.c b/src/world/area_kkj/common/RestoreFromPeachState.inc.c new file mode 100644 index 0000000000..41b505c39f --- /dev/null +++ b/src/world/area_kkj/common/RestoreFromPeachState.inc.c @@ -0,0 +1,7 @@ +#include "common.h" + +API_CALLABLE(N(RestoreFromPeachState)) { + gGameStatusPtr->peachFlags &= ~PEACH_STATUS_FLAG_IS_PEACH; + gPlayerData.currentPartner = script->varTable[0]; + return ApiStatus_DONE2; +} diff --git a/src/world/common/atomic/UnkPhysicsFuncs.inc.c b/src/world/area_kkj/common/Searchlights.inc.c similarity index 53% rename from src/world/common/atomic/UnkPhysicsFuncs.inc.c rename to src/world/area_kkj/common/Searchlights.inc.c index b8c6c74f55..0134451f07 100644 --- a/src/world/common/atomic/UnkPhysicsFuncs.inc.c +++ b/src/world/area_kkj/common/Searchlights.inc.c @@ -2,7 +2,7 @@ #include "npc.h" #include "model.h" -ApiStatus N(UnkPhysicsFunc)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(UnkPhysicsFunc)) { PlayerStatus* playerStatus = &gPlayerStatus; Npc* npc = get_npc_unsafe(script->owner1.enemy->npcID); Bytecode* args = script->ptrReadPos; @@ -16,6 +16,7 @@ ApiStatus N(UnkPhysicsFunc)(Evt* script, s32 isInitialCall) { f32 xDist; f32 zDist; s32 outVal; + s32 channel; add_vec2D_polar(&x, &z, r, npc->yaw); xDist = dist2D(x, 0.0f, playerStatus->position.x, 0.0f); @@ -42,11 +43,10 @@ ApiStatus N(UnkPhysicsFunc)(Evt* script, s32 isInitialCall) { // required to match, has to be r r = dist2D(npc->pos.x, npc->pos.z, playerStatus->position.x, playerStatus->position.z); - if (npc_test_move_taller_with_slipping(0x78000, &x, &y, &z, r, - atan2(npc->pos.x, npc->pos.z, playerStatus->position.x, - playerStatus->position.z), - npc->collisionRadius, - npc->collisionHeight)) + channel = COLLISION_IGNORE_ENTITIES | COLLISION_CHANNEL_20000 | COLLISION_CHANNEL_10000 | COLLISION_CHANNEL_8000; + if (npc_test_move_taller_with_slipping(channel, &x, &y, &z, r, + atan2(npc->pos.x, npc->pos.z, playerStatus->position.x, playerStatus->position.z), + npc->collisionRadius, npc->collisionHeight)) { outVal = FALSE; } @@ -55,61 +55,68 @@ ApiStatus N(UnkPhysicsFunc)(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -void N(UnkModelMatrixFunc)(s32 treeIndex, f32 x, f32 y, f32 z, f32 scale) { - Matrix4f sp10; - Model* model = get_model_from_list_index(get_model_list_index_from_tree_index(treeIndex)); +void N(set_spotlight_pos_scale)(s32 modelID, f32 x, f32 y, f32 z, f32 scale) { + Matrix4f mtxTemp; + Model* model = get_model_from_list_index(get_model_list_index_from_tree_index(modelID)); guTranslateF(model->transformMatrix, x, y, z); - guScaleF(sp10, scale, 1.0f, scale); - guMtxCatF(sp10, model->transformMatrix, model->transformMatrix); + guScaleF(mtxTemp, scale, 1.0f, scale); + guMtxCatF(mtxTemp, model->transformMatrix, model->transformMatrix); model->flags |= MODEL_FLAG_USES_TRANSFORM_MATRIX | MODEL_FLAG_HAS_TRANSFORM_APPLIED; } -ApiStatus N(UnkModelMatrixFunc2)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(UpdateSearchlight)) { + SpriteShadingLightSource* lightSource; PlayerStatus* playerStatus = &gPlayerStatus; Npc* npc = get_npc_unsafe(script->owner1.enemy->npcID); + Bytecode* args = script->ptrReadPos; s32 outVar = *args++; - f32 r = *args++; - f32 distCheck1 = *args++; - f32 r2 = *args++; - f32 distCheck2 = *args++; - s32 treeIndex = *args++; + // radius and distance from NPC of the first spotlight + f32 radius = *args++; + f32 offsetDist = *args++; + // radius and distance from NPC of the second 'extra' spotlight + f32 extraRadius = *args++; + f32 extraOffsetDist = *args++; + // spotlight model and sprite shading light source index + s32 spotlightModel = *args++; s32 lightSourceIdx = *args++; + f32 x = npc->pos.x; f32 z = npc->pos.z; - SpriteShadingLightSource* ssls; - f32 y; + s32 outVal = 0; f32 dist; - s32 outVal; + f32 y; + // place light source 30 units ahead of the flashlight add_vec2D_polar(&x, &z, 30.0f, npc->yaw); - ssls = &D_80151328->sources[lightSourceIdx]; - ssls->pos.x = x; - ssls->pos.y = npc->pos.y + 20.0f; - ssls->pos.z = z; + lightSource = &D_80151328->sources[lightSourceIdx]; + lightSource->pos.x = x; + lightSource->pos.y = npc->pos.y + 20.0f; + lightSource->pos.z = z; + // check if player is inside the first spotlight x = npc->pos.x; z = npc->pos.z; - add_vec2D_polar(&x, &z, r, npc->yaw); + add_vec2D_polar(&x, &z, radius, npc->yaw); - if (dist2D(x, z, playerStatus->position.x, playerStatus->position.z) <= distCheck1) { - outVal = 1; - } else { - outVal = 0; + if (dist2D(x, z, playerStatus->position.x, playerStatus->position.z) <= offsetDist) { + outVal |= 1; } - N(UnkModelMatrixFunc)(treeIndex, x, npc->pos.y, z, (2.0 * distCheck1 / 100.0) + 0.3); + N(set_spotlight_pos_scale)(spotlightModel, x, npc->pos.y, z, (2.0 * offsetDist / 100.0) + 0.3); + // check if player is inside the second spotlight x = npc->pos.x; z = npc->pos.z; - add_vec2D_polar(&x, &z, r2, npc->yaw); + add_vec2D_polar(&x, &z, extraRadius, npc->yaw); - if (dist2D(x, z, playerStatus->position.x, playerStatus->position.z) <= distCheck2) { + if (dist2D(x, z, playerStatus->position.x, playerStatus->position.z) <= extraOffsetDist) { outVal |= 0x10; } + // cancel alert if enemy does not have line of sight to player if (outVal & 1) { x = npc->pos.x; y = npc->pos.y; @@ -117,9 +124,8 @@ ApiStatus N(UnkModelMatrixFunc2)(Evt* script, s32 isInitialCall) { dist = dist2D(npc->pos.x, npc->pos.z, playerStatus->position.x, playerStatus->position.z); if (npc_test_move_taller_with_slipping(0, &x, &y, &z, dist, - atan2(npc->pos.x, npc->pos.z, - playerStatus->position.x, playerStatus->position.z), - npc->collisionRadius, npc->collisionHeight)) { + atan2(npc->pos.x, npc->pos.z, playerStatus->position.x, playerStatus->position.z), + npc->collisionRadius, npc->collisionHeight)) { outVal = 0; } } @@ -128,14 +134,14 @@ ApiStatus N(UnkModelMatrixFunc2)(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -ApiStatus N(UnkAtan2Func)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(GetAngleBetweenPoints)) { Bytecode* args = script->ptrReadPos; s32 outVar = *args++; - s32 temp_s3 = evt_get_variable(script, *args++); - s32 temp_s2 = evt_get_variable(script, *args++); - s32 temp_s0_5 = evt_get_variable(script, *args++); - s32 temp = evt_get_variable(script, *args++); + s32 Ax = evt_get_variable(script, *args++); + s32 Az = evt_get_variable(script, *args++); + s32 Bx = evt_get_variable(script, *args++); + s32 Bz = evt_get_variable(script, *args++); - evt_set_variable(script, outVar, atan2(temp_s3, temp_s2, temp_s0_5, temp)); + evt_set_variable(script, outVar, atan2(Ax, Az, Bx, Bz)); return ApiStatus_DONE2; } diff --git a/src/world/area_kkj/common/SetAvailableDisguise.inc.c b/src/world/area_kkj/common/SetAvailableDisguise.inc.c new file mode 100644 index 0000000000..09c5bf083f --- /dev/null +++ b/src/world/area_kkj/common/SetAvailableDisguise.inc.c @@ -0,0 +1,8 @@ +#include "common.h" + +API_CALLABLE(N(SetAvailableDisguise)) { + Bytecode* args = script->ptrReadPos; + + gPlayerStatus.availableDisguiseType = evt_get_float_variable(script, *args++); + return ApiStatus_DONE2; +} diff --git a/src/world/area_kkj/common/SetPeachFlag8.inc.c b/src/world/area_kkj/common/SetPeachFlag8.inc.c new file mode 100644 index 0000000000..5d5d63c752 --- /dev/null +++ b/src/world/area_kkj/common/SetPeachFlag8.inc.c @@ -0,0 +1,8 @@ +#include "common.h" + +API_CALLABLE(N(SetPeachFlag8)) { + GameStatus* gameStatus = gGameStatusPtr; + + gameStatus->peachFlags |= PEACH_STATUS_FLAG_8; + return ApiStatus_DONE2; +} diff --git a/src/world/area_kkj/kkj.h b/src/world/area_kkj/kkj.h index d5b6973dd8..9aa5fb9d07 100644 --- a/src/world/area_kkj/kkj.h +++ b/src/world/area_kkj/kkj.h @@ -2,47 +2,92 @@ #define _WORLD_AREA_KKJ_KKJ_H_ enum { - 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), + CAKE_TYPE_NONE = 0, // cake has not been started + CAKE_TYPE_BEGUN = 1, // the cake has been imagined + CAKE_TYPE_READY_TO_MIX = 2, // added sugar and eggs + CAKE_TYPE_MIXED = 3, // mixed the batter + CAKE_TYPE_READY_TO_BAKE = 4, // added flour and butter + CAKE_TYPE_BAKED = 5, // baked in the oven + CAKE_TYPE_DONE = 6, // decorated }; -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; +enum { + AB_KKJ19_CurrentBakeStep = AreaByte(0), + AB_KKJ_CompletedBakeStep = AreaByte(1), + AB_KKJ19_HeldIngredient = AreaByte(2), + AB_KKJ19_BakeStepProgress = AreaByte(3), + AB_KKJ19_CookwareItemIdx = AreaByte(4), + AB_KKJ19_CakeItemIdx = AreaByte(5), + AB_KKJ29_AnsweringContestant = AreaByte(6), + AB_KKJ29_AnswerScore = AreaByte(7), + AB_KKJ29_LeftKoopatrolScore = AreaByte(8), + AB_KKJ29_PeachScore = AreaByte(9), + AB_KKJ29_RightKoopatrolScore = 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), +}; + +enum { + AF_KKJ_01 = AreaFlag(1), + AF_KKJ_02 = AreaFlag(2), + AF_KKJ_03 = AreaFlag(3), + AF_KKJ_04 = AreaFlag(4), + AF_KKJ_05 = AreaFlag(5), + AF_KKJ_06 = AreaFlag(6), + AF_KKJ_07 = AreaFlag(7), + AF_KKJ_08 = AreaFlag(8), + AF_KKJ19_FailedBakingTask = AreaFlag(9), + AF_KKJ19_AddedEgg = AreaFlag(10), + AF_KKJ19_AddedSugar = AreaFlag(11), + AF_KKJ19_AddedFlour = AreaFlag(12), + AF_KKJ19_AddedButter = AreaFlag(13), + AF_KKJ19_AddedNothingWrong = AreaFlag(14), + AB_KKJ19_AddedIcing = AreaFlag(15), + AB_KKJ19_AddedBerries = AreaFlag(16), + AF_KKJ_FinishedBakingCake = AreaFlag(17), + AF_KKJ19_CanTakeIngredients = AreaFlag(18), + AF_KKJ_13 = AreaFlag(19), + AF_KKJ_14 = AreaFlag(20), + AF_KKJ_15 = AreaFlag(21), + AF_KKJ_17 = AreaFlag(23), + AF_KKJ_18 = AreaFlag(24), + AF_KKJ_19 = AreaFlag(25), + AF_KKJ_1A = AreaFlag(26), +}; + +extern MapSettings kkj_00_settings; +extern MapSettings kkj_01_settings; +extern MapSettings kkj_02_settings; +extern MapSettings kkj_03_settings; +extern MapSettings kkj_10_settings; +extern MapSettings kkj_11_settings; +extern MapSettings kkj_12_settings; +extern MapSettings kkj_13_settings; +extern MapSettings kkj_14_settings; +extern MapSettings kkj_15_settings; +extern MapSettings kkj_16_settings; +extern MapSettings kkj_17_settings; +extern MapSettings kkj_18_settings; +extern MapSettings kkj_19_settings; +extern MapSettings kkj_20_settings; +extern MapSettings kkj_21_settings; +extern MapSettings kkj_22_settings; +extern MapSettings kkj_23_settings; +extern MapSettings kkj_24_settings; +extern MapSettings kkj_25_settings; +extern MapSettings kkj_26_settings; +extern MapSettings kkj_27_settings; +extern MapSettings kkj_28_settings; +extern MapSettings kkj_29_settings; + +s32 kkj_00_map_init(void); +s32 kkj_03_map_init(void); +s32 kkj_13_map_init(void); +s32 kkj_14_map_init(void); +s32 kkj_23_map_init(void); +s32 kkj_25_map_init(void); #endif diff --git a/src/world/area_kkj/kkj_00/ABB290.c b/src/world/area_kkj/kkj_00/ABB290.c deleted file mode 100644 index 1ccd541fab..0000000000 --- a/src/world/area_kkj/kkj_00/ABB290.c +++ /dev/null @@ -1,29 +0,0 @@ -#include "kkj_00.h" - -static char* N(exit_str_0) = "kkj_01"; -static char* N(exit_str_1) = "kkj_19"; - -extern SlideParams D_8024160C_ABC89C; -extern SlideParams D_8024162C_ABC8BC; - -ApiStatus func_80240000_ABB290(Evt* script, s32 isInitialCall) { - if (evt_get_variable(NULL, GB_StoryProgress) >= STORY_EPILOGUE) { - gGameStatusPtr->playerSpriteSet = PLAYER_SPRITES_COMBINED_EPILOGUE; - } - - return ApiStatus_BLOCK; -} - -ApiStatus func_80240040_ABB2D0(Evt* script, s32 isInitialCall) { - Bytecode* args = script->ptrReadPos; - PlayerStatus* status = &gPlayerStatus; - - if (evt_get_variable(script, *args++) == 0) { - status->slideParams = &D_8024160C_ABC89C; - } else { - status->slideParams = &D_8024162C_ABC8BC; - } - - status->flags |= PS_FLAG_SLIDING; - return ApiStatus_DONE2; -} diff --git a/src/world/area_kkj/kkj_00/ABB340.c b/src/world/area_kkj/kkj_00/ABB340.c deleted file mode 100644 index 741037f751..0000000000 --- a/src/world/area_kkj/kkj_00/ABB340.c +++ /dev/null @@ -1,25 +0,0 @@ -#include "kkj_00.h" - -#include "world/common/enemy/ai/PatrolNoAttackAI.inc.c" - -static char* N(exit_str) = "end_00"; - -ApiStatus func_80240F40_ABC1D0(Evt* script, s32 isInitialCall) { - if (isInitialCall) { - script->functionTemp[1] = 0; - } - - set_screen_overlay_color(0, 208, 208, 208); - set_screen_overlay_params_front(1, script->functionTemp[1]); - - if (script->functionTemp[1] == 255) { - return ApiStatus_DONE2; - } - - script->functionTemp[1] += 7; - if (script->functionTemp[1] > 255) { - script->functionTemp[1] = 255; - } - - return ApiStatus_BLOCK; -} diff --git a/src/world/area_kkj/kkj_00/kkj_00.h b/src/world/area_kkj/kkj_00/kkj_00.h index db16e4285c..10561966c6 100644 --- a/src/world/area_kkj/kkj_00/kkj_00.h +++ b/src/world/area_kkj/kkj_00/kkj_00.h @@ -2,8 +2,105 @@ /// @brief Peach's Castle - Intro Entry Hall (1F) #include "common.h" -#include "../kkj.h" #include "message_ids.h" #include "map.h" +#include "../kkj.h" +#include "mapfs/kkj_00_shape.h" +#include "mapfs/kkj_00_hit.h" + +#include "sprite/npc/Luigi.h" +#include "sprite/npc/Toad.h" +#include "sprite/npc/RussT.h" +#include "sprite/npc/ShiverToad.h" +#include "sprite/npc/Toadette.h" +#include "sprite/npc/Penguin.h" +#include "sprite/npc/ToadGuard.h" +#include "sprite/npc/ToadMinister.h" +#include "sprite/npc/TayceT.h" +#include "sprite/npc/WorldGoombario.h" +#include "sprite/npc/WorldKooper.h" +#include "sprite/npc/WorldBombette.h" +#include "sprite/npc/WorldParakarry.h" +#include "sprite/npc/WorldBow.h" +#include "sprite/npc/WorldWatt.h" +#include "sprite/npc/WorldSushie.h" +#include "sprite/npc/WorldLakilester.h" +#include "sprite/npc/Merlon.h" +#include "sprite/npc/Merluvlee.h" +#include "sprite/npc/Merlow.h" +#include "sprite/npc/WorldMerlee.h" +#include "sprite/npc/Merle.h" +#include "sprite/npc/Lakilulu.h" +#include "sprite/npc/Bootler.h" +#include "sprite/npc/Goompa.h" +#include "sprite/npc/Goombaria.h" +#include "sprite/npc/Yoshi.h" +#include "sprite/npc/Dryite.h" +#include "sprite/npc/Ninji.h" + +enum { + // intro + NPC_Luigi = 0, + NPC_Toad_01 = 1, + NPC_Toad_02 = 2, + NPC_Toad_03 = 3, + NPC_Toadette_01 = 4, + NPC_Toadette_02 = 5, + NPC_RussT_01 = 6, + NPC_ShiverToad_01 = 7, + NPC_Penguin_01 = 8, + NPC_ToadGuard_01 = 9, + NPC_ToadGuard_02 = 10, + // ending + NPC_Peach = 0, + NPC_ToadMinister = 1, + NPC_TayceT = 2, + NPC_RussT_02 = 3, + NPC_ShiverToad_02 = 4, + NPC_Goombario = 5, + NPC_Kooper = 6, + NPC_Bombette = 7, + NPC_Parakarry = 8, + NPC_Bow = 9, + NPC_Watt = 10, + NPC_Sushie = 11, + NPC_Lakilester = 12, + NPC_Merlon = 13, + NPC_Merluvlee = 14, + NPC_Merlow = 15, + NPC_Merlee = 16, + NPC_Merle = 17, + NPC_Lakilulu = 18, + NPC_Bootler = 19, + NPC_Goompa = 20, + NPC_Goombaria = 21, + NPC_Yoshi = 22, + NPC_Penguin_02 = 24, + NPC_Penguin_03 = 25, + NPC_Dryite = 26, + NPC_Ninji = 28, + NPC_Toad_04 = 31, + NPC_Toad_05 = 32, + NPC_Toad_06 = 33, + NPC_Toad_07 = 34, + NPC_Toadette_03 = 36, + NPC_Toadette_04 = 37, + NPC_Toadette_05 = 38, + NPC_Toadette_06 = 39, + NPC_ToadGuard_03 = 40, + NPC_ToadGuard_04 = 41, + NPC_ToadGuard_05 = 42, + NPC_ToadGuard_06 = 44, + NPC_ToadGuard_07 = 46, +}; + #define NAMESPACE kkj_00 + +extern EvtScript N(EVS_Main); +extern EvtScript N(EVS_SetupMusic); +extern EvtScript N(EVS_Scene_Intro); +extern EvtScript N(EVS_Scene_Ending); + +extern NpcGroupList N(IntroNPCs); +extern NpcGroupList N(EndingNPCs); diff --git a/src/world/area_kkj/kkj_00/kkj_00_0_header.c b/src/world/area_kkj/kkj_00/kkj_00_0_header.c new file mode 100644 index 0000000000..d90e14dd00 --- /dev/null +++ b/src/world/area_kkj/kkj_00/kkj_00_0_header.c @@ -0,0 +1,24 @@ +#include "kkj_00.h" + +s32 N(map_init)(void) { + if (evt_get_variable(NULL, GB_StoryProgress) >= STORY_EPILOGUE) { + gGameStatusPtr->playerSpriteSet = PLAYER_SPRITES_COMBINED_EPILOGUE; + } + return FALSE; +} + +EntryList N(Entrances) = { + [kkj_00_ENTRY_0] { 0.0, 0.0, 480.0, 0.0 }, + [kkj_00_ENTRY_1] { 0.0, 100.0, -365.0, 180.0 }, + [kkj_00_ENTRY_2] { -420.0, 40.0, -260.0, 135.0 }, + [kkj_00_ENTRY_3] { 230.0, 0.0, -210.0, 180.0 }, + [kkj_00_ENTRY_4] { 420.0, 40.0, -260.0, 225.0 }, + [kkj_00_ENTRY_5] { 0.0, 0.0, 480.0, 0.0 }, + [kkj_00_ENTRY_6] { 0.0, 0.0, 480.0, 0.0 }, +}; + +MapSettings N(settings) = { + .main = &N(EVS_Main), + .entryList = &N(Entrances), + .entryCount = ENTRY_COUNT(N(Entrances)), +}; diff --git a/src/world/area_kkj/kkj_00/kkj_00_1_music.c b/src/world/area_kkj/kkj_00/kkj_00_1_music.c new file mode 100644 index 0000000000..33288c3afa --- /dev/null +++ b/src/world/area_kkj/kkj_00/kkj_00_1_music.c @@ -0,0 +1,19 @@ +#include "kkj_00.h" + +EvtScript N(EVS_SetupMusic) = { + EVT_IF_EQ(GB_StoryProgress, STORY_INTRO) + EVT_CALL(GetEntryID, LVar0) + EVT_IF_EQ(LVar0, kkj_00_ENTRY_3) + EVT_CALL(SetMusicTrack, 0, SONG_PEACHS_CASTLE_PARTY, 1, 7) + EVT_WAIT(3) + EVT_END_IF + EVT_CALL(SetMusicTrack, 0, SONG_PEACHS_CASTLE_PARTY, 1, 8) + EVT_ELSE + EVT_THREAD + EVT_WAIT(90) + EVT_CALL(FadeOutMusic, 0, 3000) + EVT_END_THREAD + EVT_END_IF + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_kkj/kkj_00/kkj_00_2_main.c b/src/world/area_kkj/kkj_00/kkj_00_2_main.c new file mode 100644 index 0000000000..553574f6da --- /dev/null +++ b/src/world/area_kkj/kkj_00/kkj_00_2_main.c @@ -0,0 +1,169 @@ +#include "kkj_00.h" + +EvtScript N(D_80241140_ABC3D0) = { + EVT_SET_GROUP(EVT_GROUP_1B) + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(UseDoorSounds, DOOR_SOUNDS_LARGE) + EVT_SET(LVar0, kkj_00_ENTRY_1) + EVT_SET(LVar1, COLLIDER_ttn) + EVT_SET(LVar2, MODEL_door3) + EVT_SET(LVar3, MODEL_door4) + EVT_EXEC(ExitDoubleDoor) + EVT_WAIT(17) + EVT_CALL(GotoMap, EVT_PTR("kkj_01"), kkj_01_ENTRY_0) + EVT_WAIT(100) + EVT_RETURN + EVT_END +}; + +EvtScript N(D_802411F4_ABC484) = { + EVT_SET_GROUP(EVT_GROUP_1B) + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(UseDoorSounds, DOOR_SOUNDS_BASIC) + EVT_SET(LVar0, kkj_00_ENTRY_3) + EVT_SET(LVar1, COLLIDER_ttne) + EVT_SET(LVar2, MODEL_door8) + EVT_SET(LVar3, DOOR_SWING_OUT) + EVT_EXEC(ExitSingleDoor) + EVT_WAIT(17) + EVT_CALL(GotoMap, EVT_PTR("kkj_19"), kkj_19_ENTRY_0) + EVT_WAIT(100) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_ShowMessage_CantOpen) = { + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(ShowMessageAtScreenPos, MSG_Menus_Inspect_DoesntOpen, 160, 40) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_RETURN + EVT_END +}; + +EvtScript N(D_802412F0_ABC580) = { + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(EnableNpcAI, NPC_Luigi, FALSE) + EVT_CALL(EnableNpcAI, NPC_Toad_01, FALSE) + EVT_CALL(SetNpcAnimation, NPC_Luigi, ANIM_Luigi_Idle) + EVT_CALL(SetNpcAnimation, NPC_Toad_01, ANIM_Toad_Red_Idle) + EVT_WAIT(10) + EVT_CALL(SpeakToPlayer, NPC_Luigi, ANIM_Luigi_Talk, ANIM_Luigi_Idle, 16, MSG_Intro_0026) + EVT_CALL(EnableNpcAI, NPC_Luigi, TRUE) + EVT_CALL(EnableNpcAI, NPC_Toad_01, TRUE) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_RETURN + EVT_END +}; + +EvtScript N(D_802413C4_ABC654) = { + EVT_BIND_TRIGGER(EVT_PTR(N(D_802412F0_ABC580)), TRIGGER_WALL_PRESS_A, COLLIDER_tts, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ShowMessage_CantOpen)), TRIGGER_WALL_PRESS_A, COLLIDER_ttw, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ShowMessage_CantOpen)), TRIGGER_WALL_PRESS_A, COLLIDER_tte, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(D_80241140_ABC3D0)), TRIGGER_WALL_PRESS_A, COLLIDER_ttn, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(D_802411F4_ABC484)), TRIGGER_WALL_PRESS_A, COLLIDER_ttne, 1, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(D_80241460_ABC6F0) = { + EVT_CALL(UseDoorSounds, DOOR_SOUNDS_BASIC) + EVT_CALL(GetEntryID, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_EQ(kkj_00_ENTRY_0) + EVT_CALL(UseDoorSounds, DOOR_SOUNDS_LARGE) + EVT_SET(LVar2, MODEL_door2) + EVT_SET(LVar3, MODEL_door1) + EVT_EXEC_WAIT(EnterDoubleDoor) + EVT_CASE_EQ(kkj_00_ENTRY_1) + EVT_CALL(UseDoorSounds, DOOR_SOUNDS_LARGE) + EVT_SET(LVar2, MODEL_door3) + EVT_SET(LVar3, MODEL_door4) + EVT_EXEC_WAIT(EnterDoubleDoor) + EVT_CASE_EQ(kkj_00_ENTRY_2) + EVT_SET(LVar2, MODEL_door5) + EVT_SET(LVar3, DOOR_SWING_OUT) + EVT_EXEC_WAIT(EnterSingleDoor) + EVT_CASE_EQ(kkj_00_ENTRY_3) + EVT_SET(LVar2, MODEL_door8) + EVT_SET(LVar3, DOOR_SWING_OUT) + EVT_EXEC_WAIT(EnterSingleDoor) + EVT_CASE_EQ(kkj_00_ENTRY_4) + EVT_SET(LVar2, MODEL_door7) + EVT_SET(LVar3, DOOR_SWING_OUT) + EVT_EXEC_WAIT(EnterSingleDoor) + EVT_CASE_EQ(kkj_00_ENTRY_5) + EVT_EXEC(N(EVS_Scene_Intro)) + EVT_CASE_EQ(kkj_00_ENTRY_6) + EVT_EXEC(N(EVS_Scene_Ending)) + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +SlideParams N(SlideData1) = { + .heading = 358.5f, + .maxDescendAccel = 0.5f, + .launchVelocity = 20.0f, + .maxDescendVelocity = 0.0f, + .integrator = { 0.0, 0.0, 0.0, 0.0 }, +}; + +SlideParams N(SlideData2) = { + .heading = 1.5f, + .maxDescendAccel = 0.5f, + .launchVelocity = 20.0f, + .maxDescendVelocity = 0.0f, + .integrator = { 0.0, 0.0, 0.0, 0.0 }, +}; + +API_CALLABLE(N(func_80240040_ABB2D0)) { + Bytecode* args = script->ptrReadPos; + PlayerStatus* status = &gPlayerStatus; + + if (evt_get_variable(script, *args++) == 0) { + status->slideParams = &N(SlideData1); + } else { + status->slideParams = &N(SlideData2); + } + + status->flags |= PS_FLAG_SLIDING; + return ApiStatus_DONE2; +} + +EvtScript N(D_8024164C_ABC8DC) = { + EVT_CALL(N(func_80240040_ABB2D0), 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_8024166C) = { + EVT_CALL(N(func_80240040_ABB2D0), 1) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Main) = { + EVT_SET(GB_WorldLocation, LOCATION_PEACH_CASTLE_GROUNDS) + EVT_CALL(SetSpriteShading, SHADING_NONE) + EVT_SETUP_CAMERA_NO_LEAD() + EVT_IF_EQ(GB_StoryProgress, STORY_INTRO) + EVT_CALL(MakeNpcs, FALSE, EVT_PTR(N(IntroNPCs))) + EVT_ELSE + EVT_CALL(MakeNpcs, FALSE, EVT_PTR(N(EndingNPCs))) + EVT_END_IF + EVT_CALL(EnableGroup, MODEL_g2, FALSE) + EVT_CALL(EnableGroup, MODEL_g51, FALSE) + EVT_IF_EQ(GB_StoryProgress, STORY_INTRO) + EVT_CALL(SetMusicTrack, 0, SONG_PEACHS_CASTLE_PARTY, 1, 8) + EVT_ELSE + EVT_THREAD + EVT_WAIT(90) + EVT_CALL(FadeOutMusic, 0, 3000) + EVT_END_THREAD + EVT_END_IF + EVT_EXEC(N(D_802413C4_ABC654)) + EVT_EXEC(N(D_80241460_ABC6F0)) + EVT_WAIT(1) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_kkj/kkj_00/kkj_00_3_npc_intro.c b/src/world/area_kkj/kkj_00/kkj_00_3_npc_intro.c new file mode 100644 index 0000000000..13dc600ffb --- /dev/null +++ b/src/world/area_kkj/kkj_00/kkj_00_3_npc_intro.c @@ -0,0 +1,435 @@ +#include "kkj_00.h" + +#define NAME_SUFFIX _Intro + +#include "world/common/npc/Luigi.inc.c" +#include "world/common/npc/Toad_Patrol.inc.c" +#include "world/common/npc/Toad_Stationary.inc.c" +#include "world/common/npc/Penguin.inc.c" + +EvtScript N(EVS_NpcIdle_RussT) = { + EVT_LOOP(0) + EVT_CALL(GetSelfVar, 1, LVar0) + EVT_IF_EQ(LVar0, 0) + EVT_CALL(SetNpcAnimation, NPC_RussT_01, ANIM_RussT_Talk) + EVT_CALL(SetSelfVar, 1, 1) + EVT_ELSE + EVT_CALL(SetNpcAnimation, NPC_ShiverToad_01, ANIM_ShiverToad_Green_Talk) + EVT_CALL(SetSelfVar, 1, 0) + EVT_END_IF + EVT_CALL(RandInt, 60, LVar0) + EVT_ADD(LVar0, 30) + EVT_WAIT(LVar0) + EVT_CALL(SetNpcAnimation, NPC_RussT_01, ANIM_RussT_Idle) + EVT_CALL(SetNpcAnimation, NPC_ShiverToad_01, ANIM_ShiverToad_Green_Idle) + EVT_WAIT(10) + EVT_END_LOOP + EVT_END +}; + +EvtScript N(EVS_NpcIdle_Toadette_01) = { + EVT_LOOP(0) + EVT_CALL(GetSelfVar, 1, LVar0) + EVT_IF_EQ(LVar0, 0) + EVT_CALL(SetNpcAnimation, NPC_Toadette_01, ANIM_Toadette_Pink_Talk) + EVT_CALL(SetSelfVar, 1, 1) + EVT_ELSE + EVT_CALL(SetNpcAnimation, NPC_Toadette_02, ANIM_Toadette_Green_Talk) + EVT_CALL(SetSelfVar, 1, 0) + EVT_END_IF + EVT_CALL(RandInt, 60, LVar0) + EVT_ADD(LVar0, 30) + EVT_WAIT(LVar0) + EVT_CALL(SetNpcAnimation, NPC_Toadette_01, ANIM_Toadette_Pink_Idle) + EVT_CALL(SetNpcAnimation, NPC_Toadette_02, ANIM_Toadette_Green_Idle) + EVT_WAIT(10) + EVT_END_LOOP + EVT_END +}; + +EvtScript N(EVS_NpcIdle_Toad_01) = { + EVT_CALL(GetEntryID, LVar0) + EVT_IF_EQ(LVar0, kkj_00_ENTRY_5) + EVT_CALL(WaitForPlayerInputEnabled) + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_CALL(AwaitPlayerLeave, LVar0, LVar2, 100) + EVT_WAIT(50) + EVT_CALL(SetNpcSpeed, NPC_Toad_01, EVT_FLOAT(2.0)) + EVT_CALL(SetNpcAnimation, NPC_Toad_01, ANIM_Toad_Red_Walk) + EVT_CALL(NpcMoveTo, NPC_Toad_01, 60, 320, 0) + EVT_CALL(SetNpcAnimation, NPC_Toad_01, ANIM_Toad_Red_Idle) + EVT_END_IF + EVT_LOOP(0) + EVT_CALL(GetSelfVar, 1, LVar0) + EVT_IF_EQ(LVar0, 0) + EVT_CALL(SetNpcAnimation, NPC_Toad_01, ANIM_Toad_Red_Talk) + EVT_CALL(SetSelfVar, 1, 1) + EVT_ELSE + EVT_CALL(SetNpcAnimation, NPC_Luigi, ANIM_Luigi_Talk) + EVT_CALL(SetSelfVar, 1, 0) + EVT_END_IF + EVT_CALL(RandInt, 60, LVar0) + EVT_ADD(LVar0, 30) + EVT_WAIT(LVar0) + EVT_CALL(SetNpcAnimation, NPC_Luigi, ANIM_Luigi_Idle) + EVT_CALL(SetNpcAnimation, NPC_Toad_01, ANIM_Toad_Red_Idle) + EVT_WAIT(10) + EVT_END_LOOP + EVT_END +}; + +EvtScript N(EVS_NpcIdle_Toad_03) = { + EVT_LOOP(0) + EVT_WAIT(150) + EVT_LOOP(2) + EVT_CALL(InterpNpcYaw, NPC_SELF, 90, 7) + EVT_WAIT(20) + EVT_CALL(InterpNpcYaw, NPC_SELF, 270, 7) + EVT_WAIT(20) + EVT_END_LOOP + EVT_END_LOOP + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInteract_Luigi) = { + EVT_CALL(EnableNpcAI, NPC_Toad_01, FALSE) + EVT_CALL(SetNpcAnimation, NPC_Luigi, ANIM_Luigi_Idle) + EVT_CALL(SetNpcAnimation, NPC_Toad_01, ANIM_Toad_Red_Idle) + EVT_WAIT(10) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Luigi_Talk, ANIM_Luigi_Idle, 16, MSG_Intro_0025) + EVT_CALL(EnableNpcAI, NPC_Toad_01, TRUE) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInteract_Toad_01) = { + EVT_CALL(SetNpcAnimation, NPC_Toad_01, ANIM_Toad_Red_Idle) + EVT_CALL(SetNpcAnimation, NPC_Luigi, ANIM_Luigi_Idle) + EVT_WAIT(10) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Toad_Red_Talk, ANIM_Toad_Red_Idle, 16, MSG_Intro_0029) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInteract_Toad_02) = { + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Toad_Red_Talk, ANIM_Toad_Red_Idle, 16, MSG_Intro_002A) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInteract_Toad_03) = { + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Toad_Yellow_Talk, ANIM_Toad_Yellow_Idle, 0, MSG_Intro_002B) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInteract_Toadette_01) = { + EVT_CALL(SetNpcAnimation, NPC_Toadette_01, ANIM_Toadette_Pink_Idle) + EVT_CALL(SetNpcAnimation, NPC_Toadette_02, ANIM_Toadette_Green_Idle) + EVT_WAIT(10) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Toadette_Pink_Talk, ANIM_Toadette_Pink_Idle, 16, MSG_Intro_002C) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInteract_Toadette_02) = { + EVT_CALL(EnableNpcAI, NPC_Toadette_01, FALSE) + EVT_CALL(SetNpcAnimation, NPC_Toadette_02, ANIM_Toadette_Green_Idle) + EVT_CALL(SetNpcAnimation, NPC_Toadette_01, ANIM_Toadette_Pink_Idle) + EVT_WAIT(10) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Toadette_Green_Talk, ANIM_Toadette_Green_Idle, 16, MSG_Intro_002D) + EVT_CALL(EnableNpcAI, NPC_Toadette_01, TRUE) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInteract_RussT) = { + EVT_CALL(SetNpcAnimation, NPC_ShiverToad_01, ANIM_ShiverToad_Green_Idle) + EVT_CALL(SetNpcAnimation, NPC_RussT_01, ANIM_RussT_Idle) + EVT_WAIT(10) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_RussT_Talk, ANIM_RussT_Idle, 16, MSG_Intro_0027) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInteract_ShiverToad) = { + EVT_CALL(EnableNpcAI, NPC_RussT_01, FALSE) + EVT_CALL(SetNpcAnimation, NPC_RussT_01, ANIM_RussT_Idle) + EVT_CALL(SetNpcAnimation, NPC_ShiverToad_01, ANIM_ShiverToad_Green_Idle) + EVT_WAIT(10) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_ShiverToad_Green_Talk, ANIM_ShiverToad_Green_Idle, 16, MSG_Intro_0028) + EVT_CALL(EnableNpcAI, NPC_RussT_01, TRUE) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInteract_Penguin_01) = { + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Penguin_Talk, ANIM_Penguin_Idle, 0, MSG_Intro_0030) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInteract_ToadGuard_01) = { + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_ToadGuard_Red_Talk, ANIM_ToadGuard_Red_Idle, 16, MSG_Intro_002E) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInteract_ToadGuard_02) = { + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_ToadGuard_Blue_Talk, ANIM_ToadGuard_Blue_Idle, 16, MSG_Intro_002F) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_Luigi) = { + EVT_CALL(SetNpcCollisionSize, NPC_SELF, 46, 26) + EVT_CALL(GetEntryID, LVar0) + EVT_IF_EQ(LVar0, kkj_00_ENTRY_5) + EVT_CALL(SetNpcPos, NPC_SELF, 0, 0, 580) + EVT_CALL(SetNpcYaw, NPC_SELF, 0) + EVT_ELSE + EVT_CALL(SetNpcPos, NPC_SELF, 20, 0, 320) + EVT_CALL(SetNpcYaw, NPC_SELF, 90) + EVT_END_IF + EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(EVS_NpcInteract_Luigi))) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_Toad_01) = { + EVT_CALL(GetEntryID, LVar0) + EVT_IF_NE(LVar0, kkj_00_ENTRY_5) + EVT_CALL(SetNpcPos, NPC_SELF, 60, 0, 320) + EVT_CALL(SetNpcYaw, NPC_SELF, 270) + EVT_END_IF + EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(EVS_NpcIdle_Toad_01))) + EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(EVS_NpcInteract_Toad_01))) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_Toad_02) = { + EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(EVS_NpcInteract_Toad_02))) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_Toad_03) = { + EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(EVS_NpcIdle_Toad_03))) + EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(EVS_NpcInteract_Toad_03))) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_Toadette_01) = { + EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(EVS_NpcIdle_Toadette_01))) + EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(EVS_NpcInteract_Toadette_01))) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_Toadette_02) = { + EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(EVS_NpcInteract_Toadette_02))) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_RussT) = { + EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(EVS_NpcIdle_RussT))) + EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(EVS_NpcInteract_RussT))) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_ShiverToad) = { + EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(EVS_NpcInteract_ShiverToad))) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_Penguin_01) = { + EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(EVS_NpcInteract_Penguin_01))) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_ToadGuard_01) = { + EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(EVS_NpcInteract_ToadGuard_01))) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_ToadGuard_02) = { + EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(EVS_NpcInteract_ToadGuard_02))) + EVT_RETURN + EVT_END +}; + +NpcData N(NpcData_Characters)[] = { + { + .id = NPC_Luigi, + .pos = { NPC_DISPOSE_LOCATION }, + .yaw = 90, + .init = &N(EVS_NpcInit_Luigi), + .settings = &N(NpcSettings_Luigi), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_400000, + .drops = NO_DROPS, + .animations = LUIGI_ANIMS, + }, + { + .id = NPC_Toad_01, + .pos = { 182.0f, 0.0f, 320.0f }, + .yaw = 270, + .init = &N(EVS_NpcInit_Toad_01), + .settings = &N(NpcSettings_Toad_Stationary), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_400000, + .drops = NO_DROPS, + .animations = TOAD_RED_ANIMS, + }, + { + .id = NPC_Toad_02, + .pos = { -250.0f, 0.0f, 250.0f }, + .yaw = 90, + .territory = { + .patrol = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .numPoints = 2, + .points = { + { -250, 0, 250 }, + { 250, 0, 250 }, + }, + .detectShape = SHAPE_CYLINDER, + .detectPos = { -250, 0, 250 }, + .detectSize = { 200 }, + } + }, + .init = &N(EVS_NpcInit_Toad_02), + .settings = &N(NpcSettings_Toad_Patrol), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = NO_DROPS, + .animations = TOAD_RED_ANIMS, + }, + { + .id = NPC_Toad_03, + .pos = { 150.0f, 0.0f, 0.0f }, + .yaw = 270, + .init = &N(EVS_NpcInit_Toad_03), + .settings = &N(NpcSettings_Toad_Stationary), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = NO_DROPS, + .animations = TOAD_YELLOW_ANIMS, + }, + { + .id = NPC_Toadette_01, + .pos = { -300.0f, 0.0f, 100.0f }, + .yaw = 90, + .init = &N(EVS_NpcInit_Toadette_01), + .settings = &N(NpcSettings_Toad_Stationary), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_400000, + .drops = NO_DROPS, + .animations = TOADETTE_PINK_ANIMS, + }, + { + .id = NPC_Toadette_02, + .pos = { -270.0f, 0.0f, 85.0f }, + .yaw = 270, + .init = &N(EVS_NpcInit_Toadette_02), + .settings = &N(NpcSettings_Toad_Stationary), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_400000, + .drops = NO_DROPS, + .animations = TOADETTE_GREEN_ANIMS, + }, + { + .id = NPC_RussT_01, + .pos = { 300.0f, 0.0f, 150.0f }, + .yaw = 90, + .init = &N(EVS_NpcInit_RussT), + .settings = &N(NpcSettings_Toad_Stationary), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_400000, + .drops = NO_DROPS, + .animations = { + .idle = ANIM_RussT_Idle, + .walk = ANIM_RussT_Idle, + .run = ANIM_RussT_Idle, + .chase = ANIM_RussT_Idle, + .anim_4 = ANIM_RussT_Idle, + .anim_5 = ANIM_RussT_Idle, + .death = ANIM_RussT_Idle, + .hit = ANIM_RussT_Idle, + .anim_8 = ANIM_RussT_Idle, + .anim_9 = ANIM_RussT_Idle, + .anim_A = ANIM_RussT_Idle, + .anim_B = ANIM_RussT_Idle, + .anim_C = ANIM_RussT_Idle, + .anim_D = ANIM_RussT_Idle, + .anim_E = ANIM_RussT_Idle, + .anim_F = ANIM_RussT_Idle, + }, + }, + { + .id = NPC_ShiverToad_01, + .pos = { 330.0f, 0.0f, 135.0f }, + .yaw = 270, + .init = &N(EVS_NpcInit_ShiverToad), + .settings = &N(NpcSettings_Toad_Stationary), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_400000, + .drops = NO_DROPS, + .animations = { + .idle = ANIM_ShiverToad_Green_Idle, + .walk = ANIM_ShiverToad_Green_Walk, + .run = ANIM_ShiverToad_Green_Idle, + .chase = ANIM_ShiverToad_Green_Idle, + .anim_4 = ANIM_ShiverToad_Green_Idle, + .anim_5 = ANIM_ShiverToad_Green_Idle, + .death = ANIM_ShiverToad_Green_Idle, + .hit = ANIM_ShiverToad_Green_Idle, + .anim_8 = ANIM_ShiverToad_Green_Idle, + .anim_9 = ANIM_ShiverToad_Green_Idle, + .anim_A = ANIM_ShiverToad_Green_Idle, + .anim_B = ANIM_ShiverToad_Green_Idle, + .anim_C = ANIM_ShiverToad_Green_Idle, + .anim_D = ANIM_ShiverToad_Green_Idle, + .anim_E = ANIM_ShiverToad_Green_Idle, + .anim_F = ANIM_ShiverToad_Green_Idle, + }, + }, + { + .id = NPC_Penguin_01, + .pos = { -120.0f, 100.0f, -305.0f }, + .yaw = 90, + .init = &N(EVS_NpcInit_Penguin_01), + .settings = &N(NpcSettings_Penguin), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = NO_DROPS, + .animations = PENGUIN_ANIMS, + }, + { + .id = NPC_ToadGuard_01, + .pos = { 100.0f, 0.0f, 150.0f }, + .yaw = 270, + .init = &N(EVS_NpcInit_ToadGuard_01), + .settings = &N(NpcSettings_Toad_Stationary), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_400000, + .drops = NO_DROPS, + .animations = TOAD_GUARD_RED_ANIMS, + }, + { + .id = NPC_ToadGuard_02, + .pos = { -50.0f, 100.0f, -365.0f }, + .yaw = 270, + .init = &N(EVS_NpcInit_ToadGuard_02), + .settings = &N(NpcSettings_Toad_Stationary), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_400000, + .drops = NO_DROPS, + .animations = TOAD_GUARD_BLUE_ANIMS, + }, +}; + +#define NAME_SUFFIX + +NpcGroupList N(IntroNPCs) = { + NPC_GROUP(N(NpcData_Characters_Intro)), + {} +}; diff --git a/src/world/area_kkj/kkj_00/kkj_00_4_scene_intro.c b/src/world/area_kkj/kkj_00/kkj_00_4_scene_intro.c new file mode 100644 index 0000000000..d508fdc107 --- /dev/null +++ b/src/world/area_kkj/kkj_00/kkj_00_4_scene_intro.c @@ -0,0 +1,48 @@ +#include "kkj_00.h" + +EvtScript N(EVS_OpenAndCloseFrontDoor_Intro) = { + EVT_CALL(PlaySoundAtCollider, COLLIDER_tts, SOUND_LARGE_DOOR_OPEN, 0) + EVT_CALL(MakeLerp, 0, 80, 14, EASING_QUADRATIC_OUT) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_CALL(RotateModel, MODEL_door2, LVar0, 0, -1, 0) + EVT_CALL(RotateModel, MODEL_door1, LVar0, 0, 1, 0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_WAIT(30) + EVT_CALL(MakeLerp, 80, 0, 8, EASING_QUADRATIC_OUT) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_CALL(RotateModel, MODEL_door2, LVar0, 0, 1, 0) + EVT_CALL(RotateModel, MODEL_door1, LVar0, 0, -1, 0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_CALL(PlaySoundAtCollider, COLLIDER_tts, SOUND_LARGE_DOOR_CLOSE, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Scene_Intro) = { + EVT_CALL(DisablePlayerInput, TRUE) + EVT_EXEC(N(EVS_OpenAndCloseFrontDoor_Intro)) + EVT_THREAD + EVT_CALL(SetNpcSpeed, NPC_Luigi, EVT_FLOAT(4.0)) + EVT_CALL(SetNpcAnimation, NPC_Luigi, ANIM_Luigi_RunBack) + EVT_CALL(NpcMoveTo, NPC_Luigi, 20, 320, 0) + EVT_CALL(SetNpcAnimation, NPC_Luigi, ANIM_Luigi_Idle) + EVT_END_THREAD + EVT_CALL(func_802D1270, 80, 300, EVT_FLOAT(4.0)) + EVT_CALL(InterpPlayerYaw, 270, 5) + EVT_WAIT(30) + EVT_CALL(SpeakToPlayer, NPC_Luigi, ANIM_Luigi_Talk, ANIM_Luigi_Idle, 0, MSG_Intro_0024) + EVT_WAIT(20) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_kkj/kkj_00/kkj_00_5_npc_ending.c b/src/world/area_kkj/kkj_00/kkj_00_5_npc_ending.c new file mode 100644 index 0000000000..46772c269c --- /dev/null +++ b/src/world/area_kkj/kkj_00/kkj_00_5_npc_ending.c @@ -0,0 +1,1041 @@ +#include "kkj_00.h" + +#include "world/common/npc/Toad_Stationary.inc.c" +#include "world/common/npc/Peach.inc.c" +#include "world/common/npc/Dummy.inc.c" + +EvtScript N(EVS_NpcInit_RussT) = { + EVT_CALL(SetNpcPos, NPC_SELF, -300, 0, 295) + EVT_CALL(SetNpcYaw, NPC_SELF, 90) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_ShiverToad_02) = { + EVT_CALL(SetNpcPos, NPC_SELF, -175, 0, -75) + EVT_CALL(SetNpcYaw, NPC_SELF, 90) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_Unused) = { + EVT_CALL(SetNpcPos, NPC_SELF, -440, 0, 220) + EVT_CALL(SetNpcYaw, NPC_SELF, 90) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_Toadette_03) = { + EVT_CALL(SetNpcPos, NPC_SELF, 295, 0, -15) + EVT_CALL(SetNpcYaw, NPC_SELF, 270) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_Toadette_04) = { + EVT_CALL(SetNpcPos, NPC_SELF, 325, 0, -10) + EVT_CALL(SetNpcYaw, NPC_SELF, 270) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_ToadGuard_03) = { + EVT_CALL(SetNpcPos, NPC_SELF, 50, 100, -365) + EVT_CALL(SetNpcYaw, NPC_SELF, 270) + EVT_RETURN + EVT_END +}; + +AnimID N(ExtraAnims_Peach)[] = { + ANIM_Peach_A0000, + ANIM_Peach_A0001, + ANIM_Peach_C0026, + ANIM_Peach_C0000, + ANIM_Peach_C0001, + ANIM_Peach_C0002, + ANIM_Peach_A0002, + ANIM_Peach_C0010, + ANIM_Peach_D000F, + ANIM_LIST_END +}; + +AnimID N(ExtraAnims_Minister)[] = { + ANIM_ToadMinister_Still, + ANIM_ToadMinister_Idle, + ANIM_ToadMinister_Walk, + ANIM_ToadMinister_Talk, + ANIM_LIST_END +}; + +AnimID N(ExtraAnims_TayceT)[] = { + ANIM_TayceT_Still, + ANIM_TayceT_Idle, + ANIM_LIST_END +}; + +AnimID N(ExtraAnims_RussT)[] = { + ANIM_RussT_Still, + ANIM_RussT_Idle, + ANIM_LIST_END +}; + +AnimID N(ExtraAnims_ShiverToad)[] = { + ANIM_ShiverToad_Red_Still, + ANIM_ShiverToad_Red_Idle, + ANIM_LIST_END +}; + +AnimID N(ExtraAnims_Toad)[] = { + ANIM_Toad_Red_Still, + ANIM_Toad_Red_Idle, + ANIM_LIST_END +}; + +AnimID N(ExtraAnims_Toadette)[] = { + ANIM_Toadette_Orange_Still, + ANIM_Toadette_Orange_Idle, + ANIM_LIST_END +}; + +AnimID N(ExtraAnims_ToadGuard)[] = { + ANIM_ToadGuard_Red_Still, + ANIM_ToadGuard_Red_Idle, + ANIM_ToadGuard_Red_Talk, + ANIM_LIST_END +}; + +AnimID N(ExtraAnims_Goombario)[] = { + ANIM_WorldGoombario_Still, + ANIM_WorldGoombario_Idle, + ANIM_LIST_END +}; + +AnimID N(ExtraAnims_Kooper)[] = { + ANIM_WorldKooper_Still, + ANIM_WorldKooper_Idle, + ANIM_LIST_END +}; + +AnimID N(ExtraAnims_Bombette)[] = { + ANIM_WorldBombette_Still, + ANIM_WorldBombette_Idle, + ANIM_LIST_END +}; + +AnimID N(ExtraAnims_Parakarry)[] = { + ANIM_WorldParakarry_Still, + ANIM_WorldParakarry_Idle, + ANIM_LIST_END +}; + +AnimID N(ExtraAnims_Bow)[] = { + ANIM_WorldBow_Still, + ANIM_WorldBow_Idle, + ANIM_LIST_END +}; + +AnimID N(ExtraAnims_Watt)[] = { + ANIM_WorldWatt_Still, + ANIM_WorldWatt_Idle, + ANIM_LIST_END +}; + +AnimID N(ExtraAnims_Sushie)[] = { + ANIM_WorldSushie_Still, + ANIM_WorldSushie_Idle, + ANIM_LIST_END +}; + +AnimID N(ExtraAnims_Lakilester)[] = { + ANIM_WorldLakilester_Still, + ANIM_WorldLakilester_Idle, + ANIM_LIST_END +}; + +AnimID N(ExtraAnims_Merlon)[] = { + ANIM_Merlon_Still, + ANIM_Merlon_Idle, + ANIM_LIST_END +}; + +AnimID N(ExtraAnims_Merluvlee)[] = { + ANIM_Merluvlee_Still, + ANIM_Merluvlee_Idle, + ANIM_LIST_END +}; + +AnimID N(ExtraAnims_Merlow)[] = { + ANIM_Merlow_Still, + ANIM_Merlow_Idle, + ANIM_LIST_END +}; + +AnimID N(ExtraAnims_Merlee)[] = { + ANIM_WorldMerlee_Still, + ANIM_WorldMerlee_Idle, + ANIM_LIST_END +}; + +AnimID N(ExtraAnims_Merle)[] = { + ANIM_Merle_Still, + ANIM_Merle_Idle, + ANIM_LIST_END +}; + +AnimID N(ExtraAnims_Lakilulu)[] = { + ANIM_Lakilulu_Still, + ANIM_Lakilulu_Idle, + ANIM_LIST_END +}; + +AnimID N(ExtraAnims_Bootler)[] = { + ANIM_Bootler_Still, + ANIM_Bootler_Idle, + ANIM_LIST_END +}; + +AnimID N(ExtraAnims_Goompa)[] = { + ANIM_Goompa_Still, + ANIM_Goompa_Idle, + ANIM_LIST_END +}; + +AnimID N(ExtraAnims_Goombaria)[] = { + ANIM_Goombaria_Still, + ANIM_Goombaria_Idle, + ANIM_LIST_END +}; + +AnimID N(ExtraAnims_Yoshi)[] = { + ANIM_Yoshi_Green_Still, + ANIM_Yoshi_Green_Idle, + ANIM_LIST_END +}; + +AnimID N(ExtraAnims_Penguin)[] = { + ANIM_Penguin_Still, + ANIM_Penguin_Idle, + ANIM_LIST_END +}; + +AnimID N(ExtraAnims_Dryite)[] = { + ANIM_Dryite_Green_Still, + ANIM_Dryite_Green_Idle, + ANIM_LIST_END +}; + +AnimID N(ExtraAnims_Ninji)[] = { + ANIM_Ninji_Still, + ANIM_Ninji_Idle, + ANIM_LIST_END +}; + +NpcData N(NpcData_Peach) = { + .id = NPC_Peach, + .pos = { 0.0f, 100.0f, -440.0f }, + .yaw = 270, + .settings = &N(NpcSettings_Peach), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_20000, + .drops = NO_DROPS, + .animations = PEACH_ANIMS, + .extraAnimations = N(ExtraAnims_Peach), +}; + +NpcData N(NpcData_SpecialToads)[] = { + { + .id = NPC_ToadMinister, + .pos = { 100.0f, 0.0f, 250.0f }, + .yaw = 270, + .settings = &N(NpcSettings_Toad_Stationary), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_8000000 | ENEMY_FLAG_10000000 | ENEMY_FLAG_20000000, + .drops = NO_DROPS, + .animations = TOAD_MINISTER_ANIMS, + .extraAnimations = N(ExtraAnims_Minister), + }, + { + .id = NPC_TayceT, + .pos = { -200.0f, 0.0f, 260.0f }, + .yaw = 90, + .settings = &N(NpcSettings_Toad_Stationary), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_8000000 | ENEMY_FLAG_10000000 | ENEMY_FLAG_20000000, + .drops = NO_DROPS, + .animations = { + .idle = ANIM_TayceT_Idle, + }, + .extraAnimations = N(ExtraAnims_TayceT), + }, + { + .id = NPC_RussT_02, + .pos = { 300.0f, 0.0f, 150.0f }, + .yaw = 90, + .init = &N(EVS_NpcInit_RussT), + .settings = &N(NpcSettings_Toad_Stationary), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_8000000 | ENEMY_FLAG_10000000 | ENEMY_FLAG_20000000, + .drops = NO_DROPS, + .animations = { + .idle = ANIM_RussT_Idle, + .walk = ANIM_RussT_Idle, + .run = ANIM_RussT_Idle, + .chase = ANIM_RussT_Idle, + .anim_4 = ANIM_RussT_Idle, + .anim_5 = ANIM_RussT_Idle, + .death = ANIM_RussT_Idle, + .hit = ANIM_RussT_Idle, + .anim_8 = ANIM_RussT_Idle, + .anim_9 = ANIM_RussT_Idle, + .anim_A = ANIM_RussT_Idle, + .anim_B = ANIM_RussT_Idle, + .anim_C = ANIM_RussT_Idle, + .anim_D = ANIM_RussT_Idle, + .anim_E = ANIM_RussT_Idle, + .anim_F = ANIM_RussT_Idle, + }, + .extraAnimations = N(ExtraAnims_RussT), + }, + { + .id = NPC_ShiverToad_02, + .pos = { 330.0f, 0.0f, 135.0f }, + .yaw = 270, + .init = &N(EVS_NpcInit_ShiverToad_02), + .settings = &N(NpcSettings_Toad_Stationary), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_8000000 | ENEMY_FLAG_10000000 | ENEMY_FLAG_20000000, + .drops = NO_DROPS, + .animations = { + .idle = ANIM_ShiverToad_Green_Idle, + .walk = ANIM_ShiverToad_Green_Walk, + .run = ANIM_ShiverToad_Green_Idle, + .chase = ANIM_ShiverToad_Green_Idle, + .anim_4 = ANIM_ShiverToad_Green_Idle, + .anim_5 = ANIM_ShiverToad_Green_Idle, + .death = ANIM_ShiverToad_Green_Idle, + .hit = ANIM_ShiverToad_Green_Idle, + .anim_8 = ANIM_ShiverToad_Green_Idle, + .anim_9 = ANIM_ShiverToad_Green_Idle, + .anim_A = ANIM_ShiverToad_Green_Idle, + .anim_B = ANIM_ShiverToad_Green_Idle, + .anim_C = ANIM_ShiverToad_Green_Idle, + .anim_D = ANIM_ShiverToad_Green_Idle, + .anim_E = ANIM_ShiverToad_Green_Idle, + .anim_F = ANIM_ShiverToad_Green_Idle, + }, + .extraAnimations = N(ExtraAnims_ShiverToad), + }, +}; + +NpcData N(NpcData_Party)[] = { + { + .id = NPC_Goombario, + .pos = { 180.0f, 0.0f, 80.0f }, + .yaw = 270, + .settings = &N(NpcSettings_Dummy), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_8000000 | ENEMY_FLAG_10000000 | ENEMY_FLAG_20000000, + .drops = NO_DROPS, + .animations = { + .idle = ANIM_WorldGoombario_Idle, + .walk = ANIM_WorldGoombario_Walk, + .run = ANIM_WorldGoombario_Run, + .chase = ANIM_WorldGoombario_Run, + .anim_4 = ANIM_WorldGoombario_Idle, + .anim_5 = ANIM_WorldGoombario_Idle, + .death = ANIM_WorldGoombario_Still, + .hit = ANIM_WorldGoombario_Still, + .anim_8 = ANIM_WorldGoombario_Run, + .anim_9 = ANIM_WorldGoombario_Run, + .anim_A = ANIM_WorldGoombario_Run, + .anim_B = ANIM_WorldGoombario_Run, + .anim_C = ANIM_WorldGoombario_Run, + .anim_D = ANIM_WorldGoombario_Run, + .anim_E = ANIM_WorldGoombario_Run, + .anim_F = ANIM_WorldGoombario_Run, + }, + .extraAnimations = N(ExtraAnims_Goombario), + }, + { + .id = NPC_Kooper, + .pos = { 225.0f, 0.0f, 225.0f }, + .yaw = 270, + .settings = &N(NpcSettings_Dummy), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_8000000 | ENEMY_FLAG_10000000 | ENEMY_FLAG_20000000, + .drops = NO_DROPS, + .animations = { + .idle = ANIM_WorldKooper_Idle, + .walk = ANIM_WorldKooper_Walk, + .run = ANIM_WorldKooper_Walk, + .chase = ANIM_WorldKooper_Walk, + .anim_4 = ANIM_WorldKooper_Walk, + .anim_5 = ANIM_WorldKooper_Walk, + .death = ANIM_WorldKooper_Still, + .hit = ANIM_WorldKooper_Still, + .anim_8 = ANIM_WorldKooper_Still, + .anim_9 = ANIM_WorldKooper_Still, + .anim_A = ANIM_WorldKooper_Still, + .anim_B = ANIM_WorldKooper_Still, + .anim_C = ANIM_WorldKooper_Still, + .anim_D = ANIM_WorldKooper_Still, + .anim_E = ANIM_WorldKooper_Still, + .anim_F = ANIM_WorldKooper_Still, + }, + .extraAnimations = N(ExtraAnims_Kooper), + }, + { + .id = NPC_Bombette, + .pos = { 270.0f, 0.0f, 115.0f }, + .yaw = 270, + .settings = &N(NpcSettings_Dummy), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_8000000 | ENEMY_FLAG_10000000 | ENEMY_FLAG_20000000, + .drops = NO_DROPS, + .animations = { + .idle = ANIM_WorldBombette_Idle, + .walk = ANIM_WorldBombette_Walk, + .run = ANIM_WorldBombette_Walk, + .chase = ANIM_WorldBombette_Walk, + .anim_4 = ANIM_WorldBombette_Walk, + .anim_5 = ANIM_WorldBombette_Walk, + .death = ANIM_WorldBombette_Still, + .hit = ANIM_WorldBombette_Still, + .anim_8 = ANIM_WorldBombette_Still, + .anim_9 = ANIM_WorldBombette_Still, + .anim_A = ANIM_WorldBombette_Still, + .anim_B = ANIM_WorldBombette_Still, + .anim_C = ANIM_WorldBombette_Still, + .anim_D = ANIM_WorldBombette_Still, + .anim_E = ANIM_WorldBombette_Still, + .anim_F = ANIM_WorldBombette_Still, + }, + .extraAnimations = N(ExtraAnims_Bombette), + }, + { + .id = NPC_Parakarry, + .pos = { 325.0f, 10.0f, 175.0f }, + .yaw = 270, + .settings = &N(NpcSettings_Dummy), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_8000000 | ENEMY_FLAG_10000000 | ENEMY_FLAG_20000000, + .drops = 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, + }, + .extraAnimations = N(ExtraAnims_Parakarry), + }, + { + .id = NPC_Bow, + .pos = { -270.0f, 0.0f, 145.0f }, + .yaw = 90, + .settings = &N(NpcSettings_Dummy), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_8000000 | ENEMY_FLAG_10000000 | ENEMY_FLAG_20000000, + .drops = NO_DROPS, + .animations = { + .idle = ANIM_WorldBow_Idle, + .walk = ANIM_WorldBow_Walk, + .run = ANIM_WorldBow_Run, + .chase = ANIM_WorldBow_Run, + .anim_4 = ANIM_WorldBow_Idle, + .anim_5 = ANIM_WorldBow_Idle, + .death = ANIM_WorldBow_Still, + .hit = ANIM_WorldBow_Still, + .anim_8 = ANIM_WorldBow_Run, + .anim_9 = ANIM_WorldBow_Run, + .anim_A = ANIM_WorldBow_Run, + .anim_B = ANIM_WorldBow_Run, + .anim_C = ANIM_WorldBow_Run, + .anim_D = ANIM_WorldBow_Run, + .anim_E = ANIM_WorldBow_Run, + .anim_F = ANIM_WorldBow_Run, + }, + .extraAnimations = N(ExtraAnims_Bow), + }, + { + .id = NPC_Watt, + .pos = { -235.0f, 0.0f, 85.0f }, + .yaw = 90, + .initVarCount = 1, + .initVar = { .value = 0 }, + .settings = &N(NpcSettings_Dummy), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_8000000 | ENEMY_FLAG_10000000 | ENEMY_FLAG_20000000, + .drops = 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, + }, + .extraAnimations = N(ExtraAnims_Watt), + }, + { + .id = NPC_Sushie, + .pos = { -190.0f, 0.0f, 50.0f }, + .yaw = 90, + .settings = &N(NpcSettings_Dummy), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_8000000 | ENEMY_FLAG_10000000 | ENEMY_FLAG_20000000, + .drops = NO_DROPS, + .animations = { + .idle = ANIM_WorldSushie_Idle, + .walk = ANIM_WorldSushie_Idle, + .run = ANIM_WorldSushie_Idle, + .chase = ANIM_WorldSushie_Idle, + .anim_4 = ANIM_WorldSushie_Idle, + .anim_5 = ANIM_WorldSushie_Idle, + .death = ANIM_WorldSushie_Idle, + .hit = ANIM_WorldSushie_Idle, + .anim_8 = ANIM_WorldSushie_Idle, + .anim_9 = ANIM_WorldSushie_Idle, + .anim_A = ANIM_WorldSushie_Idle, + .anim_B = ANIM_WorldSushie_Idle, + .anim_C = ANIM_WorldSushie_Idle, + .anim_D = ANIM_WorldSushie_Idle, + .anim_E = ANIM_WorldSushie_Idle, + .anim_F = ANIM_WorldSushie_Idle, + }, + .extraAnimations = N(ExtraAnims_Sushie), + }, + { + .id = NPC_Lakilester, + .pos = { -320.0f, 0.0f, -60.0f }, + .yaw = 90, + .settings = &N(NpcSettings_Dummy), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_8000000 | ENEMY_FLAG_10000000 | ENEMY_FLAG_20000000, + .drops = NO_DROPS, + .animations = { + .idle = ANIM_WorldLakilester_Idle, + .walk = ANIM_WorldLakilester_Idle, + .run = ANIM_WorldLakilester_Idle, + .chase = ANIM_WorldLakilester_Idle, + .anim_4 = ANIM_WorldLakilester_Idle, + .anim_5 = ANIM_WorldLakilester_Idle, + .death = ANIM_WorldLakilester_Idle, + .hit = ANIM_WorldLakilester_Idle, + .anim_8 = ANIM_WorldLakilester_Idle, + .anim_9 = ANIM_WorldLakilester_Idle, + .anim_A = ANIM_WorldLakilester_Idle, + .anim_B = ANIM_WorldLakilester_Idle, + .anim_C = ANIM_WorldLakilester_Idle, + .anim_D = ANIM_WorldLakilester_Idle, + .anim_E = ANIM_WorldLakilester_Idle, + .anim_F = ANIM_WorldLakilester_Idle, + }, + .extraAnimations = N(ExtraAnims_Lakilester), + }, +}; + +NpcData N(NpcData_Wizards)[] = { + { + .id = NPC_Merlon, + .pos = { -145.0f, 0.0f, 415.0f }, + .yaw = 90, + .settings = &N(NpcSettings_Dummy), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_8000000 | ENEMY_FLAG_10000000 | ENEMY_FLAG_20000000, + .drops = NO_DROPS, + .animations = { + .idle = ANIM_Merlon_Idle, + }, + .extraAnimations = N(ExtraAnims_Merlon), + }, + { + .id = NPC_Merluvlee, + .pos = { -225.0f, 0.0f, 380.0f }, + .yaw = 90, + .settings = &N(NpcSettings_Dummy), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_8000000 | ENEMY_FLAG_10000000 | ENEMY_FLAG_20000000, + .drops = NO_DROPS, + .animations = { + .idle = ANIM_Merluvlee_Idle, + }, + .extraAnimations = N(ExtraAnims_Merluvlee), + }, + { + .id = NPC_Merlow, + .pos = { -175.0f, 0.0f, 330.0f }, + .yaw = 90, + .settings = &N(NpcSettings_Dummy), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_8000000 | ENEMY_FLAG_10000000 | ENEMY_FLAG_20000000, + .drops = NO_DROPS, + .animations = { + .idle = ANIM_Merlow_Idle, + }, + .extraAnimations = N(ExtraAnims_Merlow), + }, + { + .id = NPC_Merlee, + .pos = { -250.0f, 0.0f, 350.0f }, + .yaw = 90, + .settings = &N(NpcSettings_Dummy), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_8000000 | ENEMY_FLAG_10000000 | ENEMY_FLAG_20000000, + .drops = NO_DROPS, + .animations = { + .idle = ANIM_WorldMerlee_Idle, + .walk = ANIM_WorldMerlee_Walk, + .run = ANIM_WorldMerlee_Run, + .chase = ANIM_WorldMerlee_Run, + .anim_4 = ANIM_WorldMerlee_Idle, + .anim_5 = ANIM_WorldMerlee_Idle, + .death = ANIM_WorldMerlee_Idle, + .hit = ANIM_WorldMerlee_Idle, + .anim_8 = ANIM_WorldMerlee_Idle, + .anim_9 = ANIM_WorldMerlee_Idle, + .anim_A = ANIM_WorldMerlee_Idle, + .anim_B = ANIM_WorldMerlee_Idle, + .anim_C = ANIM_WorldMerlee_Idle, + .anim_D = ANIM_WorldMerlee_Idle, + .anim_E = ANIM_WorldMerlee_Idle, + .anim_F = ANIM_WorldMerlee_Idle, + }, + .extraAnimations = N(ExtraAnims_Merlee), + }, + { + .id = NPC_Merle, + .pos = { -220.0f, 0.0f, 450.0f }, + .yaw = 90, + .settings = &N(NpcSettings_Dummy), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_8000000 | ENEMY_FLAG_10000000 | ENEMY_FLAG_20000000, + .drops = NO_DROPS, + .animations = { + .idle = ANIM_Merle_Idle, + .walk = ANIM_Merle_Idle, + .run = ANIM_Merle_Idle, + .chase = ANIM_Merle_Idle, + .anim_4 = ANIM_Merle_Idle, + .anim_5 = ANIM_Merle_Idle, + .death = ANIM_Merle_Idle, + .hit = ANIM_Merle_Idle, + .anim_8 = ANIM_Merle_Idle, + .anim_9 = ANIM_Merle_Idle, + .anim_A = ANIM_Merle_Idle, + .anim_B = ANIM_Merle_Idle, + .anim_C = ANIM_Merle_Idle, + .anim_D = ANIM_Merle_Idle, + .anim_E = ANIM_Merle_Idle, + .anim_F = ANIM_Merle_Idle, + }, + .extraAnimations = N(ExtraAnims_Merle), + }, +}; + +NpcData N(NpcData_PartyFamily)[] = { + { + .id = NPC_Lakilulu, + .pos = { -365.0f, 0.0f, -60.0f }, + .yaw = 90, + .settings = &N(NpcSettings_Dummy), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_8000000 | ENEMY_FLAG_10000000 | ENEMY_FLAG_20000000, + .drops = NO_DROPS, + .animations = { + .idle = ANIM_Lakilulu_Idle, + .walk = ANIM_Lakilulu_Idle, + .run = ANIM_Lakilulu_Idle, + .chase = ANIM_Lakilulu_Idle, + .anim_4 = ANIM_Lakilulu_Idle, + .anim_5 = ANIM_Lakilulu_Idle, + .death = ANIM_Lakilulu_Idle, + .hit = ANIM_Lakilulu_Idle, + .anim_8 = ANIM_Lakilulu_Idle, + .anim_9 = ANIM_Lakilulu_Idle, + .anim_A = ANIM_Lakilulu_Idle, + .anim_B = ANIM_Lakilulu_Idle, + .anim_C = ANIM_Lakilulu_Idle, + .anim_D = ANIM_Lakilulu_Idle, + .anim_E = ANIM_Lakilulu_Idle, + .anim_F = ANIM_Lakilulu_Idle, + }, + .extraAnimations = N(ExtraAnims_Lakilulu), + }, + { + .id = NPC_Bootler, + .pos = { -340.0f, 0.0f, 100.0f }, + .yaw = 90, + .settings = &N(NpcSettings_Dummy), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_8000000 | ENEMY_FLAG_10000000 | ENEMY_FLAG_20000000, + .drops = NO_DROPS, + .animations = { + .idle = ANIM_Bootler_Idle, + .walk = ANIM_Bootler_Walk, + .run = ANIM_Bootler_Run, + .chase = ANIM_Bootler_Run, + .anim_4 = ANIM_Bootler_Idle, + .anim_5 = ANIM_Bootler_Idle, + .death = ANIM_Bootler_Still, + .hit = ANIM_Bootler_Still, + .anim_8 = ANIM_Bootler_Shock, + .anim_9 = ANIM_Bootler_Panic, + .anim_A = ANIM_Bootler_Dejected, + .anim_B = ANIM_Bootler_Quaver, + .anim_C = ANIM_Bootler_Shock, + .anim_D = ANIM_Bootler_Panic, + .anim_E = ANIM_Bootler_Dejected, + .anim_F = ANIM_Bootler_Quaver, + }, + .extraAnimations = N(ExtraAnims_Bootler), + }, + { + .id = NPC_Goompa, + .pos = { 170.0f, 0.0f, 0.0f }, + .yaw = 270, + .settings = &N(NpcSettings_Dummy), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_8000000 | ENEMY_FLAG_10000000 | ENEMY_FLAG_20000000, + .drops = NO_DROPS, + .animations = { + .idle = ANIM_Goompa_Idle, + .walk = ANIM_Goompa_Walk, + .run = ANIM_Goompa_Run, + .chase = ANIM_Goompa_Run, + .anim_4 = ANIM_Goompa_Idle, + .anim_5 = ANIM_Goompa_Idle, + .death = ANIM_Goompa_Still, + .hit = ANIM_Goompa_Still, + .anim_8 = ANIM_Goompa_Run, + .anim_9 = ANIM_Goompa_Run, + .anim_A = ANIM_Goompa_Run, + .anim_B = ANIM_Goompa_Run, + .anim_C = ANIM_Goompa_Run, + .anim_D = ANIM_Goompa_Run, + .anim_E = ANIM_Goompa_Run, + .anim_F = ANIM_Goompa_Run, + }, + .extraAnimations = N(ExtraAnims_Goompa), + }, + { + .id = NPC_Goombaria, + .pos = { 140.0f, 0.0f, 50.0f }, + .yaw = 270, + .settings = &N(NpcSettings_Dummy), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_8000000 | ENEMY_FLAG_10000000 | ENEMY_FLAG_20000000, + .drops = NO_DROPS, + .animations = { + .idle = ANIM_Goombaria_Idle, + .walk = ANIM_Goombaria_Walk, + .run = ANIM_Goombaria_Run, + .chase = ANIM_Goombaria_Run, + .anim_4 = ANIM_Goombaria_Idle, + .anim_5 = ANIM_Goombaria_Idle, + .death = ANIM_Goombaria_Still, + .hit = ANIM_Goombaria_Still, + .anim_8 = ANIM_Goombaria_Run, + .anim_9 = ANIM_Goombaria_Run, + .anim_A = ANIM_Goombaria_Run, + .anim_B = ANIM_Goombaria_Run, + .anim_C = ANIM_Goombaria_Run, + .anim_D = ANIM_Goombaria_Run, + .anim_E = ANIM_Goombaria_Run, + .anim_F = ANIM_Goombaria_Run, + }, + .extraAnimations = N(ExtraAnims_Goombaria), + }, +}; + +NpcData N(NpcData_Visitors)[] = { + { + .id = NPC_Yoshi, + .pos = { -340.0f, 0.0f, 310.0f }, + .yaw = 90, + .settings = &N(NpcSettings_Dummy), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_8000000 | ENEMY_FLAG_10000000 | ENEMY_FLAG_20000000, + .drops = NO_DROPS, + .animations = { + .idle = ANIM_Yoshi_Blue_Idle, + .walk = ANIM_Yoshi_Blue_Walk, + .run = ANIM_Yoshi_Blue_Idle, + .chase = ANIM_Yoshi_Blue_Idle, + .anim_4 = ANIM_Yoshi_Blue_Idle, + .anim_5 = ANIM_Yoshi_Blue_Idle, + .death = ANIM_Yoshi_Blue_Idle, + .hit = ANIM_Yoshi_Blue_Idle, + .anim_8 = ANIM_Yoshi_Blue_Idle, + .anim_9 = ANIM_Yoshi_Blue_Idle, + .anim_A = ANIM_Yoshi_Blue_Idle, + .anim_B = ANIM_Yoshi_Blue_Idle, + .anim_C = ANIM_Yoshi_Blue_Idle, + .anim_D = ANIM_Yoshi_Blue_Idle, + .anim_E = ANIM_Yoshi_Blue_Idle, + .anim_F = ANIM_Yoshi_Blue_Idle, + }, + .extraAnimations = N(ExtraAnims_Yoshi), + }, + { + .id = NPC_Penguin_02, + .pos = { 225.0f, 0.0f, -80.0f }, + .yaw = 270, + .settings = &N(NpcSettings_Dummy), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_8000000 | ENEMY_FLAG_10000000 | ENEMY_FLAG_20000000, + .drops = NO_DROPS, + .animations = { + .idle = ANIM_Penguin_Idle, + .walk = ANIM_Penguin_Walk, + .run = ANIM_Penguin_Run, + .chase = ANIM_Penguin_Run, + .anim_4 = ANIM_Penguin_Idle, + .anim_5 = ANIM_Penguin_Idle, + .death = ANIM_Penguin_Idle, + .hit = ANIM_Penguin_Idle, + .anim_8 = ANIM_Penguin_Idle, + .anim_9 = ANIM_Penguin_Idle, + .anim_A = ANIM_Penguin_Idle, + .anim_B = ANIM_Penguin_Idle, + .anim_C = ANIM_Penguin_Idle, + .anim_D = ANIM_Penguin_Idle, + .anim_E = ANIM_Penguin_Idle, + .anim_F = ANIM_Penguin_Idle, + }, + .extraAnimations = N(ExtraAnims_Penguin), + }, + { + .id = NPC_Penguin_03, + .pos = { -250.0f, 0.0f, -150.0f }, + .yaw = 90, + .settings = &N(NpcSettings_Dummy), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_8000000 | ENEMY_FLAG_10000000 | ENEMY_FLAG_20000000, + .drops = NO_DROPS, + .animations = { + .idle = ANIM_Penguin_Idle, + .walk = ANIM_Penguin_Walk, + .run = ANIM_Penguin_Run, + .chase = ANIM_Penguin_Run, + .anim_4 = ANIM_Penguin_Idle, + .anim_5 = ANIM_Penguin_Idle, + .death = ANIM_Penguin_Idle, + .hit = ANIM_Penguin_Idle, + .anim_8 = ANIM_Penguin_Idle, + .anim_9 = ANIM_Penguin_Idle, + .anim_A = ANIM_Penguin_Idle, + .anim_B = ANIM_Penguin_Idle, + .anim_C = ANIM_Penguin_Idle, + .anim_D = ANIM_Penguin_Idle, + .anim_E = ANIM_Penguin_Idle, + .anim_F = ANIM_Penguin_Idle, + }, + .extraAnimations = N(ExtraAnims_Penguin), + }, + { + .id = NPC_Dryite, + .pos = { -320.0f, 0.0f, 245.0f }, + .yaw = 90, + .settings = &N(NpcSettings_Dummy), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_8000000 | ENEMY_FLAG_10000000 | ENEMY_FLAG_20000000, + .drops = NO_DROPS, + .animations = { + .idle = ANIM_Dryite_Yellow_Idle, + .walk = ANIM_Dryite_Yellow_Walk, + .run = ANIM_Dryite_Yellow_Run, + .chase = ANIM_Dryite_Yellow_Run, + .anim_4 = ANIM_Dryite_Yellow_Idle, + .anim_5 = ANIM_Dryite_Yellow_Idle, + .death = ANIM_Dryite_Yellow_Still, + .hit = ANIM_Dryite_Yellow_Still, + .anim_8 = ANIM_Dryite_Yellow_Idle, + .anim_9 = ANIM_Dryite_Yellow_Idle, + .anim_A = ANIM_Dryite_Yellow_Idle, + .anim_B = ANIM_Dryite_Yellow_Idle, + .anim_C = ANIM_Dryite_Yellow_Idle, + .anim_D = ANIM_Dryite_Yellow_Idle, + .anim_E = ANIM_Dryite_Yellow_Idle, + .anim_F = ANIM_Dryite_Yellow_Idle, + }, + .extraAnimations = N(ExtraAnims_Dryite), + }, + { + .id = NPC_Ninji, + .pos = { -395.0f, 68.0f, 50.0f }, + .yaw = 90, + .settings = &N(NpcSettings_Dummy), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_8000000 | ENEMY_FLAG_10000000 | ENEMY_FLAG_20000000, + .drops = NO_DROPS, + .animations = { + .idle = ANIM_Ninji_Idle, + .walk = ANIM_Ninji_Walk, + .run = ANIM_Ninji_Idle, + .chase = ANIM_Ninji_Idle, + .anim_4 = ANIM_Ninji_Idle, + .anim_5 = ANIM_Ninji_Idle, + .death = ANIM_Ninji_Idle, + .hit = ANIM_Ninji_Idle, + .anim_8 = ANIM_Ninji_Idle, + .anim_9 = ANIM_Ninji_Idle, + .anim_A = ANIM_Ninji_Idle, + .anim_B = ANIM_Ninji_Idle, + .anim_C = ANIM_Ninji_Idle, + .anim_D = ANIM_Ninji_Idle, + .anim_E = ANIM_Ninji_Idle, + .anim_F = ANIM_Ninji_Idle, + }, + .extraAnimations = N(ExtraAnims_Ninji), + }, +}; + +NpcData N(NpcData_Toads)[] = { + { + .id = NPC_Toad_04, + .pos = { 200.0f, 0.0f, 420.0f }, + .yaw = 270, + .settings = &N(NpcSettings_Toad_Stationary), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_8000000 | ENEMY_FLAG_10000000 | ENEMY_FLAG_20000000, + .drops = NO_DROPS, + .animations = TOAD_RED_ANIMS, + .extraAnimations = N(ExtraAnims_Toad), + }, + { + .id = NPC_Toad_05, + .pos = { -120.0f, 0.0f, 205.0f }, + .yaw = 90, + .settings = &N(NpcSettings_Toad_Stationary), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_8000000 | ENEMY_FLAG_10000000 | ENEMY_FLAG_20000000, + .drops = NO_DROPS, + .animations = TOAD_YELLOW_ANIMS, + .extraAnimations = N(ExtraAnims_Toad), + }, + { + .id = NPC_Toad_06, + .pos = { -440.0f, 0.0f, 220.0f }, + .yaw = 90, + .settings = &N(NpcSettings_Toad_Stationary), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_8000000 | ENEMY_FLAG_10000000 | ENEMY_FLAG_20000000, + .drops = NO_DROPS, + .animations = TOAD_GREEN_ANIMS, + .extraAnimations = N(ExtraAnims_Toad), + }, + { + .id = NPC_Toad_07, + .pos = { 285.0f, 0.0f, 290.0f }, + .yaw = 270, + .settings = &N(NpcSettings_Toad_Stationary), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_8000000 | ENEMY_FLAG_10000000 | ENEMY_FLAG_20000000, + .drops = NO_DROPS, + .animations = TOAD_BLUE_ANIMS, + .extraAnimations = N(ExtraAnims_Toad), + }, +}; + +NpcData N(NpcData_Toadettes)[] = { + { + .id = NPC_Toadette_03, + .pos = { -300.0f, 0.0f, 100.0f }, + .yaw = 90, + .init = &N(EVS_NpcInit_Toadette_03), + .settings = &N(NpcSettings_Toad_Stationary), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_8000000 | ENEMY_FLAG_10000000 | ENEMY_FLAG_20000000, + .drops = NO_DROPS, + .animations = TOADETTE_PINK_ANIMS, + .extraAnimations = N(ExtraAnims_Toadette), + }, + { + .id = NPC_Toadette_04, + .pos = { -270.0f, 0.0f, 85.0f }, + .yaw = 270, + .init = &N(EVS_NpcInit_Toadette_04), + .settings = &N(NpcSettings_Toad_Stationary), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_8000000 | ENEMY_FLAG_10000000 | ENEMY_FLAG_20000000, + .drops = NO_DROPS, + .animations = TOADETTE_GREEN_ANIMS, + .extraAnimations = N(ExtraAnims_Toadette), + }, + { + .id = NPC_Toadette_05, + .pos = { -190.0f, 0.0f, 160.0f }, + .yaw = 90, + .settings = &N(NpcSettings_Toad_Stationary), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_8000000 | ENEMY_FLAG_10000000 | ENEMY_FLAG_20000000, + .drops = NO_DROPS, + .animations = TOADETTE_ORANGE_ANIMS, + .extraAnimations = N(ExtraAnims_Toadette), + }, + { + .id = NPC_Toadette_06, + .pos = { 190.0f, 0.0f, 300.0f }, + .yaw = 270, + .settings = &N(NpcSettings_Toad_Stationary), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_8000000 | ENEMY_FLAG_10000000 | ENEMY_FLAG_20000000, + .drops = NO_DROPS, + .animations = TOADETTE_PURPLE_ANIMS, + .extraAnimations = N(ExtraAnims_Toadette), + }, +}; + +NpcData N(NpcData_ToadGuards)[] = { + { + .id = NPC_ToadGuard_03, + .pos = { 100.0f, 0.0f, 150.0f }, + .yaw = 270, + .init = &N(EVS_NpcInit_ToadGuard_03), + .settings = &N(NpcSettings_Toad_Stationary), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_8000000 | ENEMY_FLAG_10000000 | ENEMY_FLAG_20000000, + .drops = NO_DROPS, + .animations = TOAD_GUARD_RED_ANIMS, + .extraAnimations = N(ExtraAnims_ToadGuard), + }, + { + .id = NPC_ToadGuard_04, + .pos = { -50.0f, 100.0f, -365.0f }, + .yaw = 270, + .settings = &N(NpcSettings_Toad_Stationary), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_8000000 | ENEMY_FLAG_10000000 | ENEMY_FLAG_20000000, + .drops = NO_DROPS, + .animations = TOAD_GUARD_BLUE_ANIMS, + .extraAnimations = N(ExtraAnims_ToadGuard), + }, + { + .id = NPC_ToadGuard_05, + .pos = { 225.0f, 0.0f, 125.0f }, + .yaw = 270, + .settings = &N(NpcSettings_Toad_Stationary), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_8000000 | ENEMY_FLAG_10000000 | ENEMY_FLAG_20000000, + .drops = NO_DROPS, + .animations = TOAD_GUARD_RED_ANIMS, + .extraAnimations = N(ExtraAnims_ToadGuard), + }, + { + .id = NPC_ToadGuard_06, + .pos = { -392.0f, 40.0f, -230.0f }, + .yaw = 90, + .settings = &N(NpcSettings_Toad_Stationary), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_8000000 | ENEMY_FLAG_10000000 | ENEMY_FLAG_20000000, + .drops = NO_DROPS, + .animations = TOAD_GUARD_GREEN_ANIMS, + .extraAnimations = N(ExtraAnims_ToadGuard), + }, + { + .id = NPC_ToadGuard_07, + .pos = { -392.0f, 40.0f, -230.0f }, + .yaw = 90, + .settings = &N(NpcSettings_Toad_Stationary), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_8000000 | ENEMY_FLAG_10000000 | ENEMY_FLAG_20000000, + .drops = NO_DROPS, + .animations = TOAD_GUARD_YELLOW_ANIMS, + .extraAnimations = N(ExtraAnims_ToadGuard), + }, +}; + +NpcGroupList N(EndingNPCs) = { + NPC_GROUP(N(NpcData_Peach)), + NPC_GROUP(N(NpcData_SpecialToads)), + NPC_GROUP(N(NpcData_Party)), + NPC_GROUP(N(NpcData_Wizards)), + NPC_GROUP(N(NpcData_PartyFamily)), + NPC_GROUP(N(NpcData_Visitors)), + NPC_GROUP(N(NpcData_Toads)), + NPC_GROUP(N(NpcData_Toadettes)), + NPC_GROUP(N(NpcData_ToadGuards)), + {} +}; diff --git a/src/world/area_kkj/kkj_00/kkj_00_6_scene_ending.c b/src/world/area_kkj/kkj_00/kkj_00_6_scene_ending.c new file mode 100644 index 0000000000..ac69070c09 --- /dev/null +++ b/src/world/area_kkj/kkj_00/kkj_00_6_scene_ending.c @@ -0,0 +1,221 @@ +#include "kkj_00.h" + +API_CALLABLE(N(FadeScreenToWhite)) { + if (isInitialCall) { + script->functionTemp[1] = 0; + } + + set_screen_overlay_color(0, 208, 208, 208); + set_screen_overlay_params_front(1, script->functionTemp[1]); + + if (script->functionTemp[1] == 255) { + return ApiStatus_DONE2; + } + + script->functionTemp[1] += 7; + if (script->functionTemp[1] > 255) { + script->functionTemp[1] = 255; + } + + return ApiStatus_BLOCK; +} + +EvtScript N(EVS_OpenAndCloseFrontDoor_Ending) = { + EVT_CALL(PlaySoundAtCollider, COLLIDER_tts, SOUND_LARGE_DOOR_OPEN, 0) + EVT_CALL(MakeLerp, 0, 80, 14, EASING_QUADRATIC_OUT) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_CALL(RotateModel, MODEL_door2, LVar0, 0, -1, 0) + EVT_CALL(RotateModel, MODEL_door1, LVar0, 0, 1, 0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_WAIT(30) + EVT_CALL(MakeLerp, 80, 0, 8, EASING_QUADRATIC_OUT) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_CALL(RotateModel, MODEL_door2, LVar0, 0, 1, 0) + EVT_CALL(RotateModel, MODEL_door1, LVar0, 0, -1, 0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_CALL(PlaySoundAtCollider, COLLIDER_tts, SOUND_LARGE_DOOR_CLOSE, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_OpenAndClosePeachDoor) = { + EVT_CALL(PlaySoundAtCollider, COLLIDER_ttn, SOUND_LARGE_DOOR_OPEN, 0) + EVT_CALL(MakeLerp, 0, 80, 14, EASING_QUADRATIC_OUT) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_CALL(RotateModel, MODEL_door3, LVar0, 0, -1, 0) + EVT_CALL(RotateModel, MODEL_door4, LVar0, 0, 1, 0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_WAIT(30) + EVT_CALL(MakeLerp, 80, 0, 8, EASING_QUADRATIC_OUT) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_CALL(RotateModel, MODEL_door4, LVar0, 0, 1, 0) + EVT_CALL(RotateModel, MODEL_door3, LVar0, 0, -1, 0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_CALL(PlaySoundAtCollider, COLLIDER_ttn, SOUND_LARGE_DOOR_CLOSE, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Scene_Ending) = { + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, 50, 0, 250) + EVT_CALL(SetPanTarget, CAM_DEFAULT, 50, 0, 250) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(90.0)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_WAIT(10) + EVT_EXEC(N(EVS_OpenAndCloseFrontDoor_Ending)) + EVT_CALL(func_802D1270, 0, 300, EVT_FLOAT(4.0)) + EVT_CALL(SetNpcAnimation, NPC_Toad_01, ANIM_ToadMinister_Walk) + EVT_CALL(NpcMoveTo, NPC_Toad_01, 74, 243, 10) + EVT_CALL(SetNpcAnimation, NPC_Toad_01, ANIM_ToadMinister_Idle) + EVT_CALL(SpeakToPlayer, NPC_Toad_01, ANIM_ToadMinister_Talk, ANIM_ToadMinister_Idle, 0, MSG_Outro_0064) + EVT_WAIT(10) + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, 0, 100, -290) + EVT_CALL(SetPanTarget, CAM_DEFAULT, 0, 100, -290) + EVT_CALL(SetCamDistance, CAM_DEFAULT, 400) + EVT_CALL(SetCamPitch, CAM_DEFAULT, 10, -7) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_WAIT(20) + EVT_CALL(SpeakToPlayer, NPC_ToadGuard_03, ANIM_ToadGuard_Red_Talk, ANIM_ToadGuard_Red_Idle, 5, MSG_Outro_0065) + EVT_CALL(InterpPlayerYaw, 0, 0) + EVT_WAIT(10) + EVT_CALL(SetMusicTrack, 0, SONG_PEACH_APPEARS, 0, 8) + EVT_EXEC(N(EVS_OpenAndClosePeachDoor)) + EVT_THREAD + EVT_CALL(SetNpcAnimation, NPC_Peach, ANIM_Peach_A0002) + EVT_CALL(SetNpcSpeed, NPC_Peach, EVT_FLOAT(2.0)) + EVT_CALL(NpcMoveTo, NPC_Peach, 0, -200, 0) + EVT_CALL(SetNpcAnimation, NPC_Peach, ANIM_Peach_A0001) + EVT_END_THREAD + EVT_LOOP(0) + EVT_CALL(GetNpcPos, NPC_Peach, LVar0, LVar1, LVar2) + EVT_IF_GT(LVar0, -350) + EVT_BREAK_LOOP + EVT_END_IF + EVT_WAIT(1) + EVT_END_LOOP + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, 0, 100, -200) + EVT_CALL(SetPanTarget, CAM_DEFAULT, 0, 100, -200) + EVT_CALL(SetCamDistance, CAM_DEFAULT, 550) + EVT_CALL(SetCamPitch, CAM_DEFAULT, 10, -7) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(0.6)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, 0, 100, -200) + EVT_CALL(SetPanTarget, CAM_DEFAULT, 0, 100, -200) + EVT_CALL(SetCamDistance, CAM_DEFAULT, 250) + EVT_CALL(SetCamPitch, CAM_DEFAULT, 3, -11) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(90.0)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_WAIT(20) + EVT_CALL(SetMusicTrack, 0, SONG_PEACH_APPEARS, 1, 8) + EVT_CALL(SetNpcAnimation, NPC_Peach, ANIM_Peach_C0000) + EVT_WAIT(10) + EVT_CALL(SetNpcAnimation, NPC_Peach, ANIM_Peach_C0026) + EVT_CALL(SpeakToPlayer, NPC_Peach, ANIM_Peach_C0001, ANIM_Peach_C0026, 5, MSG_Outro_0066) + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, 50, 0, 250) + EVT_CALL(SetPanTarget, CAM_DEFAULT, 50, 0, 250) + EVT_CALL(SetCamDistance, CAM_DEFAULT, 500) + EVT_CALL(SetCamPitch, CAM_DEFAULT, 3, -10) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_WAIT(1) + EVT_CALL(SpeakToPlayer, NPC_Peach, ANIM_Peach_C0001, ANIM_Peach_C0026, 5, MSG_Outro_0067) + EVT_WAIT(10) + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, 0, 100, -200) + EVT_CALL(SetPanTarget, CAM_DEFAULT, 0, 100, -200) + EVT_CALL(SetCamDistance, CAM_DEFAULT, 300) + EVT_CALL(SetCamPitch, CAM_DEFAULT, 25, EVT_FLOAT(-9.5)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_CALL(InterpPlayerYaw, 90, 0) + EVT_WAIT(10) + EVT_CALL(SpeakToPlayer, NPC_Peach, ANIM_Peach_C0001, ANIM_Peach_C0026, 5, MSG_Outro_0068) + EVT_CALL(SetNpcAnimation, NPC_Peach, ANIM_Peach_C0002) + EVT_WAIT(10) + EVT_CALL(SetNpcAnimation, NPC_Peach, ANIM_Peach_A0001) + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, 0, 0, 300) + EVT_CALL(SetPanTarget, CAM_DEFAULT, 0, 0, 300) + EVT_CALL(SetCamDistance, CAM_DEFAULT, EVT_FLOAT(252.7)) + EVT_CALL(SetCamPitch, CAM_DEFAULT, 5, EVT_FLOAT(-9.5)) + EVT_CALL(SetCamPosA, CAM_DEFAULT, 500, 100) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_WAIT(20) + EVT_CALL(ShowMessageAtWorldPos, MSG_Outro_0069, 0, 100, -200) + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, 250, 0, 100) + EVT_CALL(SetPanTarget, CAM_DEFAULT, 250, 0, 100) + EVT_CALL(SetCamDistance, CAM_DEFAULT, 400) + EVT_CALL(SetCamPitch, CAM_DEFAULT, 15, -1) + EVT_CALL(SetCamPosA, CAM_DEFAULT, -100, 100) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_WAIT(1) + EVT_CALL(ShowMessageAtWorldPos, MSG_Outro_006A, 0, 100, -200) + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, -250, 0, 50) + EVT_CALL(SetPanTarget, CAM_DEFAULT, -250, 0, 50) + EVT_CALL(SetCamDistance, CAM_DEFAULT, 450) + EVT_CALL(SetCamPitch, CAM_DEFAULT, 15, -7) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_WAIT(1) + EVT_CALL(ShowMessageAtWorldPos, MSG_Outro_006B, 0, 100, -200) + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, -150, 0, 360) + EVT_CALL(SetPanTarget, CAM_DEFAULT, -150, 0, 360) + EVT_CALL(SetCamDistance, CAM_DEFAULT, 300) + EVT_CALL(SetCamPitch, CAM_DEFAULT, 25, -13) + EVT_CALL(SetCamPosA, CAM_DEFAULT, 820, -100) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_WAIT(1) + EVT_CALL(ShowMessageAtWorldPos, MSG_Outro_006C, 0, 100, -200) + EVT_WAIT(10) + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, 0, 100, -200) + EVT_CALL(SetPanTarget, CAM_DEFAULT, 0, 100, -200) + EVT_CALL(SetCamDistance, CAM_DEFAULT, 250) + EVT_CALL(SetCamPitch, CAM_DEFAULT, 5, -10) + EVT_CALL(SetCamPosA, CAM_DEFAULT, -500, -1400) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_WAIT(1) + EVT_CALL(SetNpcAnimation, NPC_Peach, ANIM_Peach_C0000) + EVT_WAIT(10) + EVT_CALL(SetNpcAnimation, NPC_Peach, ANIM_Peach_C0026) + EVT_CALL(SpeakToPlayer, NPC_Peach, ANIM_Peach_C0001, ANIM_Peach_C0026, 0, MSG_Outro_006D) + EVT_CALL(SetNpcAnimation, NPC_Peach, ANIM_Peach_C0002) + EVT_WAIT(30) + EVT_CALL(SetNpcAnimation, NPC_Peach, ANIM_Peach_D000F) + EVT_WAIT(60) + EVT_CALL(SetNpcAnimation, NPC_Peach, ANIM_Peach_C0026) + EVT_CALL(SpeakToPlayer, NPC_Peach, ANIM_Peach_C0001, ANIM_Peach_C0026, 0, MSG_Outro_006E) + EVT_CALL(SetNpcAnimation, NPC_Peach, ANIM_Peach_C0010) + EVT_CALL(EnableGroup, MODEL_chandelier, FALSE) + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, 0, 0, 120) + EVT_CALL(SetPanTarget, CAM_DEFAULT, 0, 0, 120) + EVT_CALL(SetCamDistance, CAM_DEFAULT, 1300) + EVT_CALL(SetCamPitch, CAM_DEFAULT, 30, -7) + EVT_CALL(SetCamPosA, CAM_DEFAULT, -120, 75) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(0.5)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_WAIT(120) + EVT_CALL(N(FadeScreenToWhite)) + EVT_WAIT(60) + EVT_CALL(FadeOutMusic, 0, 2000) + EVT_CALL(GotoMapSpecial, EVT_PTR("end_00"), end_00_ENTRY_0, TRANSITION_5) + EVT_WAIT(100) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_kkj/kkj_01/AC5170.c b/src/world/area_kkj/kkj_01/AC5170.c deleted file mode 100644 index 6d76d936ad..0000000000 --- a/src/world/area_kkj/kkj_01/AC5170.c +++ /dev/null @@ -1,8 +0,0 @@ -#include "kkj_01.h" - -static char* N(exit_str_0) = "kkj_00"; -static char* N(exit_str_1) = "kkj_02"; -static char* N(exit_str_2) = "kkj_14"; -static char* N(exit_str_3) = ""; - -#include "world/common/enemy/ai/PatrolNoAttackAI.inc.c" diff --git a/src/world/area_kkj/kkj_01/kkj_01.h b/src/world/area_kkj/kkj_01/kkj_01.h index 9a24d0693d..3fba1b3d25 100644 --- a/src/world/area_kkj/kkj_01/kkj_01.h +++ b/src/world/area_kkj/kkj_01/kkj_01.h @@ -2,8 +2,31 @@ /// @brief Peach's Castle - Intro Upper Hall (2F) #include "common.h" -#include "../kkj.h" #include "message_ids.h" #include "map.h" +#include "../kkj.h" +#include "mapfs/kkj_01_shape.h" +#include "mapfs/kkj_01_hit.h" + +enum { + NPC_ToadMinister = 0, + NPC_Toad_01 = 1, + NPC_Toad_02 = 2, + NPC_Toad_03 = 3, + NPC_Toadette = 4, + NPC_ToadGuard_01 = 5, + NPC_ToadGuard_02 = 6, + NPC_Dryite = 7, + NPC_Mouser = 8, + NPC_MayorPenguin = 9, + NPC_Koopa = 10, +}; + #define NAMESPACE kkj_01 + +extern EvtScript N(EVS_Main); +extern EvtScript N(EVS_SetupMusic); +extern EvtScript N(EVS_ExitDoors_kkj_14_0); + +extern NpcGroupList N(DefaultNPCs); diff --git a/src/world/area_kkj/kkj_01/kkj_01_0_header.c b/src/world/area_kkj/kkj_01/kkj_01_0_header.c new file mode 100644 index 0000000000..fb32381a83 --- /dev/null +++ b/src/world/area_kkj/kkj_01/kkj_01_0_header.c @@ -0,0 +1,18 @@ +#include "kkj_01.h" + +EntryList N(Entrances) = { + [kkj_01_ENTRY_0] { 0.0, 0.0, 480.0, 0.0 }, + [kkj_01_ENTRY_1] { 0.0, 100.0, -360.0, 180.0 }, + [kkj_01_ENTRY_2] { -325.0, 0.0, 360.0, 45.0 }, + [kkj_01_ENTRY_3] { -480.0, 0.0, 50.0, 90.0 }, + [kkj_01_ENTRY_4] { 0.0, 0.0, -255.0, 180.0 }, + [kkj_01_ENTRY_5] { 480.0, 0.0, 50.0, 270.0 }, + [kkj_01_ENTRY_6] { 300.0, 0.0, 380.0, 315.0 }, + [kkj_01_ENTRY_7] { 354.0, 0.0, 294.0, 117.0 }, +}; + +MapSettings N(settings) = { + .main = &N(EVS_Main), + .entryList = &N(Entrances), + .entryCount = ENTRY_COUNT(N(Entrances)), +}; diff --git a/src/world/area_kkj/kkj_01/kkj_01_1_music.c b/src/world/area_kkj/kkj_01/kkj_01_1_music.c new file mode 100644 index 0000000000..f4892bb5d8 --- /dev/null +++ b/src/world/area_kkj/kkj_01/kkj_01_1_music.c @@ -0,0 +1,12 @@ +#include "kkj_01.h" + +EvtScript N(EVS_SetupMusic) = { + EVT_CALL(GetEntryID, LVar0) + EVT_IF_EQ(LVar0, kkj_01_ENTRY_1) + EVT_CALL(SetMusicTrack, 0, SONG_PEACHS_CASTLE_PARTY, 1, 7) + EVT_WAIT(3) + EVT_END_IF + EVT_CALL(SetMusicTrack, 0, SONG_PEACHS_CASTLE_PARTY, 1, 8) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_kkj/kkj_01/kkj_01_2_main.c b/src/world/area_kkj/kkj_01/kkj_01_2_main.c new file mode 100644 index 0000000000..0842b38d5e --- /dev/null +++ b/src/world/area_kkj/kkj_01/kkj_01_2_main.c @@ -0,0 +1,133 @@ +#include "kkj_01.h" + +EvtScript N(EVS_ExitDoors_kkj_00_1) = { + EVT_SET_GROUP(EVT_GROUP_1B) + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(UseDoorSounds, DOOR_SOUNDS_LARGE) + EVT_SET(LVar0, kkj_01_ENTRY_0) + EVT_SET(LVar1, COLLIDER_tts) + EVT_SET(LVar2, MODEL_door2) + EVT_SET(LVar3, MODEL_door1) + EVT_EXEC(ExitDoubleDoor) + EVT_WAIT(17) + EVT_CALL(GotoMap, EVT_PTR("kkj_00"), kkj_00_ENTRY_1) + EVT_WAIT(100) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_ExitDoors_kkj_02_0) = { + EVT_SET_GROUP(EVT_GROUP_1B) + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(UseDoorSounds, DOOR_SOUNDS_LARGE) + EVT_SET(LVar0, kkj_01_ENTRY_1) + EVT_SET(LVar1, COLLIDER_ttn) + EVT_SET(LVar2, MODEL_door3) + EVT_SET(LVar3, MODEL_door4) + EVT_EXEC(ExitDoubleDoor) + EVT_WAIT(17) + EVT_CALL(GotoMap, EVT_PTR("kkj_02"), kkj_02_ENTRY_0) + EVT_WAIT(100) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_ExitDoors_kkj_14_0) = { + EVT_SET_GROUP(EVT_GROUP_1B) + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(UseDoorSounds, DOOR_SOUNDS_BASIC) + EVT_SET(LVar0, kkj_01_ENTRY_4) + EVT_SET(LVar1, COLLIDER_ttn2) + EVT_SET(LVar2, MODEL_door7) + EVT_SET(LVar3, DOOR_SWING_OUT) + EVT_EXEC(ExitSingleDoor) + EVT_WAIT(17) + EVT_CALL(GotoMap, EVT_PTR("kkj_14"), kkj_14_ENTRY_0) + EVT_WAIT(100) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_ShowMessage_CantOpen) = { + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(ShowMessageAtScreenPos, MSG_Menus_Inspect_DoesntOpen, 160, 40) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_BindExitTriggers) = { + EVT_IF_EQ(AF_KKJ_01, TRUE) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitDoors_kkj_14_0)), TRIGGER_WALL_PRESS_A, COLLIDER_ttn2, 1, 0) + EVT_END_IF + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ShowMessage_CantOpen)), TRIGGER_WALL_PRESS_A, COLLIDER_tte, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ShowMessage_CantOpen)), TRIGGER_WALL_PRESS_A, COLLIDER_ttsw, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ShowMessage_CantOpen)), TRIGGER_WALL_PRESS_A, COLLIDER_ttw, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ShowMessage_CantOpen)), TRIGGER_WALL_PRESS_A, COLLIDER_ttse, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitDoors_kkj_00_1)), TRIGGER_WALL_PRESS_A, COLLIDER_tts, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitDoors_kkj_02_0)), TRIGGER_WALL_PRESS_A, COLLIDER_ttn, 1, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_EnterMap) = { + EVT_CALL(UseDoorSounds, DOOR_SOUNDS_BASIC) + EVT_CALL(GetEntryID, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_EQ(kkj_01_ENTRY_0) + EVT_CALL(UseDoorSounds, DOOR_SOUNDS_LARGE) + EVT_SET(LVar2, MODEL_door2) + EVT_SET(LVar3, MODEL_door1) + EVT_EXEC_WAIT(EnterDoubleDoor) + EVT_CASE_EQ(kkj_01_ENTRY_1) + EVT_CALL(UseDoorSounds, DOOR_SOUNDS_LARGE) + EVT_SET(LVar2, MODEL_door3) + EVT_SET(LVar3, MODEL_door4) + EVT_EXEC_WAIT(EnterDoubleDoor) + EVT_CASE_EQ(kkj_01_ENTRY_2) + EVT_SET(LVar2, MODEL_door5) + EVT_SET(LVar3, DOOR_SWING_OUT) + EVT_EXEC_WAIT(EnterSingleDoor) + EVT_CASE_EQ(kkj_01_ENTRY_3) + EVT_SET(LVar2, MODEL_door6) + EVT_SET(LVar3, DOOR_SWING_OUT) + EVT_EXEC_WAIT(EnterSingleDoor) + EVT_CASE_EQ(kkj_01_ENTRY_4) + EVT_SET(LVar2, MODEL_door7) + EVT_SET(LVar3, DOOR_SWING_OUT) + EVT_EXEC_WAIT(EnterSingleDoor) + EVT_CASE_EQ(kkj_01_ENTRY_5) + EVT_SET(LVar2, MODEL_door8) + EVT_SET(LVar3, DOOR_SWING_IN) + EVT_EXEC_WAIT(EnterSingleDoor) + EVT_CASE_EQ(kkj_01_ENTRY_6) + EVT_SET(LVar2, MODEL_door9) + EVT_SET(LVar3, DOOR_SWING_IN) + EVT_EXEC_WAIT(EnterSingleDoor) + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Main) = { + EVT_SET(GB_WorldLocation, LOCATION_PEACH_CASTLE_GROUNDS) + EVT_CALL(SetSpriteShading, SHADING_NONE) + EVT_SETUP_CAMERA_NO_LEAD() + EVT_CALL(MakeNpcs, FALSE, EVT_PTR(N(DefaultNPCs))) + EVT_IF_NE(GB_StoryProgress, STORY_INTRO) + EVT_CALL(EnableModel, MODEL_g74, FALSE) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_g77, COLLIDER_FLAGS_UPPER_MASK) + EVT_ELSE + EVT_CALL(EnableModel, MODEL_o321, FALSE) + EVT_CALL(EnableModel, MODEL_o337, FALSE) + EVT_CALL(EnableModel, MODEL_o330, FALSE) + EVT_END_IF + EVT_EXEC(N(EVS_SetupMusic)) + EVT_EXEC(N(EVS_BindExitTriggers)) + EVT_EXEC(N(EVS_EnterMap)) + EVT_WAIT(1) + EVT_RETURN + EVT_END +}; + +MAP_RODATA_PAD(1, exits); diff --git a/src/world/area_kkj/kkj_01/kkj_01_3_npc.c b/src/world/area_kkj/kkj_01/kkj_01_3_npc.c new file mode 100644 index 0000000000..3aadf1d5b9 --- /dev/null +++ b/src/world/area_kkj/kkj_01/kkj_01_3_npc.c @@ -0,0 +1,442 @@ +#include "kkj_01.h" + +#include "world/common/npc/Toad_Wander.inc.c" +#include "world/common/npc/Toad_Patrol.inc.c" +#include "world/common/npc/Toad_Stationary.inc.c" +#include "world/common/npc/Dryite_Stationary.inc.c" +#include "world/common/npc/Mouser.inc.c" +#include "world/common/npc/Penguin.inc.c" +#include "world/common/npc/Koopa.inc.c" + +EvtScript N(EVS_NpcIdle_Dryite) = { + EVT_LOOP(0) + EVT_CALL(GetSelfVar, 1, LVar0) + EVT_IF_EQ(LVar0, 0) + EVT_CALL(SetNpcAnimation, NPC_Dryite, ANIM_Dryite_Yellow_Talk) + EVT_CALL(SetSelfVar, 1, 1) + EVT_ELSE + EVT_CALL(SetNpcAnimation, NPC_Mouser, ANIM_Mouser_Blue_Talk) + EVT_CALL(SetSelfVar, 1, 0) + EVT_END_IF + EVT_CALL(RandInt, 60, LVar0) + EVT_ADD(LVar0, 30) + EVT_WAIT(LVar0) + EVT_CALL(SetNpcAnimation, NPC_Dryite, ANIM_Dryite_Yellow_Idle) + EVT_CALL(SetNpcAnimation, NPC_Mouser, ANIM_Mouser_Blue_Idle) + EVT_WAIT(10) + EVT_END_LOOP + EVT_END +}; + +EvtScript N(EVS_NpcIdle_MayorPenguin) = { + EVT_LOOP(0) + EVT_CALL(GetSelfVar, 1, LVar0) + EVT_IF_EQ(LVar0, 0) + EVT_CALL(SetNpcAnimation, NPC_MayorPenguin, ANIM_MayorPenguin_Talk) + EVT_CALL(SetSelfVar, 1, 1) + EVT_ELSE + EVT_CALL(SetNpcAnimation, NPC_Koopa, ANIM_Koopa_Talk) + EVT_CALL(SetSelfVar, 1, 0) + EVT_END_IF + EVT_CALL(RandInt, 60, LVar0) + EVT_ADD(LVar0, 30) + EVT_WAIT(LVar0) + EVT_CALL(SetNpcAnimation, NPC_MayorPenguin, ANIM_MayorPenguin_Idle) + EVT_CALL(SetNpcAnimation, NPC_Koopa, ANIM_Koopa_Idle) + EVT_WAIT(10) + EVT_END_LOOP + EVT_END +}; + +EvtScript N(EVS_NpcIdle_ToadMinister) = { + EVT_WAIT(30) + EVT_LOOP(0) + EVT_WAIT(150) + EVT_LOOP(2) + EVT_CALL(InterpNpcYaw, NPC_SELF, 90, 7) + EVT_WAIT(20) + EVT_CALL(InterpNpcYaw, NPC_SELF, 270, 7) + EVT_WAIT(20) + EVT_END_LOOP + EVT_END_LOOP + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcIdle_Toad_01) = { + EVT_LOOP(0) + EVT_WAIT(150) + EVT_LOOP(2) + EVT_CALL(InterpNpcYaw, NPC_SELF, 90, 7) + EVT_WAIT(15) + EVT_CALL(InterpNpcYaw, NPC_SELF, 270, 7) + EVT_WAIT(15) + EVT_END_LOOP + EVT_END_LOOP + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcIdle_ToadGuard_02) = { + EVT_IF_EQ(AF_KKJ_02, TRUE) + EVT_RETURN + EVT_END_IF + EVT_CALL(GetEntryID, LVar0) + EVT_IF_NE(LVar0, kkj_01_ENTRY_4) + EVT_RETURN + EVT_END_IF + EVT_CALL(WaitForPlayerInputEnabled) + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_ToadGuard_Yellow_Talk, ANIM_ToadGuard_Yellow_Idle, 16, MSG_Intro_0042) + EVT_SET(AF_KKJ_02, TRUE) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInteract_ToadMinister) = { + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_ToadMinister_Talk, ANIM_ToadMinister_Idle, 0, MSG_Intro_0033) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInteract_Toad_01) = { + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Toad_Blue_Talk, ANIM_Toad_Blue_Idle, 16, MSG_Intro_0038) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInteract_Toad_02) = { + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Toad_Green_Talk, ANIM_Toad_Green_Idle, 16, MSG_Intro_0039) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInteract_Toad_03) = { + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Toad_Red_Talk, ANIM_Toad_Red_Idle, 16, MSG_Intro_003A) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInteract_Toadette) = { + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Toadette_Orange_Talk, ANIM_Toadette_Orange_Idle, 16, MSG_Intro_003B) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInteract_ToadGuard_01) = { + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_ToadGuard_Red_Talk, ANIM_ToadGuard_Red_Idle, 16, MSG_Intro_003C) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInteract_ToadGuard_02) = { + EVT_CALL(GetSelfVar, 0, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_EQ(0) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_ToadGuard_Yellow_Talk, ANIM_ToadGuard_Yellow_Idle, 16, MSG_Intro_003D) + EVT_CASE_EQ(1) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_ToadGuard_Yellow_Talk, ANIM_ToadGuard_Yellow_Idle, 16, MSG_Intro_003E) + EVT_CASE_OR_EQ(2) + EVT_CASE_OR_EQ(3) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_ToadGuard_Yellow_Talk, ANIM_ToadGuard_Yellow_Idle, 16, MSG_Intro_003F) + EVT_END_CASE_GROUP + EVT_CASE_EQ(4) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_ToadGuard_Yellow_Talk, ANIM_ToadGuard_Yellow_Idle, 16, MSG_Intro_0040) + EVT_WAIT(10) + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_CALL(SetNpcAnimation, NPC_ToadGuard_02, ANIM_ToadGuard_Yellow_Walk) + EVT_IF_GT(LVar0, 0) + EVT_SET(LVar3, -50) + EVT_ELSE + EVT_SET(LVar3, 50) + EVT_END_IF + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_100, TRUE) + EVT_CALL(SetNpcSpeed, NPC_SELF, EVT_FLOAT(2.0)) + EVT_CALL(NpcMoveTo, NPC_SELF, LVar3, -245, 0) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_100, FALSE) + EVT_CALL(SetNpcAnimation, NPC_ToadGuard_02, ANIM_ToadGuard_Yellow_Idle) + EVT_CALL(InterpNpcYaw, NPC_SELF, 180, 5) + EVT_SET(AF_KKJ_01, TRUE) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitDoors_kkj_14_0)), TRIGGER_WALL_PRESS_A, COLLIDER_ttn2, 1, 0) + EVT_CASE_DEFAULT + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_ToadGuard_Yellow_Talk, ANIM_ToadGuard_Yellow_Idle, 16, MSG_Intro_0041) + EVT_END_SWITCH + EVT_ADD(LVar0, 1) + EVT_CALL(SetSelfVar, 0, LVar0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInteract_Dryite) = { + EVT_CALL(SetNpcAnimation, NPC_Mouser, ANIM_Mouser_Blue_Idle) + EVT_CALL(SetNpcAnimation, NPC_Dryite, ANIM_Dryite_Yellow_Idle) + EVT_WAIT(10) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Dryite_Yellow_Talk, ANIM_Dryite_Yellow_Idle, 16, MSG_Intro_0034) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInteract_Mouser) = { + EVT_CALL(EnableNpcAI, NPC_Dryite, FALSE) + EVT_CALL(SetNpcAnimation, NPC_Mouser, ANIM_Mouser_Blue_Idle) + EVT_CALL(SetNpcAnimation, NPC_Dryite, ANIM_Dryite_Yellow_Idle) + EVT_WAIT(10) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Mouser_Blue_Talk, ANIM_Mouser_Blue_Idle, 16, MSG_Intro_0035) + EVT_CALL(EnableNpcAI, NPC_Dryite, TRUE) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInteract_MayorPenguin) = { + EVT_CALL(SetNpcAnimation, NPC_MayorPenguin, ANIM_MayorPenguin_Idle) + EVT_CALL(SetNpcAnimation, NPC_Koopa, ANIM_Koopa_Idle) + EVT_WAIT(10) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_MayorPenguin_Talk, ANIM_MayorPenguin_Idle, 16, MSG_Intro_0036) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInteract_Koopa) = { + EVT_CALL(EnableNpcAI, NPC_MayorPenguin, FALSE) + EVT_CALL(SetNpcAnimation, NPC_MayorPenguin, ANIM_MayorPenguin_Idle) + EVT_CALL(SetNpcAnimation, NPC_Koopa, ANIM_Koopa_Idle) + EVT_WAIT(10) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Koopa_Talk, ANIM_Koopa_Idle, 16, MSG_Intro_0037) + EVT_CALL(EnableNpcAI, NPC_MayorPenguin, TRUE) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_ToadMinister) = { + EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(EVS_NpcIdle_ToadMinister))) + EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(EVS_NpcInteract_ToadMinister))) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_Toad_01) = { + EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(EVS_NpcIdle_Toad_01))) + EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(EVS_NpcInteract_Toad_01))) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_Toad_02) = { + EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(EVS_NpcInteract_Toad_02))) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_Toad_03) = { + EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(EVS_NpcInteract_Toad_03))) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_Toadette) = { + EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(EVS_NpcInteract_Toadette))) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_ToadGuard_01) = { + EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(EVS_NpcInteract_ToadGuard_01))) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_ToadGuard_02) = { + EVT_IF_EQ(AF_KKJ_01, TRUE) + EVT_CALL(SetNpcPos, NPC_SELF, -50, 0, -245) + EVT_CALL(SetSelfVar, 0, 5) + EVT_ELSE + EVT_CALL(SetNpcPos, NPC_SELF, 0, 0, -260) + EVT_END_IF + EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(EVS_NpcIdle_ToadGuard_02))) + EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(EVS_NpcInteract_ToadGuard_02))) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_Dryite) = { + EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(EVS_NpcIdle_Dryite))) + EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(EVS_NpcInteract_Dryite))) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_Mouser) = { + EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(EVS_NpcInteract_Mouser))) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_MayorPenguin) = { + EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(EVS_NpcIdle_MayorPenguin))) + EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(EVS_NpcInteract_MayorPenguin))) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_Koopa) = { + EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(EVS_NpcInteract_Koopa))) + EVT_RETURN + EVT_END +}; + +NpcData N(NpcData_ToadMinister)[] = { + { + .id = NPC_ToadMinister, + .pos = { 0.0f, 0.0f, 350.0f }, + .yaw = 270, + .init = &N(EVS_NpcInit_ToadMinister), + .drops = NO_DROPS, + .settings = &N(NpcSettings_Toad_Stationary), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .animations = TOAD_MINISTER_ANIMS, + }, + { + .id = NPC_Toad_01, + .pos = { 100.0f, 0.0f, 175.0f }, + .yaw = 270, + .init = &N(EVS_NpcInit_Toad_01), + .drops = NO_DROPS, + .settings = &N(NpcSettings_Toad_Stationary), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .animations = TOAD_BLUE_ANIMS, + }, + { + .id = NPC_Toad_02, + .pos = { 200.0f, 0.0f, 110.0f }, + .yaw = 270, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_CYLINDER, + .centerPos = { 200, 0, 110 }, + .wanderSize = { 70 }, + .detectShape = SHAPE_CYLINDER, + .detectPos = { 200, 0, 110 }, + .detectSize = { 70 }, + } + }, + .init = &N(EVS_NpcInit_Toad_02), + .drops = NO_DROPS, + .settings = &N(NpcSettings_Toad_Wander), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .animations = TOAD_GREEN_ANIMS, + }, + { + .id = NPC_Toad_03, + .pos = { -250.0f, 0.0f, 225.0f }, + .yaw = 90, + .territory = { + .patrol = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .numPoints = 2, + .points = { + { -250, 0, 225 }, + { 300, 0, -50 }, + }, + .detectShape = SHAPE_CYLINDER, + .detectPos = { -250, 0, 225 }, + .detectSize = { 200 }, + } + }, + .init = &N(EVS_NpcInit_Toad_03), + .drops = NO_DROPS, + .settings = &N(NpcSettings_Toad_Patrol), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .animations = TOAD_RED_ANIMS, + }, + { + .id = NPC_Toadette, + .pos = { -170.0f, 0.0f, 100.0f }, + .yaw = 90, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_CYLINDER, + .centerPos = { -170, 0, 100 }, + .wanderSize = { 70 }, + .detectShape = SHAPE_CYLINDER, + .detectPos = { -170, 0, 100 }, + .detectSize = { 70 }, + } + }, + .init = &N(EVS_NpcInit_Toadette), + .drops = NO_DROPS, + .settings = &N(NpcSettings_Toad_Wander), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .animations = TOADETTE_ORANGE_ANIMS, + }, + { + .id = NPC_ToadGuard_01, + .pos = { -55.0f, 100.0f, -360.0f }, + .yaw = 270, + .init = &N(EVS_NpcInit_ToadGuard_01), + .drops = NO_DROPS, + .settings = &N(NpcSettings_Toad_Stationary), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .animations = TOAD_GUARD_RED_ANIMS, + }, + { + .id = NPC_ToadGuard_02, + .pos = { NPC_DISPOSE_LOCATION }, + .yaw = 270, + .init = &N(EVS_NpcInit_ToadGuard_02), + .drops = NO_DROPS, + .settings = &N(NpcSettings_Toad_Stationary), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .animations = TOAD_GUARD_YELLOW_ANIMS, + }, + { + .id = NPC_Dryite, + .pos = { 170.0f, 0.0f, 345.0f }, + .yaw = 90, + .init = &N(EVS_NpcInit_Dryite), + .drops = NO_DROPS, + .settings = &N(NpcSettings_Dryite), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_400000, + .animations = DRYITE_YELLOW_ANIMS, + }, + { + .id = NPC_Mouser, + .pos = { 200.0f, 0.0f, 325.0f }, + .yaw = 270, + .init = &N(EVS_NpcInit_Mouser), + .drops = NO_DROPS, + .settings = &N(NpcSettings_Mouser), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_400000, + .animations = MOUSER_BLUE_ANIMS, + }, + { + .id = NPC_MayorPenguin, + .pos = { -150.0f, 0.0f, 0.0f }, + .yaw = 90, + .init = &N(EVS_NpcInit_MayorPenguin), + .drops = NO_DROPS, + .settings = &N(NpcSettings_Penguin), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_400000, + .animations = MAYOR_PENGUIN_ANIMS, + }, + { + .id = NPC_Koopa, + .pos = { -120.0f, 0.0f, -15.0f }, + .yaw = 270, + .init = &N(EVS_NpcInit_Koopa), + .drops = NO_DROPS, + .settings = &N(NpcSettings_Koopa), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_800 | ENEMY_FLAG_400000, + .animations = KOOPA_ANIMS, + }, +}; + +NpcGroupList N(DefaultNPCs) = { + NPC_GROUP(N(NpcData_ToadMinister)), + {} +}; diff --git a/src/world/area_kkj/kkj_02/AC8D20.c b/src/world/area_kkj/kkj_02/AC8D20.c deleted file mode 100644 index d1b22fee3c..0000000000 --- a/src/world/area_kkj/kkj_02/AC8D20.c +++ /dev/null @@ -1,4 +0,0 @@ -#include "kkj_02.h" - -static char* N(exit_str_0) = "kkj_01"; -static char* N(exit_str_1) = "kkj_03"; diff --git a/src/world/area_kkj/kkj_02/kkj_02.h b/src/world/area_kkj/kkj_02/kkj_02.h index c0958841ca..8bc48c0336 100644 --- a/src/world/area_kkj/kkj_02/kkj_02.h +++ b/src/world/area_kkj/kkj_02/kkj_02.h @@ -2,8 +2,20 @@ /// @brief Peach's Castle - Intro Stairs Hallway (3F) #include "common.h" -#include "../kkj.h" #include "message_ids.h" #include "map.h" +#include "../kkj.h" +#include "mapfs/kkj_02_shape.h" +#include "mapfs/kkj_02_hit.h" + +enum { + NPC_Toad = 0, + NPC_ToadGuard = 1, +}; + #define NAMESPACE kkj_02 + +extern EvtScript N(EVS_Main); +extern EvtScript N(EVS_SetupMusic); +extern NpcGroupList N(DefaultNPCs); diff --git a/src/world/area_kkj/kkj_02/kkj_02_0_header.c b/src/world/area_kkj/kkj_02/kkj_02_0_header.c new file mode 100644 index 0000000000..366d0ff3a9 --- /dev/null +++ b/src/world/area_kkj/kkj_02/kkj_02_0_header.c @@ -0,0 +1,13 @@ +#include "kkj_02.h" + +EntryList N(Entrances) = { + [kkj_02_ENTRY_0] { -75.0, 0.0, 0.0, 90.0 }, + [kkj_02_ENTRY_1] { 1175.0, 110.0, 0.0, 270.0 }, + [kkj_02_ENTRY_2] { 354.0, 0.0, 294.0, 117.0 }, +}; + +MapSettings N(settings) = { + .main = &N(EVS_Main), + .entryList = &N(Entrances), + .entryCount = ENTRY_COUNT(N(Entrances)), +}; diff --git a/src/world/area_kkj/kkj_02/kkj_02_1_music.c b/src/world/area_kkj/kkj_02/kkj_02_1_music.c new file mode 100644 index 0000000000..ab17c963d5 --- /dev/null +++ b/src/world/area_kkj/kkj_02/kkj_02_1_music.c @@ -0,0 +1,15 @@ +#include "kkj_02.h" + +EvtScript N(EVS_SetupMusic) = { + EVT_CALL(GetEntryID, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_EQ(kkj_02_ENTRY_0) + EVT_CALL(SetMusicTrack, 0, SONG_PEACHS_CASTLE_PARTY, 1, 7) + EVT_CASE_EQ(kkj_02_ENTRY_1) + EVT_CALL(SetMusicTrack, 0, SONG_PEACHS_CASTLE_PARTY, 1, 5) + EVT_END_SWITCH + EVT_WAIT(3) + EVT_CALL(SetMusicTrack, 0, SONG_PEACHS_CASTLE_PARTY, 1, 6) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_kkj/kkj_02/kkj_02_2_main.c b/src/world/area_kkj/kkj_02/kkj_02_2_main.c new file mode 100644 index 0000000000..81bba93224 --- /dev/null +++ b/src/world/area_kkj/kkj_02/kkj_02_2_main.c @@ -0,0 +1,43 @@ +#include "kkj_02.h" + +EvtScript N(EVS_ExitDoors_kkj_01_1) = EVT_EXIT_DOUBLE_DOOR(kkj_02_ENTRY_0, "kkj_01", kkj_01_ENTRY_1, + COLLIDER_deilit1, MODEL_door1, MODEL_door2); +EvtScript N(EVS_ExitDoors_kkj_03_0) = EVT_EXIT_DOUBLE_DOOR(kkj_02_ENTRY_1, "kkj_03", kkj_03_ENTRY_0, + COLLIDER_deilit2, MODEL_door4, MODEL_door3); + +EvtScript N(EVS_BindExitTriggers) = { + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitDoors_kkj_01_1)), TRIGGER_WALL_PRESS_A, COLLIDER_deilit1, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitDoors_kkj_03_0)), TRIGGER_WALL_PRESS_A, COLLIDER_deilit2, 1, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_EnterMap) = { + EVT_CALL(GetEntryID, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_EQ(kkj_02_ENTRY_0) + EVT_SET(LVar2, MODEL_door1) + EVT_SET(LVar3, MODEL_door2) + EVT_EXEC_WAIT(EnterDoubleDoor) + EVT_CASE_EQ(kkj_02_ENTRY_1) + EVT_SET(LVar2, MODEL_door4) + EVT_SET(LVar3, MODEL_door3) + EVT_EXEC_WAIT(EnterDoubleDoor) + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Main) = { + EVT_SET(GB_WorldLocation, LOCATION_PEACH_CASTLE_GROUNDS) + EVT_CALL(SetSpriteShading, SHADING_NONE) + EVT_SETUP_CAMERA_NO_LEAD() + EVT_CALL(MakeNpcs, FALSE, EVT_PTR(N(DefaultNPCs))) + EVT_EXEC(N(EVS_SetupMusic)) + EVT_CALL(UseDoorSounds, DOOR_SOUNDS_LARGE) + EVT_EXEC(N(EVS_BindExitTriggers)) + EVT_EXEC(N(EVS_EnterMap)) + EVT_WAIT(1) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_kkj/kkj_02/kkj_02_3_npc.c b/src/world/area_kkj/kkj_02/kkj_02_3_npc.c new file mode 100644 index 0000000000..a532ff3127 --- /dev/null +++ b/src/world/area_kkj/kkj_02/kkj_02_3_npc.c @@ -0,0 +1,70 @@ +#include "kkj_02.h" + +#include "world/common/npc/Toad_Wander.inc.c" +#include "world/common/npc/Toad_Stationary.inc.c" + +EvtScript N(EVS_NpcInteract_Toad) = { + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Toad_Red_Talk, ANIM_Toad_Red_Idle, 0, MSG_Intro_0049) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInteract_ToadGuard) = { + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_ToadGuard_Red_Talk, ANIM_ToadGuard_Red_Idle, 0, MSG_Intro_004A) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_Toad) = { + EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(EVS_NpcInteract_Toad))) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_ToadGuard) = { + EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(EVS_NpcInteract_ToadGuard))) + EVT_RETURN + EVT_END +}; + +NpcData N(NpcData_Toads)[] = { + { + .id = NPC_Toad, + .pos = { 0.0f, 0.0f, -100.0f }, + .yaw = 270, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_CYLINDER, + .centerPos = { 0, 0, -100 }, + .wanderSize = { 50 }, + .detectShape = SHAPE_CYLINDER, + .detectPos = { 0, 0, -100 }, + .detectSize = { 50 }, + } + }, + .init = &N(EVS_NpcInit_Toad), + .settings = &N(NpcSettings_Toad_Wander), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = NO_DROPS, + .animations = TOAD_RED_ANIMS, + }, + { + .id = NPC_ToadGuard, + .pos = { 1175.0f, 110.0f, 60.0f }, + .yaw = 270, + .init = &N(EVS_NpcInit_ToadGuard), + .settings = &N(NpcSettings_Toad_Stationary), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = NO_DROPS, + .animations = TOAD_GUARD_RED_ANIMS, + }, +}; + +NpcGroupList N(DefaultNPCs) = { + NPC_GROUP(N(NpcData_Toads)), + {} +}; + + diff --git a/src/world/area_kkj/kkj_03/AC9710.c b/src/world/area_kkj/kkj_03/AC9710.c deleted file mode 100644 index ae1fd58b24..0000000000 --- a/src/world/area_kkj/kkj_03/AC9710.c +++ /dev/null @@ -1,8 +0,0 @@ -#include "kkj_03.h" - -static char* N(exit_str_0) = "kkj_02"; -static char* N(exit_str_1) = "osr_04"; -static char* N(exit_str_2) = "osr_03"; -static char* N(exit_str_3) = ""; - -#include "world/common/todo/SetPlayerSpriteSet2_MapInit.inc.c" diff --git a/src/world/area_kkj/kkj_03/AC9730.c b/src/world/area_kkj/kkj_03/AC9730.c deleted file mode 100644 index 571e5c8b82..0000000000 --- a/src/world/area_kkj/kkj_03/AC9730.c +++ /dev/null @@ -1,4 +0,0 @@ -#include "kkj_03.h" - -#include "world/common/atomic/TexturePan.inc.c" - diff --git a/src/world/area_kkj/kkj_03/kkj_03.h b/src/world/area_kkj/kkj_03/kkj_03.h index 3b10b08518..c3ea5ed31c 100644 --- a/src/world/area_kkj/kkj_03/kkj_03.h +++ b/src/world/area_kkj/kkj_03/kkj_03.h @@ -2,8 +2,22 @@ /// @brief Peach's Castle - Intro Window Hallway (4F) #include "common.h" -#include "../kkj.h" #include "message_ids.h" #include "map.h" +#include "../kkj.h" +#include "mapfs/kkj_03_shape.h" +#include "mapfs/kkj_03_hit.h" + +enum { + NPC_Peach = 0, +}; + #define NAMESPACE kkj_03 + +extern EvtScript N(EVS_Main); +extern EvtScript N(EVS_SetupMusic); +extern EvtScript N(EVS_Scene_MeetingPeach); +extern EvtScript N(EVS_Scene_Ascending); + +extern NpcGroupList N(DefaultNPCs); diff --git a/src/world/area_kkj/kkj_03/kkj_03_0_header.c b/src/world/area_kkj/kkj_03/kkj_03_0_header.c new file mode 100644 index 0000000000..1d427f549f --- /dev/null +++ b/src/world/area_kkj/kkj_03/kkj_03_0_header.c @@ -0,0 +1,16 @@ +#include "kkj_03.h" + +#include "world/common/todo/SetPlayerSpriteSet2_MapInit.inc.c" + +EntryList N(Entrances) = { + [kkj_03_ENTRY_0] { -95.0, 0.0, 0.0, 90.0 }, + [kkj_03_ENTRY_1] { 630.0, 0.0, 0.0, 90.0 }, + [kkj_03_ENTRY_2] { 630.0, 0.0, 0.0, 90.0 }, +}; + +MapSettings N(settings) = { + .main = &N(EVS_Main), + .entryList = &N(Entrances), + .entryCount = ENTRY_COUNT(N(Entrances)), + .background = &gBackgroundImage, +}; diff --git a/src/world/area_kkj/kkj_03/kkj_03_1_music.c b/src/world/area_kkj/kkj_03/kkj_03_1_music.c new file mode 100644 index 0000000000..99055e6563 --- /dev/null +++ b/src/world/area_kkj/kkj_03/kkj_03_1_music.c @@ -0,0 +1,16 @@ +#include "kkj_03.h" + +EvtScript N(EVS_SetupMusic) = { + EVT_CALL(GetEntryID, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_EQ(kkj_03_ENTRY_0) + EVT_CALL(SetMusicTrack, 0, SONG_PEACHS_CASTLE_PARTY, 1, 5) + EVT_WAIT(3) + EVT_CALL(SetMusicTrack, 0, SONG_PEACHS_CASTLE_PARTY, 1, 4) + EVT_CASE_DEFAULT + EVT_CALL(SetMusicTrack, 0, SONG_BOWSER_ATTACKS, 0, 8) + EVT_END_CASE_GROUP + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_kkj/kkj_03/kkj_03_2_main.c b/src/world/area_kkj/kkj_03/kkj_03_2_main.c new file mode 100644 index 0000000000..d123f00eee --- /dev/null +++ b/src/world/area_kkj/kkj_03/kkj_03_2_main.c @@ -0,0 +1,71 @@ +#include "kkj_03.h" + +#include "world/common/atomic/TexturePan.inc.c" + +Gfx N(setup_gfx_candle_lights)[] = { + gsDPPipeSync(), + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), + gsDPSetCycleType(G_CYC_2CYCLE), + gsDPSetTexturePersp(G_TP_PERSP), + gsDPSetTextureDetail(G_TD_CLAMP), + gsDPSetTextureLOD(G_TL_TILE), + gsDPSetTextureLUT(G_TT_NONE), + gsDPSetTextureFilter(G_TF_BILERP), + gsDPSetTextureConvert(G_TC_FILT), + gsDPSetPrimColor(0, 0, 75, 31, 19, 255), + gsDPSetEnvColor(255, 118, 77, 0), + gsDPSetCombineLERP(TEXEL0, TEXEL1, TEXEL0, 1, 1, TEXEL0, TEXEL1, 1, 0, PRIMITIVE, COMBINED, ENVIRONMENT, COMBINED, TEXEL1, TEXEL1, TEXEL1), + gsDPSetRenderMode(G_RM_PASS, G_RM_ZB_CLD_SURF2), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_SHADE | G_CULL_BACK | G_SHADING_SMOOTH), + gsSPEndDisplayList(), +}; + +EvtScript N(EVS_ExitDoors_kkj_02_1) = EVT_EXIT_DOUBLE_DOOR(kkj_03_ENTRY_0, "kkj_02", kkj_02_ENTRY_1, + COLLIDER_deilit1, MODEL_door1, MODEL_door2); + +EvtScript N(EVS_BindExitTriggers) = { + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitDoors_kkj_02_1)), TRIGGER_WALL_PRESS_A, COLLIDER_deilit1, 1, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_EnterMap) = { + EVT_CALL(GetEntryID, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_EQ(kkj_03_ENTRY_0) + EVT_SET(LVar2, MODEL_door1) + EVT_SET(LVar3, MODEL_door2) + EVT_EXEC_WAIT(EnterDoubleDoor) + EVT_EXEC(N(EVS_Scene_MeetingPeach)) + EVT_CASE_EQ(kkj_03_ENTRY_1) + EVT_EXEC(N(EVS_Scene_Ascending)) + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Main) = { + EVT_SET(GB_WorldLocation, LOCATION_PEACH_CASTLE_GROUNDS) + EVT_CALL(SetSpriteShading, SHADING_NONE) + EVT_SETUP_CAMERA_NO_LEAD() + EVT_CALL(MakeNpcs, FALSE, EVT_PTR(N(DefaultNPCs))) + EVT_CALL(EnableGroup, MODEL_g156, FALSE) + EVT_CALL(SetTexPanner, MODEL_o715, TEX_PANNER_0) + EVT_THREAD + TEX_PAN_PARAMS_ID(TEX_PANNER_0) + TEX_PAN_PARAMS_STEP( 0, 0, 40, 900) + 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_CALL(SetModelCustomGfx, MODEL_o715, CUSTOM_GFX_0, FOG_MODE_UNCHANGED) + EVT_CALL(SetCustomGfx, CUSTOM_GFX_0, EVT_PTR(N(setup_gfx_candle_lights)), NULL) + EVT_EXEC(N(EVS_SetupMusic)) + EVT_CALL(UseDoorSounds, DOOR_SOUNDS_LARGE) + EVT_EXEC(N(EVS_BindExitTriggers)) + EVT_EXEC(N(EVS_EnterMap)) + EVT_WAIT(1) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_kkj/kkj_03/kkj_03_3_npc.c b/src/world/area_kkj/kkj_03/kkj_03_3_npc.c new file mode 100644 index 0000000000..3ec9e175ab --- /dev/null +++ b/src/world/area_kkj/kkj_03/kkj_03_3_npc.c @@ -0,0 +1,18 @@ +#include "kkj_03.h" + +#include "world/common/npc/Peach.inc.c" + +NpcData N(NpcData_Peach) = { + .id = NPC_Peach, + .pos = { 670.0f, 0.0f, -12.0f }, + .yaw = 270, + .settings = &N(NpcSettings_Peach), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_20000, + .drops = NO_DROPS, + .animations = PEACH_ANIMS, +}; + +NpcGroupList N(DefaultNPCs) = { + NPC_GROUP(N(NpcData_Peach)), + {} +}; diff --git a/src/world/area_kkj/kkj_03/kkj_03_4_scenes.c b/src/world/area_kkj/kkj_03/kkj_03_4_scenes.c new file mode 100644 index 0000000000..bd2e602579 --- /dev/null +++ b/src/world/area_kkj/kkj_03/kkj_03_4_scenes.c @@ -0,0 +1,146 @@ +#include "kkj_03.h" + +EvtScript N(EVS_Scene_MeetingPeach) = { + EVT_LOOP(0) + EVT_WAIT(1) + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_IF_GE(LVar0, 525) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(FadeOutMusic, 0, 666) + EVT_WAIT(20) + EVT_CALL(SetMusicTrack, 0, SONG_PRISONER_PEACH_THEME, 0, 8) + EVT_CALL(PlayerFaceNpc, NPC_Peach, FALSE) + EVT_CALL(SetNpcAnimation, NPC_Peach, ANIM_Peach_A0002) + EVT_CALL(SetNpcSpeed, NPC_Peach, EVT_FLOAT(2.0)) + EVT_CALL(NpcMoveTo, NPC_Peach, 625, 0, 0) + EVT_CALL(SetNpcAnimation, NPC_Peach, ANIM_Peach_A0001) + EVT_WAIT(10) + EVT_CALL(SetNpcAnimation, NPC_Peach, ANIM_Peach_C0000) + EVT_WAIT(10) + EVT_CALL(SetNpcAnimation, NPC_Peach, ANIM_Peach_C0026) + EVT_CALL(SpeakToPlayer, NPC_Peach, ANIM_Peach_C0001, ANIM_Peach_C0026, 0, MSG_Intro_004B) + EVT_CALL(SetNpcAnimation, NPC_Peach, ANIM_Peach_C0002) + EVT_WAIT(10) + EVT_CALL(SetNpcAnimation, NPC_Peach, ANIM_Peach_A0001) + EVT_THREAD + EVT_CALL(SetCamProperties, CAM_DEFAULT, EVT_FLOAT(5.0), 600, 0, -12, EVT_FLOAT(325.0), EVT_FLOAT(17.0), EVT_FLOAT(-9.0)) + EVT_END_THREAD + EVT_CALL(PlayerMoveTo, 575, 0, 20) + EVT_WAIT(10) + EVT_CALL(SetNpcAnimation, NPC_Peach, ANIM_Peach_C0000) + EVT_WAIT(10) + EVT_CALL(SetNpcAnimation, NPC_Peach, ANIM_Peach_C0026) + EVT_CALL(SpeakToPlayer, NPC_Peach, ANIM_Peach_C0001, ANIM_Peach_C0026, 0, MSG_Intro_004C) + EVT_CALL(SetPlayerAnimation, ANIM_Mario_NodYes) + EVT_WAIT(20) + EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_WAIT(10) + EVT_CALL(SpeakToPlayer, NPC_Peach, ANIM_Peach_C0001, ANIM_Peach_C0026, 0, MSG_Intro_004D) + EVT_CALL(SetNpcAnimation, NPC_Peach, ANIM_Peach_C0002) + EVT_WAIT(10) + EVT_CALL(SetNpcAnimation, NPC_Peach, ANIM_Peach_A0001) + EVT_WAIT(10) + EVT_CALL(FadeOutMusic, 0, 1000) + EVT_THREAD + EVT_WAIT(10) + EVT_CALL(PlayerMoveTo, 590, 0, 10) + EVT_WAIT(5) + EVT_CALL(PlaySoundAtPlayer, SOUND_262, 0) + EVT_CALL(ShowEmote, 0, EMOTE_EXCLAMATION, -45, 20, EMOTER_PLAYER, 0, 0, 0, 0) + EVT_END_THREAD + EVT_THREAD + EVT_CALL(InterpNpcYaw, NPC_Peach, 90, 7) + EVT_CALL(SetNpcAnimation, NPC_Peach, ANIM_Peach_A0002) + EVT_CALL(NpcMoveTo, NPC_Peach, 640, 0, 10) + EVT_CALL(SetNpcAnimation, NPC_Peach, ANIM_Peach_A0001) + EVT_CALL(PlaySoundAtNpc, NPC_Peach, SOUND_262, 0) + EVT_CALL(ShowEmote, NPC_Peach, EMOTE_EXCLAMATION, -45, 20, EMOTER_NPC, 0, 0, 0, 0) + EVT_WAIT(20) + EVT_CALL(SetNpcAnimation, NPC_Peach, ANIM_Peach_C0011) + EVT_WAIT(60) + EVT_CALL(InterpNpcYaw, NPC_Peach, 270, 7) + EVT_END_THREAD + EVT_WAIT(17) + EVT_THREAD + EVT_CALL(PlaySound, SOUND_80000056) + EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 200, EVT_FLOAT(1.0)) + EVT_END_THREAD + EVT_WAIT(60) + EVT_CALL(GotoMap, EVT_PTR("osr_04"), osr_04_ENTRY_0) + EVT_WAIT(100) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_TexPan_Clouds) = { + EVT_CALL(EnableTexPanning, MODEL_o718, TRUE) + EVT_SET(LVar0, 0) + EVT_LOOP(0) + EVT_ADD(LVar0, -200) + EVT_CALL(SetTexPanOffset, TEX_PANNER_2, TEX_PANNER_MAIN, LVar0, 0) + EVT_WAIT(1) + EVT_END_LOOP + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_MoveClouds) = { + EVT_SET(LVar0, 0) + EVT_LOOP(0) + EVT_CALL(TranslateGroup, MODEL_g159, 0, LVar0, 0) + EVT_ADD(LVar0, -2) + EVT_WAIT(1) + EVT_END_LOOP + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Scene_Ascending) = { + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(SetNpcPos, NPC_Peach, 680, 0, -15) + EVT_CALL(EnableGroup, MODEL_g156, TRUE) + EVT_EXEC(N(EVS_TexPan_Clouds)) + EVT_EXEC(N(EVS_MoveClouds)) + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, 600, 0, -15) + EVT_CALL(SetPanTarget, CAM_DEFAULT, 600, 0, -15) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(90.0)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_THREAD + EVT_CALL(SetPlayerJumpscale, 0) + EVT_LOOP(0) + EVT_CALL(InterpPlayerYaw, 270, 0) + EVT_CALL(PlayerJump1, 550, 0, 0, 20) + EVT_CALL(InterpPlayerYaw, 90, 0) + EVT_CALL(PlayerJump1, 630, 0, 0, 20) + EVT_END_LOOP + EVT_END_THREAD + EVT_THREAD + EVT_LOOP(0) + EVT_CALL(SetPlayerAnimation, ANIM_Mario_Running) + EVT_WAIT(15) + EVT_CALL(SetPlayerAnimation, ANIM_Mario_60003) + EVT_WAIT(15) + EVT_END_LOOP + EVT_END_THREAD + EVT_THREAD + EVT_CALL(SetNpcAnimation, NPC_Peach, ANIM_Peach_A0004) + EVT_LOOP(0) + EVT_CALL(NpcMoveTo, NPC_Peach, 600, 0, 20) + EVT_CALL(NpcMoveTo, NPC_Peach, 680, 0, 20) + EVT_END_LOOP + EVT_END_THREAD + EVT_THREAD + EVT_CALL(PlaySound, SOUND_80000056) + EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 200, EVT_FLOAT(1.0)) + EVT_END_THREAD + EVT_WAIT(100) + EVT_CALL(GotoMap, EVT_PTR("osr_03"), osr_03_ENTRY_1) + EVT_WAIT(100) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_kkj/kkj_10/ACAB20.c b/src/world/area_kkj/kkj_10/ACAB20.c deleted file mode 100644 index a41f4e1f7b..0000000000 --- a/src/world/area_kkj/kkj_10/ACAB20.c +++ /dev/null @@ -1,25 +0,0 @@ -#include "kkj_10.h" - -static char* N(exit_str_0) = "osr_02"; -static char* N(exit_str_1) = "kkj_11"; -static char* N(exit_str_2) = "kkj_21"; -static char* N(exit_str_3) = "kkj_19"; -static char* N(exit_str_4) = "kkj_20"; -static char* N(exit_str_5) = "kkj_29"; - -ApiStatus func_80240000_ACAB20(Evt* script, s32 isInitialCall) { - s32 i; - - for (i = 0; i < ARRAY_COUNT(D_80151328->sources); i++) { - D_80151328->sources[i].flags = 0; - } - - return ApiStatus_DONE2; -} - -ApiStatus func_80240034_ACAB54(Evt* script, s32 isInitialCall) { - Bytecode* args = script->ptrReadPos; - - gPlayerStatus.availableDisguiseType = evt_get_float_variable(script, *args++); - return ApiStatus_DONE2; -} diff --git a/src/world/area_kkj/kkj_10/ACAB90.c b/src/world/area_kkj/kkj_10/ACAB90.c deleted file mode 100644 index a45d5d8e49..0000000000 --- a/src/world/area_kkj/kkj_10/ACAB90.c +++ /dev/null @@ -1,3 +0,0 @@ -#include "kkj_10.h" - -#include "world/common/todo/RemovePadlock.inc.c" diff --git a/src/world/area_kkj/kkj_10/ACABD0.c b/src/world/area_kkj/kkj_10/ACABD0.c deleted file mode 100644 index c1adb4aaeb..0000000000 --- a/src/world/area_kkj/kkj_10/ACABD0.c +++ /dev/null @@ -1,7 +0,0 @@ -#include "kkj_10.h" - -#include "world/common/atomic/UnkPhysicsFuncs.inc.c" - -#include "world/common/todo/UnkGooberFunc.inc.c" - -const char* kkj_10_str = "kkj_14"; diff --git a/src/world/area_kkj/kkj_10/ACB3C0.c b/src/world/area_kkj/kkj_10/ACB3C0.c deleted file mode 100644 index 6f6442dacc..0000000000 --- a/src/world/area_kkj/kkj_10/ACB3C0.c +++ /dev/null @@ -1,16 +0,0 @@ -#include "kkj_10.h" - -#define NAMESPACE dup_kkj_10 -#include "world/common/atomic/UnkPhysicsFuncs.inc.c" - -#include "world/common/todo/GetPeachDisguise.inc.c" - -ApiStatus func_80240F44_ACBA64(Evt* script, s32 isInitialCall) { - gGameStatusPtr->peachFlags |= PEACH_STATUS_FLAG_8; - return ApiStatus_DONE2; -} - -#include "world/common/todo/UnkGooberFunc.inc.c" -#define NAMESPACE kkj_10 - -const char* kkj_10_str2 = "kkj_14"; diff --git a/src/world/area_kkj/kkj_10/kkj_10.h b/src/world/area_kkj/kkj_10/kkj_10.h index bc418c8d7c..41425f99ae 100644 --- a/src/world/area_kkj/kkj_10/kkj_10.h +++ b/src/world/area_kkj/kkj_10/kkj_10.h @@ -2,8 +2,27 @@ /// @brief Peach's Castle - Entry Hall (1F) #include "common.h" -#include "../kkj.h" #include "message_ids.h" #include "map.h" +#include "../kkj.h" +#include "mapfs/kkj_10_shape.h" +#include "mapfs/kkj_10_hit.h" + +enum { + NPC_Koopatrol_01 = 0, + NPC_Koopatrol_02 = 1, +}; + +enum { + MV_PadlockEntityIdx = MapVar(0), +}; + #define NAMESPACE kkj_10 + +extern EvtScript N(EVS_Main); +extern EvtScript N(EVS_ExitDoors_osr_02_1); +extern EvtScript N(EVS_MakeEntities); + +extern NpcGroupList N(EarlyNPCs); +extern NpcGroupList N(LaterNPCs); diff --git a/src/world/area_kkj/kkj_10/kkj_10_0_header.c b/src/world/area_kkj/kkj_10/kkj_10_0_header.c new file mode 100644 index 0000000000..8a673f2bc3 --- /dev/null +++ b/src/world/area_kkj/kkj_10/kkj_10_0_header.c @@ -0,0 +1,16 @@ +#include "kkj_10.h" + +EntryList N(Entrances) = { + [kkj_10_ENTRY_0] { 0.0, 0.0, 480.0, 0.0 }, + [kkj_10_ENTRY_1] { 0.0, 100.0, -365.0, 180.0 }, + [kkj_10_ENTRY_2] { -420.0, 40.0, -260.0, 135.0 }, + [kkj_10_ENTRY_3] { 230.0, 0.0, -210.0, 180.0 }, + [kkj_10_ENTRY_4] { 420.0, 40.0, -260.0, 225.0 }, +}; + +MapSettings N(settings) = { + .main = &N(EVS_Main), + .entryList = &N(Entrances), + .entryCount = ENTRY_COUNT(N(Entrances)), + .tattle = { MSG_MapTattle_kkj_10 }, +}; diff --git a/src/world/area_kkj/kkj_10/kkj_10_1_main.c b/src/world/area_kkj/kkj_10/kkj_10_1_main.c new file mode 100644 index 0000000000..be2178330f --- /dev/null +++ b/src/world/area_kkj/kkj_10/kkj_10_1_main.c @@ -0,0 +1,188 @@ +#include "kkj_10.h" + +API_CALLABLE(N(DisableAllLightSources)) { + s32 i; + + for (i = 0; i < ARRAY_COUNT(D_80151328->sources); i++) { + D_80151328->sources[i].flags = LIGHT_SOURCE_DISABLED; + } + + return ApiStatus_DONE2; +} + +#include "../common/SetAvailableDisguise.inc.c" + +EvtScript N(EVS_ExitDoors_osr_02_1) = { + EVT_SET_GROUP(EVT_GROUP_1B) + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(UseDoorSounds, DOOR_SOUNDS_LARGE) + EVT_SET(LVar0, kkj_10_ENTRY_0) + EVT_SET(LVar1, COLLIDER_tts) + EVT_SET(LVar2, MODEL_door2) + EVT_SET(LVar3, MODEL_door1) + EVT_EXEC(ExitDoubleDoor) + EVT_WAIT(17) + EVT_CALL(GotoMap, EVT_PTR("osr_02"), osr_02_ENTRY_1) + EVT_WAIT(100) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_ExitDoors_kkj_11_0) = { + EVT_SET_GROUP(EVT_GROUP_1B) + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(UseDoorSounds, DOOR_SOUNDS_LARGE) + EVT_SET(LVar0, kkj_10_ENTRY_1) + EVT_SET(LVar1, COLLIDER_ttn) + EVT_SET(LVar2, MODEL_door3) + EVT_SET(LVar3, MODEL_door4) + EVT_EXEC(ExitDoubleDoor) + EVT_WAIT(17) + EVT_CALL(GotoMap, EVT_PTR("kkj_11"), kkj_11_ENTRY_0) + EVT_WAIT(100) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_ExitDoors_kkj_21_0) = { + EVT_SET_GROUP(EVT_GROUP_1B) + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(UseDoorSounds, DOOR_SOUNDS_BASIC) + EVT_SET(LVar0, kkj_10_ENTRY_2) + EVT_SET(LVar1, COLLIDER_ttw) + EVT_SET(LVar2, MODEL_door5) + EVT_SET(LVar3, DOOR_SWING_OUT) + EVT_EXEC(ExitSingleDoor) + EVT_WAIT(17) + EVT_CALL(GotoMap, EVT_PTR("kkj_21"), kkj_21_ENTRY_0) + EVT_WAIT(100) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_ExitDoors_kkj_19_0) = { + EVT_SET_GROUP(EVT_GROUP_1B) + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(UseDoorSounds, DOOR_SOUNDS_BASIC) + EVT_SET(LVar0, kkj_10_ENTRY_3) + EVT_SET(LVar1, COLLIDER_ttne) + EVT_SET(LVar2, MODEL_door8) + EVT_SET(LVar3, DOOR_SWING_OUT) + EVT_EXEC(ExitSingleDoor) + EVT_WAIT(17) + EVT_CALL(GotoMap, EVT_PTR("kkj_19"), kkj_19_ENTRY_0) + EVT_WAIT(100) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_ExitDoors_kkj_20_0) = { + EVT_SET_GROUP(EVT_GROUP_1B) + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(UseDoorSounds, DOOR_SOUNDS_BASIC) + EVT_SET(LVar0, kkj_10_ENTRY_4) + EVT_SET(LVar1, COLLIDER_tte) + EVT_SET(LVar2, MODEL_door7) + EVT_SET(LVar3, DOOR_SWING_OUT) + EVT_EXEC(ExitSingleDoor) + EVT_WAIT(17) + EVT_CALL(GotoMap, EVT_PTR("kkj_20"), kkj_20_ENTRY_0) + EVT_WAIT(100) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_ExitDoors_kkj_29_0) = { + EVT_SET_GROUP(EVT_GROUP_1B) + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(UseDoorSounds, DOOR_SOUNDS_BASIC) + EVT_SET(LVar0, kkj_10_ENTRY_2) + EVT_SET(LVar1, COLLIDER_ttw) + EVT_SET(LVar2, MODEL_door5) + EVT_SET(LVar3, DOOR_SWING_OUT) + EVT_EXEC(ExitSingleDoor) + EVT_WAIT(17) + EVT_CALL(GotoMap, EVT_PTR("kkj_29"), kkj_29_ENTRY_0) + EVT_WAIT(100) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_BindExitTriggers) = { + EVT_IF_GT(GB_StoryProgress, STORY_CH6_BEGAN_PEACH_MISSION) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitDoors_osr_02_1)), TRIGGER_WALL_PRESS_A, COLLIDER_tts, 1, 0) + EVT_END_IF + EVT_SWITCH(GB_StoryProgress) + EVT_CASE_EQ(STORY_CH5_BEGAN_PEACH_MISSION) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitDoors_kkj_29_0)), TRIGGER_WALL_PRESS_A, COLLIDER_ttw, 1, 0) + EVT_CASE_DEFAULT + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitDoors_kkj_21_0)), TRIGGER_WALL_PRESS_A, COLLIDER_ttw, 1, 0) + EVT_END_SWITCH + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitDoors_kkj_11_0)), TRIGGER_WALL_PRESS_A, COLLIDER_ttn, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitDoors_kkj_19_0)), TRIGGER_WALL_PRESS_A, COLLIDER_ttne, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitDoors_kkj_20_0)), TRIGGER_WALL_PRESS_A, COLLIDER_tte, 1, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_EnterMap) = { + EVT_CALL(UseDoorSounds, DOOR_SOUNDS_BASIC) + EVT_CALL(GetEntryID, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_EQ(kkj_10_ENTRY_0) + EVT_CALL(UseDoorSounds, DOOR_SOUNDS_LARGE) + EVT_SET(LVar2, MODEL_door2) + EVT_SET(LVar3, MODEL_door1) + EVT_EXEC_WAIT(EnterDoubleDoor) + EVT_CASE_EQ(kkj_10_ENTRY_1) + EVT_CALL(UseDoorSounds, DOOR_SOUNDS_LARGE) + EVT_SET(LVar2, MODEL_door3) + EVT_SET(LVar3, MODEL_door4) + EVT_EXEC_WAIT(EnterDoubleDoor) + EVT_CASE_EQ(kkj_10_ENTRY_2) + EVT_SET(LVar2, MODEL_door5) + EVT_SET(LVar3, DOOR_SWING_OUT) + EVT_EXEC_WAIT(EnterSingleDoor) + EVT_CASE_EQ(kkj_10_ENTRY_3) + EVT_SET(LVar2, MODEL_door8) + EVT_SET(LVar3, DOOR_SWING_OUT) + EVT_EXEC_WAIT(EnterSingleDoor) + EVT_CASE_EQ(kkj_10_ENTRY_4) + EVT_SET(LVar2, MODEL_door7) + EVT_SET(LVar3, DOOR_SWING_OUT) + EVT_EXEC_WAIT(EnterSingleDoor) + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Main) = { + EVT_SET(GB_WorldLocation, LOCATION_PEACHS_CASTLE) + EVT_CALL(SetSpriteShading, SHADING_KKJ_10) + EVT_SETUP_CAMERA_NO_LEAD() + EVT_SWITCH(GB_StoryProgress) + EVT_CASE_OR_EQ(STORY_CH4_BEGAN_PEACH_MISSION) + EVT_CASE_OR_EQ(STORY_CH5_BEGAN_PEACH_MISSION) + EVT_CALL(MakeNpcs, FALSE, EVT_PTR(N(EarlyNPCs))) + EVT_END_CASE_GROUP + EVT_CASE_EQ(STORY_CH6_BEGAN_PEACH_MISSION) + EVT_CALL(N(SetAvailableDisguise), PEACH_DISGUISE_KOOPATROL) + EVT_CALL(MakeNpcs, FALSE, EVT_PTR(N(LaterNPCs))) + EVT_CASE_DEFAULT + EVT_CALL(EnableModel, MODEL_o273, FALSE) + EVT_CALL(EnableModel, MODEL_o274, FALSE) + EVT_END_SWITCH + EVT_EXEC_WAIT(N(EVS_MakeEntities)) + EVT_IF_GE(GB_StoryProgress, STORY_CH8_REACHED_BOWSERS_CASTLE) + EVT_CALL(N(DisableAllLightSources)) + EVT_END_IF + EVT_IF_LT(GB_StoryProgress, STORY_CH8_REACHED_PEACHS_CASTLE) + EVT_CALL(SetMusicTrack, 0, SONG_PEACH_SNEAKING, 0, 8) + EVT_ELSE + EVT_CALL(SetMusicTrack, 0, SONG_BOWSER_ATTACKS, 1, 8) + EVT_END_IF + EVT_EXEC(N(EVS_BindExitTriggers)) + EVT_EXEC(N(EVS_EnterMap)) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_kkj/kkj_10/kkj_10_2_entity.c b/src/world/area_kkj/kkj_10/kkj_10_2_entity.c new file mode 100644 index 0000000000..a0428e1475 --- /dev/null +++ b/src/world/area_kkj/kkj_10/kkj_10_2_entity.c @@ -0,0 +1,47 @@ +#include "kkj_10.h" +#include "entity.h" + +#include "world/common/todo/RemovePadlock.inc.c" + +s32 N(PeachKeyList)[] = { + ITEM_PEACH_KEY1, + ITEM_NONE +}; + +EvtScript N(EVS_UnlockPrompt_FrontDoor) = { + EVT_CALL(ShowKeyChoicePopup) + EVT_IF_EQ(LVar0, 0) + EVT_CALL(ShowMessageAtScreenPos, MSG_Menus_00D8, 160, 40) + EVT_CALL(CloseChoicePopup) + EVT_RETURN + EVT_END_IF + EVT_IF_EQ(LVar0, -1) + EVT_CALL(CloseChoicePopup) + EVT_RETURN + EVT_END_IF + EVT_CALL(PlaySoundAt, SOUND_269, 0, 0, 10, 490) + EVT_SET(LVar0, MV_PadlockEntityIdx) + EVT_CALL(N(RemovePadlock)) + EVT_WAIT(5) + EVT_CALL(RemoveKeyItemAt, LVar1) + EVT_SET(GF_KKJ10_UnlockedDoor, TRUE) + EVT_CALL(CloseChoicePopup) + EVT_UNBIND + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitDoors_osr_02_1)), TRIGGER_WALL_PRESS_A, COLLIDER_tts, 1, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_MakeEntities) = { + EVT_IF_LE(GB_StoryProgress, STORY_CH6_BEGAN_PEACH_MISSION) + EVT_IF_EQ(GF_KKJ10_UnlockedDoor, FALSE) + EVT_CALL(MakeEntity, EVT_PTR(Entity_Padlock), 0, 10, 490, 180, MAKE_ENTITY_END) + EVT_SET(MV_PadlockEntityIdx, LVar0) + EVT_BIND_PADLOCK(EVT_PTR(N(EVS_UnlockPrompt_FrontDoor)), TRIGGER_WALL_PRESS_A, EVT_ENTITY_INDEX(0), EVT_PTR(N(PeachKeyList)), 0, 1) + EVT_ELSE + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitDoors_osr_02_1)), TRIGGER_WALL_PRESS_A, COLLIDER_tts, 1, 0) + EVT_END_IF + EVT_END_IF + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_kkj/kkj_10/kkj_10_3_npcs_early.c b/src/world/area_kkj/kkj_10/kkj_10_3_npcs_early.c new file mode 100644 index 0000000000..f19f574f7b --- /dev/null +++ b/src/world/area_kkj/kkj_10/kkj_10_3_npcs_early.c @@ -0,0 +1,159 @@ +#include "kkj_10.h" + +#define NAME_SUFFIX _Early +#include "world/common/enemy/Koopatrol_Stationary.inc.c" + +#include "../common/Searchlights.inc.c" +#include "../common/ApproachPlayer100Units.inc.c" + +EvtScript N(EVS_CapturePeach) = { + EVT_CALL(DisablePlayerInput, TRUE) + EVT_SET_GROUP(EVT_GROUP_00) + EVT_CALL(SetTimeFreezeMode, TIME_FREEZE_PARTIAL) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_262, 0) + EVT_CALL(ShowEmote, NPC_SELF, EMOTE_EXCLAMATION, 0, 20, TRUE, 0, 0, 0, 0) + EVT_CALL(NpcFacePlayer, NPC_SELF, 5) + EVT_WAIT(20) + EVT_CALL(PlayerFaceNpc, NPC_SELF, FALSE) + EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0005) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_WorldKoopatrol_Anim02) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_WorldKoopatrol_Anim09, ANIM_WorldKoopatrol_Anim02, 0, MSG_Peach_0174) + EVT_CALL(N(ApproachPlayer100Units), -1, LVar3, LVar0, LVar2) + EVT_IF_NE(LVar3, 0) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_WorldKoopatrol_Anim07) + EVT_CALL(SetNpcSpeed, NPC_SELF, EVT_FLOAT(5.0)) + EVT_CALL(NpcMoveTo, NPC_SELF, LVar0, LVar2, 0) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_WorldKoopatrol_Anim02) + EVT_END_IF + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_WorldKoopatrol_Anim09, ANIM_WorldKoopatrol_Anim02, 0, MSG_Peach_0175) + EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0017) + EVT_WAIT(20) + EVT_CALL(GotoMapSpecial, EVT_PTR("kkj_14"), kkj_14_ENTRY_B, TRANSITION_13) + EVT_WAIT(100) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_CALL(SetTimeFreezeMode, TIME_FREEZE_NORMAL) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcIdle_Koopatrol_01) = { + EVT_THREAD + EVT_SET(LVar1, 0) + EVT_LOOP(0) + EVT_CALL(N(UpdateSearchlight), LVar0, 100, 90, 0, 40, 130, 0) + EVT_IF_NE(LVar0, 0) + EVT_IF_EQ(LVar1, 0) + EVT_CALL(BindNpcAI, NPC_SELF, EVT_PTR(N(EVS_CapturePeach))) + EVT_SET(LVar1, 1) + EVT_END_IF + EVT_END_IF + EVT_WAIT(1) + EVT_END_LOOP + EVT_END_THREAD + EVT_CALL(SetNpcSpeed, NPC_SELF, EVT_FLOAT(2.0)) + EVT_LOOP(0) + EVT_CALL(NpcMoveTo, NPC_SELF, -240, 240, 0) + EVT_CALL(N(GetAngleBetweenPoints), LVar0, -240, 240, 0, 240) + EVT_CALL(InterpNpcYaw, NPC_SELF, LVar0, 15) + EVT_CALL(NpcMoveTo, NPC_SELF, 0, 240, 0) + EVT_CALL(N(GetAngleBetweenPoints), LVar0, 0, 240, -240, 240) + EVT_CALL(InterpNpcYaw, NPC_SELF, LVar0, 15) + EVT_CALL(NpcMoveTo, NPC_SELF, -240, 240, 0) + EVT_CALL(N(GetAngleBetweenPoints), LVar0, -240, 240, -240, 0) + EVT_CALL(InterpNpcYaw, NPC_SELF, LVar0, 15) + EVT_CALL(NpcMoveTo, NPC_SELF, -240, 0, 0) + EVT_CALL(N(GetAngleBetweenPoints), LVar0, -240, 0, -240, 240) + EVT_CALL(InterpNpcYaw, NPC_SELF, LVar0, 15) + EVT_END_LOOP + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcIdle_Koopatrol_02) = { + EVT_THREAD + EVT_SET(LVar1, 0) + EVT_LOOP(0) + EVT_CALL(N(UpdateSearchlight), LVar0, 100, 90, 0, 40, 131, 1) + EVT_IF_NE(LVar0, 0) + EVT_IF_EQ(LVar1, 0) + EVT_CALL(BindNpcAI, NPC_SELF, EVT_PTR(N(EVS_CapturePeach))) + EVT_SET(LVar1, 1) + EVT_END_IF + EVT_END_IF + EVT_WAIT(1) + EVT_END_LOOP + EVT_END_THREAD + EVT_CALL(SetNpcSpeed, NPC_SELF, EVT_FLOAT(2.0)) + EVT_LOOP(0) + EVT_CALL(NpcMoveTo, NPC_SELF, 240, 240, 0) + EVT_CALL(N(GetAngleBetweenPoints), LVar0, 240, 240, 240, 0) + EVT_CALL(InterpNpcYaw, NPC_SELF, LVar0, 15) + EVT_CALL(NpcMoveTo, NPC_SELF, 240, 0, 0) + EVT_CALL(N(GetAngleBetweenPoints), LVar0, 240, 0, 240, 240) + EVT_CALL(InterpNpcYaw, NPC_SELF, LVar0, 15) + EVT_CALL(NpcMoveTo, NPC_SELF, 240, 240, 0) + EVT_CALL(N(GetAngleBetweenPoints), LVar0, 240, 240, 0, 240) + EVT_CALL(InterpNpcYaw, NPC_SELF, LVar0, 15) + EVT_CALL(NpcMoveTo, NPC_SELF, 0, 240, 0) + EVT_CALL(N(GetAngleBetweenPoints), LVar0, 0, 240, 240, 240) + EVT_CALL(InterpNpcYaw, NPC_SELF, LVar0, 15) + EVT_END_LOOP + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_Koopatrol_01) = { + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_WorldKoopatrol_Anim05) + EVT_CALL(SetNpcPos, NPC_SELF, -240, 0, 0) + EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(EVS_NpcIdle_Koopatrol_01))) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_Koopatrol_02) = { + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_WorldKoopatrol_Anim05) + EVT_CALL(SetNpcPos, NPC_SELF, 0, 0, 240) + EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(EVS_NpcIdle_Koopatrol_02))) + EVT_RETURN + EVT_END +}; + +AnimID N(ExtraAnims_Koopatrol)[] = { + ANIM_WorldKoopatrol_Anim02, + ANIM_WorldKoopatrol_Anim05, + ANIM_WorldKoopatrol_Anim07, + ANIM_WorldKoopatrol_Anim09, + ANIM_LIST_END +}; + +NpcData N(NpcData_Koopatrol)[] = { + { + .id = NPC_Koopatrol_01, + .pos = { 0.0f, -500.0f, 0.0f }, + .yaw = 0, + .init = &N(EVS_NpcInit_Koopatrol_01), + .settings = &N(NpcSettings_Koopatrol_Stationary), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = NO_DROPS, + .animations = KOOPATROL_ANIMS, + .extraAnimations = N(ExtraAnims_Koopatrol), + }, + { + .id = NPC_Koopatrol_02, + .pos = { 0.0f, -500.0f, 0.0f }, + .yaw = 0, + .init = &N(EVS_NpcInit_Koopatrol_02), + .settings = &N(NpcSettings_Koopatrol_Stationary), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = NO_DROPS, + .animations = KOOPATROL_ANIMS, + .extraAnimations = N(ExtraAnims_Koopatrol), + }, +}; + +#define NAME_SUFFIX + +NpcGroupList N(EarlyNPCs) = { + NPC_GROUP(N(NpcData_Koopatrol_Early)), + {} +}; diff --git a/src/world/area_kkj/kkj_10/kkj_10_4_npcs_later.c b/src/world/area_kkj/kkj_10/kkj_10_4_npcs_later.c new file mode 100644 index 0000000000..9159b35d00 --- /dev/null +++ b/src/world/area_kkj/kkj_10/kkj_10_4_npcs_later.c @@ -0,0 +1,220 @@ +#include "kkj_10.h" + +#define NAME_SUFFIX _Later +#include "world/common/enemy/Koopatrol_Stationary.inc.c" + +AnimID N(ExtraAnims_Koopatrol)[] = { + ANIM_WorldKoopatrol_Anim00, + ANIM_WorldKoopatrol_Anim01, + ANIM_WorldKoopatrol_Anim02, + ANIM_WorldKoopatrol_Anim04, + ANIM_WorldKoopatrol_Anim05, + ANIM_WorldKoopatrol_Anim06, + ANIM_WorldKoopatrol_Anim07, + ANIM_WorldKoopatrol_Anim08, + ANIM_WorldKoopatrol_Anim09, + ANIM_WorldKoopatrol_Anim12, + ANIM_WorldKoopatrol_Anim14, + ANIM_WorldKoopatrol_Anim1B, + ANIM_LIST_END +}; + +#include "../common/Searchlights.inc.c" +#include "world/common/todo/GetPeachDisguise.inc.c" +#include "../common/SetPeachFlag8.inc.c" +#include "../common/ApproachPlayer100Units.inc.c" + +EvtScript N(EVS_CapturePeach) = { + EVT_CALL(DisablePlayerInput, TRUE) + EVT_SET_GROUP(EVT_GROUP_00) + EVT_CALL(SetTimeFreezeMode, TIME_FREEZE_PARTIAL) + EVT_CALL(N(SetPeachFlag8)) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_262, 0) + EVT_CALL(ShowEmote, NPC_SELF, EMOTE_EXCLAMATION, 0, 20, TRUE, 0, 0, 0, 0) + EVT_CALL(NpcFacePlayer, NPC_SELF, 5) + EVT_WAIT(20) + EVT_CALL(PlayerFaceNpc, NPC_SELF, FALSE) + EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0005) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_WorldKoopatrol_Anim02) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_WorldKoopatrol_Anim09, ANIM_WorldKoopatrol_Anim02, 0, MSG_Peach_0174) + EVT_CALL(N(ApproachPlayer100Units), -1, LVar3, LVar0, LVar2) + EVT_IF_NE(LVar3, 0) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_WorldKoopatrol_Anim07) + EVT_CALL(SetNpcSpeed, NPC_SELF, EVT_FLOAT(5.0)) + EVT_CALL(NpcMoveTo, NPC_SELF, LVar0, LVar2, 0) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_WorldKoopatrol_Anim02) + EVT_END_IF + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_WorldKoopatrol_Anim09, ANIM_WorldKoopatrol_Anim02, 0, MSG_Peach_0175) + EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0017) + EVT_WAIT(20) + EVT_CALL(GotoMapSpecial, EVT_PTR("kkj_14"), kkj_14_ENTRY_B, TRANSITION_13) + EVT_WAIT(100) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_CALL(SetTimeFreezeMode, TIME_FREEZE_NORMAL) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcIdle_Koopatrol_01) = { + EVT_THREAD + EVT_SET(LVar2, 0) + EVT_LOOP(0) + EVT_CALL(N(UpdateSearchlight), LVar0, 100, 90, 0, 40, 130, 0) + EVT_IF_EQ(LVar2, 0) + EVT_CALL(N(GetPeachDisguise), LVar1) + EVT_IF_EQ(LVar1, PEACH_DISGUISE_NONE) + EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_8000000, 1) + EVT_IF_NE(LVar0, 0) + EVT_CALL(BindNpcAI, NPC_SELF, EVT_PTR(N(EVS_CapturePeach))) + EVT_SET(LVar2, 1) + EVT_END_IF + EVT_ELSE + EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_8000000, 0) + EVT_END_IF + EVT_END_IF + EVT_WAIT(1) + EVT_END_LOOP + EVT_END_THREAD + EVT_CALL(SetNpcSpeed, NPC_SELF, EVT_FLOAT(2.0)) + EVT_LOOP(0) + EVT_CALL(NpcMoveTo, NPC_SELF, -240, 240, 0) + EVT_CALL(N(GetAngleBetweenPoints), LVar0, -240, 240, 0, 240) + EVT_CALL(InterpNpcYaw, NPC_SELF, LVar0, 15) + EVT_CALL(NpcMoveTo, NPC_SELF, 0, 240, 0) + EVT_CALL(N(GetAngleBetweenPoints), LVar0, 0, 240, -240, 240) + EVT_CALL(InterpNpcYaw, NPC_SELF, LVar0, 15) + EVT_CALL(NpcMoveTo, NPC_SELF, -240, 240, 0) + EVT_CALL(N(GetAngleBetweenPoints), LVar0, -240, 240, -240, -50) + EVT_CALL(InterpNpcYaw, NPC_SELF, LVar0, 15) + EVT_CALL(NpcMoveTo, NPC_SELF, -240, -50, 0) + EVT_CALL(N(GetAngleBetweenPoints), LVar0, -240, -50, -240, 240) + EVT_CALL(InterpNpcYaw, NPC_SELF, LVar0, 15) + EVT_END_LOOP + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcIdle_Koopatrol_02) = { + EVT_THREAD + EVT_SET(LVar2, 0) + EVT_LOOP(0) + EVT_CALL(N(UpdateSearchlight), LVar0, 100, 90, 0, 40, 131, 1) + EVT_IF_EQ(LVar2, 0) + EVT_CALL(N(GetPeachDisguise), LVar1) + EVT_IF_EQ(LVar1, PEACH_DISGUISE_NONE) + EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_8000000, 0) + EVT_IF_NE(LVar0, 0) + EVT_CALL(BindNpcAI, NPC_SELF, EVT_PTR(N(EVS_CapturePeach))) + EVT_SET(LVar2, 1) + EVT_END_IF + EVT_ELSE + EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_8000000, 0) + EVT_END_IF + EVT_END_IF + EVT_WAIT(1) + EVT_END_LOOP + EVT_END_THREAD + EVT_CALL(SetNpcSpeed, NPC_SELF, EVT_FLOAT(2.0)) + EVT_LOOP(0) + EVT_CALL(NpcMoveTo, NPC_SELF, 240, 240, 0) + EVT_CALL(N(GetAngleBetweenPoints), LVar0, 240, 240, 240, -50) + EVT_CALL(InterpNpcYaw, NPC_SELF, LVar0, 15) + EVT_CALL(NpcMoveTo, NPC_SELF, 240, -50, 0) + EVT_CALL(N(GetAngleBetweenPoints), LVar0, 240, -50, 240, 240) + EVT_CALL(InterpNpcYaw, NPC_SELF, LVar0, 15) + EVT_CALL(NpcMoveTo, NPC_SELF, 240, 240, 0) + EVT_CALL(N(GetAngleBetweenPoints), LVar0, 240, 240, 0, 240) + EVT_CALL(InterpNpcYaw, NPC_SELF, LVar0, 15) + EVT_CALL(NpcMoveTo, NPC_SELF, 0, 240, 0) + EVT_CALL(N(GetAngleBetweenPoints), LVar0, 0, 240, 240, 240) + EVT_CALL(InterpNpcYaw, NPC_SELF, LVar0, 15) + EVT_END_LOOP + EVT_RETURN + EVT_END +}; + + +EvtScript N(EVS_NpcInteract_Koopatrol_01) = { + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(GetSelfVar, 0, LVar0) + EVT_IF_EQ(LVar0, 0) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_WorldKoopatrol_Anim09, ANIM_WorldKoopatrol_Anim02, 5, MSG_Peach_013C) + EVT_CALL(SetSelfVar, 0, 1) + EVT_ELSE + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_WorldKoopatrol_Anim09, ANIM_WorldKoopatrol_Anim02, 5, MSG_Peach_013D) + EVT_CALL(SetSelfVar, 0, 0) + EVT_END_IF + EVT_CALL(DisablePlayerInput, FALSE) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInteract_Koopatrol_02) = { + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(N(GetPeachDisguise), LVar0) + EVT_IF_EQ(LVar0, PEACH_DISGUISE_CLUBBA) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_WorldKoopatrol_Anim09, ANIM_WorldKoopatrol_Anim02, 5, MSG_Peach_0140) + EVT_ELSE + EVT_CALL(GetSelfVar, 0, LVar0) + EVT_IF_EQ(LVar0, 0) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_WorldKoopatrol_Anim09, ANIM_WorldKoopatrol_Anim02, 5, MSG_Peach_013E) + EVT_CALL(SetSelfVar, 0, 1) + EVT_ELSE + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_WorldKoopatrol_Anim09, ANIM_WorldKoopatrol_Anim02, 5, MSG_Peach_013F) + EVT_CALL(SetSelfVar, 0, 0) + EVT_END_IF + EVT_END_IF + EVT_CALL(DisablePlayerInput, FALSE) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_Koopatrol_01) = { + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_WorldKoopatrol_Anim05) + EVT_CALL(SetNpcPos, NPC_SELF, -240, 0, -50) + EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(EVS_NpcIdle_Koopatrol_01))) + EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(EVS_NpcInteract_Koopatrol_01))) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_Koopatrol_02) = { + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_WorldKoopatrol_Anim05) + EVT_CALL(SetNpcPos, NPC_SELF, 0, 0, 240) + EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(EVS_NpcIdle_Koopatrol_02))) + EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(EVS_NpcInteract_Koopatrol_02))) + EVT_RETURN + EVT_END +}; + +NpcData N(NpcData_Koopatrol)[] = { + { + .id = NPC_Koopatrol_01, + .pos = { 0.0f, -500.0f, 0.0f }, + .yaw = 0, + .init = &N(EVS_NpcInit_Koopatrol_01), + .settings = &N(NpcSettings_Koopatrol_Stationary), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = NO_DROPS, + .animations = KOOPATROL_ANIMS, + .extraAnimations = N(ExtraAnims_Koopatrol), + }, + { + .id = NPC_Koopatrol_02, + .pos = { 0.0f, -500.0f, 0.0f }, + .yaw = 0, + .init = &N(EVS_NpcInit_Koopatrol_02), + .settings = &N(NpcSettings_Koopatrol_Stationary), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = NO_DROPS, + .animations = KOOPATROL_ANIMS, + .extraAnimations = N(ExtraAnims_Koopatrol), + }, +}; + +#define NAME_SUFFIX + +NpcGroupList N(LaterNPCs) = { + NPC_GROUP(N(NpcData_Koopatrol_Later)), + {} +}; diff --git a/src/world/area_kkj/kkj_11/ACE140.c b/src/world/area_kkj/kkj_11/ACE140.c deleted file mode 100644 index 8288e1dad8..0000000000 --- a/src/world/area_kkj/kkj_11/ACE140.c +++ /dev/null @@ -1,27 +0,0 @@ -#include "kkj_11.h" - -static char* N(exit_str_0) = "kkj_10"; -static char* N(exit_str_1) = "kkj_12"; -static char* N(exit_str_2) = "kkj_14"; -static char* N(exit_str_3) = "kkj_16"; -static char* N(exit_str_4) = "kkj_15"; -static char* N(exit_str_5) = "kkj_17"; -static char* N(exit_str_6) = "kkj_18"; -static char* N(exit_str_7) = "kkj_11"; - -ApiStatus func_80240000_ACE140(Evt* script, s32 isInitialCall) { - s32 i; - - for (i = 0; i < ARRAY_COUNT(D_80151328->sources); i++) { - D_80151328->sources[i].flags = 0; - } - - return ApiStatus_DONE2; -} - -ApiStatus func_80240034_ACE174(Evt* script, s32 isInitialCall) { - Bytecode* args = script->ptrReadPos; - - gPlayerStatus.availableDisguiseType = evt_get_float_variable(script, *args++); - return ApiStatus_DONE2; -} diff --git a/src/world/area_kkj/kkj_11/ACE1B0.c b/src/world/area_kkj/kkj_11/ACE1B0.c deleted file mode 100644 index 55f9f6832f..0000000000 --- a/src/world/area_kkj/kkj_11/ACE1B0.c +++ /dev/null @@ -1,3 +0,0 @@ -#include "kkj_11.h" - -#include "world/common/todo/RemovePadlock.inc.c" diff --git a/src/world/area_kkj/kkj_11/ACE1F0.c b/src/world/area_kkj/kkj_11/ACE1F0.c deleted file mode 100644 index eee937c02f..0000000000 --- a/src/world/area_kkj/kkj_11/ACE1F0.c +++ /dev/null @@ -1,7 +0,0 @@ -#include "kkj_11.h" - -#include "world/common/atomic/UnkPhysicsFuncs.inc.c" - -#include "world/common/todo/UnkGooberFunc.inc.c" - -const char* kkj_11_str = "kkj_14"; diff --git a/src/world/area_kkj/kkj_11/ACE9E0.c b/src/world/area_kkj/kkj_11/ACE9E0.c deleted file mode 100644 index ea8619d5e1..0000000000 --- a/src/world/area_kkj/kkj_11/ACE9E0.c +++ /dev/null @@ -1,20 +0,0 @@ -#include "kkj_11.h" - -#define NAMESPACE dup_kkj_11 -#include "world/common/atomic/UnkPhysicsFuncs.inc.c" -#define NAMESPACE kkj_11 - -#include "world/common/todo/GetPeachDisguise.inc.c" - -ApiStatus func_80240F44_ACF084(Evt* script, s32 isInitialCall) { - GameStatus* gameStatus = gGameStatusPtr; - - gameStatus->peachFlags |= PEACH_STATUS_FLAG_8; - return ApiStatus_DONE2; -} - -#define NAMESPACE dup_kkj_11 -#include "world/common/todo/UnkGooberFunc.inc.c" -#define NAMESPACE kkj_11 - -const char* kkj_11_str2 = "kkj_14"; diff --git a/src/world/area_kkj/kkj_11/kkj_11.h b/src/world/area_kkj/kkj_11/kkj_11.h index 67d0823e70..2bb1b8c361 100644 --- a/src/world/area_kkj/kkj_11/kkj_11.h +++ b/src/world/area_kkj/kkj_11/kkj_11.h @@ -2,8 +2,36 @@ /// @brief Peach's Castle - Upper Hall (2F) #include "common.h" -#include "../kkj.h" #include "message_ids.h" #include "map.h" +#include "../kkj.h" +#include "mapfs/kkj_11_shape.h" +#include "mapfs/kkj_11_hit.h" + +#include "sprite/npc/WorldKoopatrol.h" + +enum { + NPC_Koopatrol_01 = 0, + NPC_Koopatrol_02 = 1, + NPC_Koopatrol_03 = 2, + NPC_Koopatrol_04 = 3, + NPC_Koopatrol_05 = 4, +}; + +enum { + MV_PadlockEntityIdx = MapVar(0), +}; + #define NAMESPACE kkj_11 + +extern EvtScript N(EVS_Main); +extern EvtScript N(EVS_PlayDemoScene); +extern EvtScript N(EVS_FirstTimeEnterHall); +extern EvtScript N(EVS_ExitDoors_kkj_10_1); +extern EvtScript N(EVS_ExitDoors_kkj_12_0); +extern EvtScript N(EVS_ExitDoor_kkj_14_0); +extern EvtScript N(EVS_MakeEntities); + +extern NpcGroupList N(EarlyNPCs); +extern NpcGroupList N(LaterNPCs); diff --git a/src/world/area_kkj/kkj_11/kkj_11_0_header.c b/src/world/area_kkj/kkj_11/kkj_11_0_header.c new file mode 100644 index 0000000000..92396c4d52 --- /dev/null +++ b/src/world/area_kkj/kkj_11/kkj_11_0_header.c @@ -0,0 +1,20 @@ +#include "kkj_11.h" + +EntryList N(Entrances) = { + [kkj_11_ENTRY_0] { 0.0, 0.0, 480.0, 0.0 }, + [kkj_11_ENTRY_1] { 0.0, 100.0, -360.0, 180.0 }, + [kkj_11_ENTRY_2] { -325.0, 0.0, 360.0, 45.0 }, + [kkj_11_ENTRY_3] { -480.0, 0.0, 50.0, 90.0 }, + [kkj_11_ENTRY_4] { 0.0, 0.0, -255.0, 180.0 }, + [kkj_11_ENTRY_5] { 480.0, 0.0, 50.0, 270.0 }, + [kkj_11_ENTRY_6] { 300.0, 0.0, 380.0, 315.0 }, + [kkj_11_ENTRY_7] { -520.0, 0.0, 50.0, 90.0 }, + [kkj_11_ENTRY_8] { 466.0, 0.0, 60.0, 270.0 }, +}; + +MapSettings N(settings) = { + .main = &N(EVS_Main), + .entryList = &N(Entrances), + .entryCount = ENTRY_COUNT(N(Entrances)), + .tattle = { MSG_MapTattle_kkj_11 }, +}; diff --git a/src/world/area_kkj/kkj_11/kkj_11_1_main.c b/src/world/area_kkj/kkj_11/kkj_11_1_main.c new file mode 100644 index 0000000000..82a3d2370b --- /dev/null +++ b/src/world/area_kkj/kkj_11/kkj_11_1_main.c @@ -0,0 +1,223 @@ +#include "kkj_11.h" + +API_CALLABLE(N(DisableAllLightSources)) { + s32 i; + + for (i = 0; i < ARRAY_COUNT(D_80151328->sources); i++) { + D_80151328->sources[i].flags = LIGHT_SOURCE_DISABLED; + } + + return ApiStatus_DONE2; +} + +#include "../common/SetAvailableDisguise.inc.c" + +EvtScript N(EVS_ExitDoors_kkj_10_1) = { + EVT_SET_GROUP(EVT_GROUP_1B) + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(UseDoorSounds, DOOR_SOUNDS_LARGE) + EVT_SET(LVar0, kkj_11_ENTRY_0) + EVT_SET(LVar1, COLLIDER_tts) + EVT_SET(LVar2, MODEL_door2) + EVT_SET(LVar3, MODEL_door1) + EVT_EXEC(ExitDoubleDoor) + EVT_WAIT(17) + EVT_CALL(GotoMap, EVT_PTR("kkj_10"), kkj_10_ENTRY_1) + EVT_WAIT(100) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_ExitDoors_kkj_12_0) = { + EVT_SET_GROUP(EVT_GROUP_1B) + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(UseDoorSounds, DOOR_SOUNDS_LARGE) + EVT_SET(LVar0, kkj_11_ENTRY_1) + EVT_SET(LVar1, COLLIDER_ttn) + EVT_SET(LVar2, MODEL_door3) + EVT_SET(LVar3, MODEL_door4) + EVT_EXEC(ExitDoubleDoor) + EVT_WAIT(17) + EVT_CALL(GotoMap, EVT_PTR("kkj_12"), kkj_12_ENTRY_0) + EVT_WAIT(100) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_ExitDoor_kkj_14_0) = { + EVT_SET_GROUP(EVT_GROUP_1B) + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(UseDoorSounds, DOOR_SOUNDS_BASIC) + EVT_SET(LVar0, kkj_11_ENTRY_4) + EVT_SET(LVar1, COLLIDER_ttn2) + EVT_SET(LVar2, MODEL_door7) + EVT_SET(LVar3, DOOR_SWING_OUT) + EVT_EXEC(ExitSingleDoor) + EVT_WAIT(17) + EVT_CALL(GotoMap, EVT_PTR("kkj_14"), kkj_14_ENTRY_0) + EVT_WAIT(100) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_ExitDoor_kkj_16_0) = { + EVT_SET_GROUP(EVT_GROUP_1B) + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(UseDoorSounds, DOOR_SOUNDS_BASIC) + EVT_SET(LVar0, kkj_11_ENTRY_2) + EVT_SET(LVar1, COLLIDER_ttsw) + EVT_SET(LVar2, MODEL_door5) + EVT_SET(LVar3, DOOR_SWING_OUT) + EVT_EXEC(ExitSingleDoor) + EVT_WAIT(17) + EVT_CALL(GotoMap, EVT_PTR("kkj_16"), kkj_16_ENTRY_0) + EVT_WAIT(100) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_ExitDoor_kkj_15_0) = { + EVT_SET_GROUP(EVT_GROUP_1B) + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(UseDoorSounds, DOOR_SOUNDS_BASIC) + EVT_SET(LVar0, kkj_11_ENTRY_3) + EVT_SET(LVar1, COLLIDER_ttw) + EVT_SET(LVar2, MODEL_door6) + EVT_SET(LVar3, DOOR_SWING_OUT) + EVT_EXEC(ExitSingleDoor) + EVT_WAIT(17) + EVT_CALL(GotoMap, EVT_PTR("kkj_15"), kkj_15_ENTRY_0) + EVT_WAIT(100) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_ExitDoor_kkj_17_0) = { + EVT_SET_GROUP(EVT_GROUP_1B) + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(UseDoorSounds, DOOR_SOUNDS_BASIC) + EVT_SET(LVar0, kkj_11_ENTRY_5) + EVT_SET(LVar1, COLLIDER_tte) + EVT_SET(LVar2, MODEL_door8) + EVT_SET(LVar3, DOOR_SWING_IN) + EVT_EXEC(ExitSingleDoor) + EVT_WAIT(17) + EVT_CALL(GotoMap, EVT_PTR("kkj_17"), kkj_17_ENTRY_0) + EVT_WAIT(100) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_ExitDoor_kkj_18_0) = { + EVT_SET_GROUP(EVT_GROUP_1B) + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(UseDoorSounds, DOOR_SOUNDS_BASIC) + EVT_SET(LVar0, kkj_11_ENTRY_6) + EVT_SET(LVar1, COLLIDER_ttse) + EVT_SET(LVar2, MODEL_door9) + EVT_SET(LVar3, DOOR_SWING_IN) + EVT_EXEC(ExitSingleDoor) + EVT_WAIT(17) + EVT_CALL(GotoMap, EVT_PTR("kkj_18"), kkj_18_ENTRY_0) + EVT_WAIT(100) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_BindExitTriggers) = { + EVT_IF_GT(GB_StoryProgress, STORY_CH4_BEGAN_PEACH_MISSION) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitDoors_kkj_10_1)), TRIGGER_WALL_PRESS_A, COLLIDER_tts, 1, 0) + EVT_END_IF + EVT_IF_GT(GB_StoryProgress, STORY_CH7_BEGAN_PEACH_MISSION) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitDoors_kkj_12_0)), TRIGGER_WALL_PRESS_A, COLLIDER_ttn, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitDoor_kkj_14_0)), TRIGGER_WALL_PRESS_A, COLLIDER_ttn2, 1, 0) + EVT_END_IF + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitDoor_kkj_17_0)), TRIGGER_WALL_PRESS_A, COLLIDER_tte, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitDoor_kkj_16_0)), TRIGGER_WALL_PRESS_A, COLLIDER_ttsw, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitDoor_kkj_15_0)), TRIGGER_WALL_PRESS_A, COLLIDER_ttw, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitDoor_kkj_18_0)), TRIGGER_WALL_PRESS_A, COLLIDER_ttse, 1, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_EnterMap) = { + EVT_CALL(UseDoorSounds, DOOR_SOUNDS_BASIC) + EVT_CALL(GetEntryID, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_EQ(kkj_11_ENTRY_0) + EVT_CALL(UseDoorSounds, DOOR_SOUNDS_LARGE) + EVT_SET(LVar2, MODEL_door2) + EVT_SET(LVar3, MODEL_door1) + EVT_EXEC_WAIT(EnterDoubleDoor) + EVT_CASE_EQ(kkj_11_ENTRY_1) + EVT_CALL(UseDoorSounds, DOOR_SOUNDS_LARGE) + EVT_SET(LVar2, MODEL_door3) + EVT_SET(LVar3, MODEL_door4) + EVT_EXEC_WAIT(EnterDoubleDoor) + EVT_CASE_EQ(kkj_11_ENTRY_2) + EVT_SET(LVar2, MODEL_door5) + EVT_SET(LVar3, DOOR_SWING_OUT) + EVT_EXEC_WAIT(EnterSingleDoor) + EVT_CASE_EQ(kkj_11_ENTRY_3) + EVT_SET(LVar2, MODEL_door6) + EVT_SET(LVar3, DOOR_SWING_OUT) + EVT_EXEC_WAIT(EnterSingleDoor) + EVT_CASE_EQ(kkj_11_ENTRY_4) + EVT_SET(LVar2, MODEL_door7) + EVT_SET(LVar3, DOOR_SWING_OUT) + EVT_EXEC_WAIT(EnterSingleDoor) + EVT_CASE_EQ(kkj_11_ENTRY_5) + EVT_SET(LVar2, MODEL_door8) + EVT_SET(LVar3, DOOR_SWING_IN) + EVT_EXEC_WAIT(EnterSingleDoor) + EVT_CASE_EQ(kkj_11_ENTRY_6) + EVT_SET(LVar2, MODEL_door9) + EVT_SET(LVar3, DOOR_SWING_IN) + EVT_EXEC_WAIT(EnterSingleDoor) + EVT_CASE_EQ(kkj_11_ENTRY_7) + EVT_EXEC_WAIT(N(EVS_FirstTimeEnterHall)) + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Main) = { + EVT_SET(GB_WorldLocation, LOCATION_PEACHS_CASTLE) + EVT_CALL(SetSpriteShading, SHADING_KKJ_11) + EVT_SETUP_CAMERA_NO_LEAD() + EVT_SWITCH(GB_StoryProgress) + EVT_CASE_OR_EQ(STORY_CH1_BEGAN_PEACH_MISSION) + EVT_CASE_OR_EQ(STORY_CH2_BEGAN_PEACH_MISSION) + EVT_CASE_OR_EQ(STORY_CH3_BEGAN_PEACH_MISSION) + EVT_CASE_OR_EQ(STORY_CH4_BEGAN_PEACH_MISSION) + EVT_CASE_OR_EQ(STORY_CH5_BEGAN_PEACH_MISSION) + EVT_CALL(MakeNpcs, FALSE, EVT_PTR(N(EarlyNPCs))) + EVT_END_CASE_GROUP + EVT_CASE_EQ(STORY_CH6_BEGAN_PEACH_MISSION) + EVT_CALL(N(SetAvailableDisguise), PEACH_DISGUISE_KOOPATROL) + EVT_CALL(EnableModel, MODEL_o364, FALSE) + EVT_CALL(EnableModel, MODEL_o365, FALSE) + EVT_CALL(EnableModel, MODEL_o366, FALSE) + EVT_CALL(N(DisableAllLightSources)) + EVT_CALL(MakeNpcs, FALSE, EVT_PTR(N(LaterNPCs))) + EVT_CASE_DEFAULT + EVT_CALL(EnableModel, MODEL_o364, FALSE) + EVT_CALL(EnableModel, MODEL_o365, FALSE) + EVT_CALL(EnableModel, MODEL_o366, FALSE) + EVT_CALL(N(DisableAllLightSources)) + EVT_END_SWITCH + EVT_EXEC_WAIT(N(EVS_MakeEntities)) + EVT_CALL(GetDemoState, LVar0) + EVT_IF_NE(LVar0, DEMO_STATE_NONE) + EVT_EXEC_WAIT(N(EVS_PlayDemoScene)) + EVT_RETURN + EVT_END_IF + EVT_IF_LT(GB_StoryProgress, STORY_CH8_REACHED_PEACHS_CASTLE) + EVT_CALL(SetMusicTrack, 0, SONG_PEACH_SNEAKING, 0, 8) + EVT_END_IF + EVT_EXEC(N(EVS_BindExitTriggers)) + EVT_EXEC(N(EVS_EnterMap)) + EVT_WAIT(1) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_kkj/kkj_11/kkj_11_2_entity.c b/src/world/area_kkj/kkj_11/kkj_11_2_entity.c new file mode 100644 index 0000000000..b79d31f0aa --- /dev/null +++ b/src/world/area_kkj/kkj_11/kkj_11_2_entity.c @@ -0,0 +1,47 @@ +#include "kkj_11.h" +#include "entity.h" + +s32 N(PeachKeyList)[] = { + ITEM_PEACH_KEY1, + ITEM_NONE +}; + +#include "world/common/todo/RemovePadlock.inc.c" + +EvtScript N(EVS_ItemPrompt_Lock) = { + EVT_CALL(ShowKeyChoicePopup) + EVT_IF_EQ(LVar0, 0) + EVT_CALL(ShowMessageAtScreenPos, MSG_Menus_00D8, 160, 40) + EVT_CALL(CloseChoicePopup) + EVT_RETURN + EVT_END_IF + EVT_IF_EQ(LVar0, -1) + EVT_CALL(CloseChoicePopup) + EVT_RETURN + EVT_END_IF + EVT_CALL(PlaySoundAt, SOUND_269, 0, 0, 10, 490) + EVT_SET(LVar0, MV_PadlockEntityIdx) + EVT_CALL(N(RemovePadlock)) + EVT_WAIT(5) + EVT_CALL(RemoveKeyItemAt, LVar1) + EVT_SET(GF_KKJ11_UnlockedKitchen, TRUE) + EVT_CALL(CloseChoicePopup) + EVT_UNBIND + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitDoors_kkj_10_1)), TRIGGER_WALL_PRESS_A, COLLIDER_tts, 1, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_MakeEntities) = { + EVT_IF_LE(GB_StoryProgress, STORY_CH4_BEGAN_PEACH_MISSION) + EVT_IF_EQ(GF_KKJ11_UnlockedKitchen, FALSE) + EVT_CALL(MakeEntity, EVT_PTR(Entity_Padlock), 0, 10, 490, 180, MAKE_ENTITY_END) + EVT_SET(MV_PadlockEntityIdx, LVar0) + EVT_BIND_PADLOCK(EVT_PTR(N(EVS_ItemPrompt_Lock)), TRIGGER_WALL_PRESS_A, EVT_ENTITY_INDEX(0), EVT_PTR(N(PeachKeyList)), 0, 1) + EVT_ELSE + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitDoors_kkj_10_1)), TRIGGER_WALL_PRESS_A, COLLIDER_tts, 1, 0) + EVT_END_IF + EVT_END_IF + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_kkj/kkj_11/kkj_11_3_scene.c b/src/world/area_kkj/kkj_11/kkj_11_3_scene.c new file mode 100644 index 0000000000..6d32ba0c90 --- /dev/null +++ b/src/world/area_kkj/kkj_11/kkj_11_3_scene.c @@ -0,0 +1,62 @@ +#include "kkj_11.h" + +EvtScript N(EVS_OpenAndCloseDoor) = { + EVT_CALL(PlaySoundAtCollider, COLLIDER_ttw, SOUND_BASIC_DOOR_OPEN, 0) + EVT_CALL(MakeLerp, 0, -120, 10, EASING_LINEAR) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_CALL(RotateModel, MODEL_door6, LVar0, 0, 1, 0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_WAIT(40) + EVT_CALL(MakeLerp, -120, 0, 10, EASING_LINEAR) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_CALL(RotateModel, MODEL_door6, LVar0, 0, 1, 0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_CALL(PlaySoundAtCollider, COLLIDER_ttw, SOUND_BASIC_DOOR_CLOSE, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_FirstTimeEnterHall) = { + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(DisablePartnerAI, 0) + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_CALL(SetNpcPos, NPC_PARTNER, LVar0, 10, LVar2) + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, 0, 0, 444) + EVT_CALL(SetPanTarget, CAM_DEFAULT, 0, 0, 444) + 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(1) + EVT_WAIT(30) + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, -430, 0, 50) + EVT_CALL(SetPanTarget, CAM_DEFAULT, -430, 0, 50) + 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_WAIT(30) + EVT_SET(AF_KKJ_06, TRUE) + EVT_EXEC(N(EVS_OpenAndCloseDoor)) + EVT_WAIT(10) + EVT_THREAD + EVT_WAIT(5) + EVT_CALL(NpcMoveTo, NPC_PARTNER, -455, 50, 30) + EVT_END_THREAD + EVT_CALL(PlayerMoveTo, -430, 50, 30) + EVT_CALL(SetPlayerPos, -430, 0, 50) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 0) + EVT_WAIT(5) + EVT_CALL(EnablePartnerAI) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_kkj/kkj_11/kkj_11_4_demo.c b/src/world/area_kkj/kkj_11/kkj_11_4_demo.c new file mode 100644 index 0000000000..39e4ded65c --- /dev/null +++ b/src/world/area_kkj/kkj_11/kkj_11_4_demo.c @@ -0,0 +1,222 @@ +#include "kkj_11.h" + +EvtScript N(EVS_ProvideDemoInputs) = { + EVT_CALL(DemoJoystickXY, -75, -44) + EVT_WAIT(41) + EVT_CALL(DemoJoystickXY, -74, -44) + EVT_WAIT(1) + EVT_CALL(DemoJoystickXY, -74, -42) + EVT_WAIT(1) + EVT_CALL(DemoJoystickXY, -74, -40) + EVT_WAIT(1) + EVT_CALL(DemoJoystickXY, -74, -39) + EVT_WAIT(1) + EVT_CALL(DemoJoystickXY, -75, -37) + EVT_WAIT(1) + EVT_CALL(DemoJoystickXY, -75, -35) + EVT_WAIT(2) + EVT_CALL(DemoJoystickXY, -75, -33) + EVT_WAIT(1) + EVT_CALL(DemoJoystickXY, -75, -32) + EVT_WAIT(1) + EVT_CALL(DemoJoystickXY, -76, -31) + EVT_WAIT(1) + EVT_CALL(DemoJoystickXY, -76, -30) + EVT_WAIT(1) + EVT_CALL(DemoJoystickXY, -76, -29) + EVT_WAIT(4) + EVT_CALL(DemoJoystickXY, -76, -28) + EVT_WAIT(1) + EVT_CALL(DemoJoystickXY, -78, -23) + EVT_WAIT(1) + EVT_CALL(DemoJoystickXY, -79, -15) + EVT_WAIT(1) + EVT_CALL(DemoJoystickXY, -81, -7) + EVT_WAIT(1) + EVT_CALL(DemoJoystickXY, -82, -2) + EVT_WAIT(5) + EVT_CALL(DemoJoystickXY, -82, 0) + EVT_WAIT(1) + EVT_CALL(DemoJoystickXY, -81, 2) + EVT_WAIT(1) + EVT_CALL(DemoJoystickXY, -80, 5) + EVT_WAIT(1) + EVT_CALL(DemoJoystickXY, -80, 7) + EVT_WAIT(1) + EVT_CALL(DemoJoystickXY, -79, 9) + EVT_WAIT(1) + EVT_CALL(DemoJoystickXY, -79, 12) + EVT_WAIT(1) + EVT_CALL(DemoJoystickXY, -78, 18) + EVT_WAIT(1) + EVT_CALL(DemoJoystickXY, -77, 21) + EVT_WAIT(12) + EVT_CALL(DemoJoystickXY, -76, 22) + EVT_WAIT(1) + EVT_CALL(DemoJoystickXY, -75, 27) + EVT_WAIT(1) + EVT_CALL(DemoJoystickXY, -74, 30) + EVT_WAIT(1) + EVT_CALL(DemoJoystickXY, -74, 31) + EVT_WAIT(2) + EVT_CALL(DemoJoystickXY, -73, 31) + EVT_WAIT(2) + EVT_CALL(DemoJoystickXY, -73, 33) + EVT_WAIT(1) + EVT_CALL(DemoJoystickXY, -73, 34) + EVT_WAIT(1) + EVT_CALL(DemoJoystickXY, -72, 36) + EVT_WAIT(1) + EVT_CALL(DemoJoystickXY, -71, 38) + EVT_WAIT(10) + EVT_CALL(DemoJoystickXY, -70, 38) + EVT_WAIT(1) + EVT_CALL(DemoJoystickXY, -32, 23) + EVT_WAIT(1) + EVT_CALL(DemoJoystickXY, -1, 0) + EVT_WAIT(5) + EVT_CALL(DemoJoystickXY, -1, -3) + EVT_WAIT(1) + EVT_CALL(DemoJoystickXY, 0, -27) + EVT_WAIT(1) + EVT_CALL(DemoJoystickXY, -1, -64) + EVT_WAIT(1) + EVT_CALL(DemoJoystickXY, -12, -81) + EVT_WAIT(1) + EVT_CALL(DemoJoystickXY, -14, -82) + EVT_WAIT(1) + EVT_CALL(DemoJoystickXY, -24, -81) + EVT_WAIT(1) + EVT_CALL(DemoJoystickXY, -32, -80) + EVT_WAIT(1) + EVT_CALL(DemoJoystickXY, -35, -79) + EVT_WAIT(1) + EVT_CALL(DemoJoystickXY, -43, -77) + EVT_WAIT(1) + EVT_CALL(DemoJoystickXY, -52, -75) + EVT_WAIT(1) + EVT_CALL(DemoJoystickXY, -60, -73) + EVT_WAIT(1) + EVT_CALL(DemoJoystickXY, -66, -72) + EVT_WAIT(5) + EVT_CALL(DemoJoystickXY, -67, -71) + EVT_WAIT(1) + EVT_CALL(DemoJoystickXY, -68, -63) + EVT_WAIT(1) + EVT_CALL(DemoJoystickXY, -71, -53) + EVT_WAIT(1) + EVT_CALL(DemoJoystickXY, -75, -32) + EVT_WAIT(1) + EVT_CALL(DemoJoystickXY, -79, -16) + EVT_WAIT(1) + EVT_CALL(DemoJoystickXY, -82, -2) + EVT_WAIT(1) + EVT_CALL(DemoJoystickXY, -82, 0) + EVT_WAIT(1) + EVT_CALL(DemoJoystickXY, -81, 1) + EVT_WAIT(1) + EVT_CALL(DemoJoystickXY, -81, 2) + EVT_WAIT(1) + EVT_CALL(DemoJoystickXY, -81, 3) + EVT_WAIT(2) + EVT_CALL(DemoJoystickXY, -80, 5) + EVT_WAIT(1) + EVT_CALL(DemoJoystickXY, -80, 7) + EVT_WAIT(1) + EVT_CALL(DemoJoystickXY, -79, 11) + EVT_WAIT(1) + EVT_CALL(DemoJoystickXY, -77, 20) + EVT_WAIT(1) + EVT_CALL(DemoJoystickXY, -73, 33) + EVT_WAIT(1) + EVT_CALL(DemoJoystickXY, -70, 48) + EVT_WAIT(1) + EVT_CALL(DemoJoystickXY, -65, 66) + EVT_WAIT(5) + EVT_CALL(DemoJoystickXY, -65, 67) + EVT_WAIT(28) + EVT_CALL(DemoJoystickXY, -65, 66) + EVT_WAIT(4) + EVT_CALL(DemoJoystickXY, -65, 65) + EVT_WAIT(1) + EVT_CALL(DemoJoystickXY, -60, 59) + EVT_WAIT(1) + EVT_CALL(DemoJoystickXY, -48, 49) + EVT_WAIT(1) + EVT_CALL(DemoJoystickXY, -29, 31) + EVT_WAIT(1) + EVT_CALL(DemoJoystickXY, -13, 15) + EVT_WAIT(1) + EVT_CALL(DemoJoystickXY, -1, 0) + EVT_WAIT(5) + EVT_CALL(DemoJoystickXY, 0, 0) + EVT_WAIT(1) + EVT_CALL(DemoJoystickXY, 2, 0) + EVT_WAIT(1) + EVT_CALL(DemoJoystickXY, 10, 1) + EVT_WAIT(2) + EVT_CALL(DemoJoystickXY, -1, 0) + EVT_WAIT(15) + EVT_CALL(DemoJoystickXY, -2, 9) + EVT_WAIT(1) + EVT_CALL(DemoJoystickXY, -19, 33) + EVT_WAIT(1) + EVT_CALL(DemoJoystickXY, -40, 67) + EVT_WAIT(1) + EVT_CALL(DemoJoystickXY, -44, 71) + EVT_WAIT(5) + EVT_CALL(DemoJoystickXY, -44, 72) + EVT_WAIT(1) + EVT_CALL(DemoJoystickXY, -44, 73) + EVT_WAIT(1) + EVT_CALL(DemoJoystickXY, -43, 73) + EVT_WAIT(1) + EVT_CALL(DemoJoystickXY, -43, 74) + EVT_WAIT(8) + EVT_CALL(DemoJoystickXY, -42, 74) + EVT_WAIT(1) + EVT_CALL(DemoJoystickXY, -41, 74) + EVT_WAIT(3) + EVT_CALL(DemoJoystickXY, -39, 75) + EVT_WAIT(1) + EVT_CALL(DemoJoystickXY, -36, 75) + EVT_WAIT(1) + EVT_CALL(DemoJoystickXY, -31, 76) + EVT_WAIT(51) + EVT_CALL(DemoJoystickXY, -29, 76) + EVT_IF_EQ(GF_DemoSceneDone, TRUE) + EVT_RETURN + EVT_END_IF + EVT_SET(GF_DemoSceneDone, TRUE) + EVT_CALL(GotoMapSpecial, EVT_PTR("kkj_11"), kkj_11_ENTRY_2, TRANSITION_2) + EVT_WAIT(110) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_MonitorDemoState) = { + EVT_WAIT(10) + EVT_LOOP(0) + EVT_CALL(GetDemoState, LVar0) + EVT_IF_EQ(LVar0, DEMO_STATE_CHANGE_MAP) + EVT_BREAK_LOOP + EVT_END_IF + EVT_WAIT(1) + EVT_END_LOOP + EVT_IF_EQ(GF_DemoSceneDone, TRUE) + EVT_RETURN + EVT_END_IF + EVT_SET(GF_DemoSceneDone, TRUE) + EVT_CALL(GotoMapSpecial, EVT_PTR("kkj_11"), kkj_11_ENTRY_2, TRANSITION_3) + EVT_WAIT(100) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_PlayDemoScene) = { + EVT_SET(GF_DemoSceneDone, FALSE) + EVT_EXEC(N(EVS_MonitorDemoState)) + EVT_EXEC(N(EVS_ProvideDemoInputs)) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_kkj/kkj_11/kkj_11_5_npcs_early.c b/src/world/area_kkj/kkj_11/kkj_11_5_npcs_early.c new file mode 100644 index 0000000000..688c5d07dc --- /dev/null +++ b/src/world/area_kkj/kkj_11/kkj_11_5_npcs_early.c @@ -0,0 +1,303 @@ +#include "kkj_11.h" + +#define NAME_SUFFIX _Early + +#include "../common/Searchlights.inc.c" +#include "../common/ApproachPlayer100Units.inc.c" + +#include "world/common/enemy/Koopatrol_Stationary.inc.c" + +EvtScript N(EVS_NpcAI_Koopatrol_01) = { + EVT_CALL(DisablePlayerInput, TRUE) + EVT_SET_GROUP(EVT_GROUP_00) + EVT_CALL(SetTimeFreezeMode, TIME_FREEZE_PARTIAL) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_262, 0) + EVT_CALL(ShowEmote, NPC_SELF, EMOTE_EXCLAMATION, 0, 20, TRUE, 0, 0, 0, 0) + EVT_CALL(NpcFacePlayer, NPC_SELF, 5) + EVT_WAIT(20) + EVT_CALL(PlayerFaceNpc, NPC_SELF, FALSE) + EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0005) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_WorldKoopatrol_Anim02) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_WorldKoopatrol_Anim09, ANIM_WorldKoopatrol_Anim02, 0, MSG_Peach_0174) + EVT_CALL(N(ApproachPlayer100Units), -1, LVar3, LVar0, LVar2) + EVT_IF_NE(LVar3, 0) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_WorldKoopatrol_Anim07) + EVT_CALL(SetNpcSpeed, NPC_SELF, EVT_FLOAT(5.0)) + EVT_CALL(NpcMoveTo, NPC_SELF, LVar0, LVar2, 0) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_WorldKoopatrol_Anim02) + EVT_END_IF + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_WorldKoopatrol_Anim09, ANIM_WorldKoopatrol_Anim02, 0, MSG_Peach_0175) + EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0017) + EVT_WAIT(20) + EVT_CALL(GotoMapSpecial, EVT_PTR("kkj_14"), kkj_14_ENTRY_B, TRANSITION_13) + EVT_WAIT(100) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_CALL(SetTimeFreezeMode, TIME_FREEZE_NORMAL) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcIdle_Koopatrol_01) = { + EVT_THREAD + EVT_SET(LVar1, 0) + EVT_LOOP(0) + EVT_CALL(N(UpdateSearchlight), LVar0, 100, 90, 0, 40, 127, 0) + EVT_IF_NE(LVar0, 0) + EVT_IF_EQ(LVar1, 0) + EVT_CALL(BindNpcAI, NPC_SELF, EVT_PTR(N(EVS_NpcAI_Koopatrol_01))) + EVT_SET(LVar1, 1) + EVT_END_IF + EVT_END_IF + EVT_WAIT(1) + EVT_END_LOOP + EVT_END_THREAD + EVT_CALL(SetNpcSpeed, NPC_SELF, EVT_FLOAT(2.0)) + EVT_LOOP(0) + EVT_CALL(NpcMoveTo, NPC_SELF, -130, -130, 0) + EVT_CALL(N(GetAngleBetweenPoints), LVar0, -130, -130, -180, -30) + EVT_CALL(InterpNpcYaw, NPC_SELF, LVar0, 15) + EVT_CALL(NpcMoveTo, NPC_SELF, -180, -30, 0) + EVT_CALL(N(GetAngleBetweenPoints), LVar0, -180, -30, 180, -30) + EVT_CALL(InterpNpcYaw, NPC_SELF, LVar0, 15) + EVT_CALL(NpcMoveTo, NPC_SELF, 180, -30, 0) + EVT_CALL(N(GetAngleBetweenPoints), LVar0, 180, -30, 130, -130) + EVT_CALL(InterpNpcYaw, NPC_SELF, LVar0, 15) + EVT_CALL(NpcMoveTo, NPC_SELF, 130, -130, 0) + EVT_CALL(N(GetAngleBetweenPoints), LVar0, 130, -130, -130, -130) + EVT_CALL(InterpNpcYaw, NPC_SELF, LVar0, 15) + EVT_END_LOOP + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcIdle_Koopatrol_02) = { + EVT_THREAD + EVT_SET(LVar1, 0) + EVT_LOOP(0) + EVT_CALL(N(UpdateSearchlight), LVar0, 100, 90, 0, 40, 128, 1) + EVT_IF_NE(LVar0, 0) + EVT_IF_EQ(LVar1, 0) + EVT_CALL(BindNpcAI, NPC_SELF, EVT_PTR(N(EVS_NpcAI_Koopatrol_01))) + EVT_SET(LVar1, 1) + EVT_END_IF + EVT_END_IF + EVT_WAIT(1) + EVT_END_LOOP + EVT_END_THREAD + EVT_CALL(SetNpcSpeed, NPC_SELF, EVT_FLOAT(2.0)) + EVT_LOOP(0) + EVT_CALL(NpcMoveTo, NPC_SELF, -130, 180, 0) + EVT_CALL(N(GetAngleBetweenPoints), LVar0, -130, 180, -130, 230) + EVT_CALL(InterpNpcYaw, NPC_SELF, LVar0, 15) + EVT_CALL(NpcMoveTo, NPC_SELF, -130, 230, 0) + EVT_CALL(N(GetAngleBetweenPoints), LVar0, -130, 230, -40, 230) + EVT_CALL(InterpNpcYaw, NPC_SELF, LVar0, 15) + EVT_CALL(NpcMoveTo, NPC_SELF, -40, 230, 0) + EVT_CALL(N(GetAngleBetweenPoints), LVar0, -40, 230, -40, 80) + EVT_CALL(InterpNpcYaw, NPC_SELF, LVar0, 15) + EVT_CALL(NpcMoveTo, NPC_SELF, -40, 80, 0) + EVT_CALL(N(GetAngleBetweenPoints), LVar0, -40, 80, -250, 80) + EVT_CALL(InterpNpcYaw, NPC_SELF, LVar0, 15) + EVT_CALL(NpcMoveTo, NPC_SELF, -250, 80, 0) + EVT_CALL(N(GetAngleBetweenPoints), LVar0, -250, 80, -250, 180) + EVT_CALL(InterpNpcYaw, NPC_SELF, LVar0, 15) + EVT_CALL(NpcMoveTo, NPC_SELF, -250, 180, 0) + EVT_CALL(N(GetAngleBetweenPoints), LVar0, -250, 180, -130, 180) + EVT_CALL(InterpNpcYaw, NPC_SELF, LVar0, 15) + EVT_END_LOOP + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcIdle_Koopatrol_03) = { + EVT_THREAD + EVT_SET(LVar1, 0) + EVT_LOOP(0) + EVT_CALL(N(UpdateSearchlight), LVar0, 100, 90, 0, 40, 129, 2) + EVT_IF_NE(LVar0, 0) + EVT_IF_EQ(LVar1, 0) + EVT_CALL(BindNpcAI, NPC_SELF, EVT_PTR(N(EVS_NpcAI_Koopatrol_01))) + EVT_SET(LVar1, 1) + EVT_END_IF + EVT_END_IF + EVT_WAIT(1) + EVT_END_LOOP + EVT_END_THREAD + EVT_CALL(SetNpcSpeed, NPC_SELF, EVT_FLOAT(2.0)) + EVT_LOOP(0) + EVT_CALL(NpcMoveTo, NPC_SELF, 130, 180, 0) + EVT_CALL(N(GetAngleBetweenPoints), LVar0, 130, 180, 250, 180) + EVT_CALL(InterpNpcYaw, NPC_SELF, LVar0, 15) + EVT_CALL(NpcMoveTo, NPC_SELF, 250, 180, 0) + EVT_CALL(N(GetAngleBetweenPoints), LVar0, 250, 180, 250, 80) + EVT_CALL(InterpNpcYaw, NPC_SELF, LVar0, 15) + EVT_CALL(NpcMoveTo, NPC_SELF, 250, 80, 0) + EVT_CALL(N(GetAngleBetweenPoints), LVar0, 250, 80, 40, 80) + EVT_CALL(InterpNpcYaw, NPC_SELF, LVar0, 15) + EVT_CALL(NpcMoveTo, NPC_SELF, 40, 80, 0) + EVT_CALL(N(GetAngleBetweenPoints), LVar0, 40, 80, 40, 230) + EVT_CALL(InterpNpcYaw, NPC_SELF, LVar0, 15) + EVT_CALL(NpcMoveTo, NPC_SELF, 40, 230, 0) + EVT_CALL(N(GetAngleBetweenPoints), LVar0, 40, 230, 130, 230) + EVT_CALL(InterpNpcYaw, NPC_SELF, LVar0, 15) + EVT_CALL(NpcMoveTo, NPC_SELF, 130, 230, 0) + EVT_CALL(N(GetAngleBetweenPoints), LVar0, 130, 230, 130, 180) + EVT_CALL(InterpNpcYaw, NPC_SELF, LVar0, 15) + EVT_END_LOOP + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcIdle_Koopatrol_04) = { + EVT_LOOP(0) + EVT_CALL(GetNpcPos, NPC_SELF, LVar0, LVar1, LVar2) + EVT_CALL(AwaitPlayerApproach, LVar0, LVar2, 50) + EVT_CALL(GetPlayerPos, LVar0, LVar3, LVar2) + EVT_IF_EQ(LVar1, LVar3) + EVT_BREAK_LOOP + EVT_END_IF + EVT_WAIT(1) + EVT_END_LOOP + EVT_CALL(DisablePlayerInput, TRUE) + EVT_SET_GROUP(EVT_GROUP_00) + EVT_CALL(SetTimeFreezeMode, TIME_FREEZE_PARTIAL) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_262, 0) + EVT_CALL(ShowEmote, NPC_SELF, EMOTE_EXCLAMATION, 0, 20, TRUE, 0, 0, 0, 0) + EVT_CALL(NpcFacePlayer, NPC_SELF, 5) + EVT_WAIT(20) + EVT_CALL(PlayerFaceNpc, NPC_SELF, FALSE) + EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0005) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_WorldKoopatrol_Anim08, ANIM_WorldKoopatrol_Anim01, 0, MSG_Peach_0174) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_WorldKoopatrol_Anim08, ANIM_WorldKoopatrol_Anim01, 0, MSG_Peach_0175) + EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0017) + EVT_WAIT(20) + EVT_CALL(GotoMapSpecial, EVT_PTR("kkj_14"), kkj_14_ENTRY_B, TRANSITION_13) + EVT_WAIT(100) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_CALL(SetTimeFreezeMode, TIME_FREEZE_NORMAL) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_Koopatrol_01) = { + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_WorldKoopatrol_Anim05) + EVT_CALL(SetNpcPos, NPC_SELF, 130, 0, -130) + EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(EVS_NpcIdle_Koopatrol_01))) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_Koopatrol_02) = { + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_WorldKoopatrol_Anim05) + EVT_CALL(SetNpcPos, NPC_SELF, -250, 0, 180) + EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(EVS_NpcIdle_Koopatrol_02))) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_Koopatrol_03) = { + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_WorldKoopatrol_Anim05) + EVT_CALL(SetNpcPos, NPC_SELF, 130, 0, 230) + EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(EVS_NpcIdle_Koopatrol_03))) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_Koopatrol_04) = { + EVT_CALL(SetNpcPos, NPC_SELF, 0, 100, -350) + EVT_CALL(SetNpcYaw, NPC_SELF, 220) + EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(EVS_NpcIdle_Koopatrol_04))) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_Koopatrol_05) = { + EVT_CALL(GetEntryID, LVar0) + EVT_IF_EQ(LVar0, kkj_11_ENTRY_4) + EVT_CALL(SetNpcPos, NPC_SELF, -40, 0, -220) + EVT_CALL(SetNpcYaw, NPC_SELF, 90) + EVT_ELSE + EVT_CALL(SetNpcPos, NPC_SELF, 0, 0, -240) + EVT_CALL(SetNpcYaw, NPC_SELF, 220) + EVT_END_IF + EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(EVS_NpcIdle_Koopatrol_04))) + EVT_RETURN + EVT_END +}; + +AnimID N(ExtraAnims_Koopatrol)[] = { + ANIM_WorldKoopatrol_Anim01, + ANIM_WorldKoopatrol_Anim04, + ANIM_WorldKoopatrol_Anim06, + ANIM_WorldKoopatrol_Anim08, + ANIM_WorldKoopatrol_Anim02, + ANIM_WorldKoopatrol_Anim05, + ANIM_WorldKoopatrol_Anim07, + ANIM_WorldKoopatrol_Anim09, + ANIM_LIST_END +}; + +NpcData N(NpcData_Minions)[] = { + { + .id = NPC_Koopatrol_01, + .pos = { 0.0f, -500.0f, 0.0f }, + .yaw = 0, + .init = &N(EVS_NpcInit_Koopatrol_01), + .settings = &N(NpcSettings_Koopatrol_Stationary), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = NO_DROPS, + .animations = KOOPATROL_ANIMS, + .extraAnimations = N(ExtraAnims_Koopatrol), + }, + { + .id = NPC_Koopatrol_02, + .pos = { 0.0f, -500.0f, 0.0f }, + .yaw = 0, + .init = &N(EVS_NpcInit_Koopatrol_02), + .settings = &N(NpcSettings_Koopatrol_Stationary), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = NO_DROPS, + .animations = KOOPATROL_ANIMS, + .extraAnimations = N(ExtraAnims_Koopatrol), + }, + { + .id = NPC_Koopatrol_03, + .pos = { 0.0f, -500.0f, 0.0f }, + .yaw = 0, + .init = &N(EVS_NpcInit_Koopatrol_03), + .settings = &N(NpcSettings_Koopatrol_Stationary), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = NO_DROPS, + .animations = KOOPATROL_ANIMS, + .extraAnimations = N(ExtraAnims_Koopatrol), + }, + { + .id = NPC_Koopatrol_04, + .pos = { 0.0f, -500.0f, 0.0f }, + .yaw = 0, + .init = &N(EVS_NpcInit_Koopatrol_04), + .settings = &N(NpcSettings_Koopatrol_Stationary), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = NO_DROPS, + .animations = KOOPATROL_ANIMS, + .extraAnimations = N(ExtraAnims_Koopatrol), + }, + { + .id = NPC_Koopatrol_05, + .pos = { 0.0f, -500.0f, 0.0f }, + .yaw = 0, + .init = &N(EVS_NpcInit_Koopatrol_05), + .settings = &N(NpcSettings_Koopatrol_Stationary), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = NO_DROPS, + .animations = KOOPATROL_ANIMS, + .extraAnimations = N(ExtraAnims_Koopatrol), + }, +}; + +#define NAME_SUFFIX + +NpcGroupList N(EarlyNPCs) = { + NPC_GROUP(N(NpcData_Minions_Early)), + {} +}; diff --git a/src/world/area_kkj/kkj_11/kkj_11_6_npcs_later.c b/src/world/area_kkj/kkj_11/kkj_11_6_npcs_later.c new file mode 100644 index 0000000000..3543210f37 --- /dev/null +++ b/src/world/area_kkj/kkj_11/kkj_11_6_npcs_later.c @@ -0,0 +1,366 @@ +#include "kkj_11.h" + +#include "../common/Searchlights.inc.c" +#include "world/common/todo/GetPeachDisguise.inc.c" +#include "../common/SetPeachFlag8.inc.c" +#include "../common/ApproachPlayer100Units.inc.c" + +#include "world/common/enemy/Koopatrol_Stationary.inc.c" + +AnimID N(ExtraAnims_Koopatrol)[] = { + ANIM_WorldKoopatrol_Anim00, + ANIM_WorldKoopatrol_Anim01, + ANIM_WorldKoopatrol_Anim02, + ANIM_WorldKoopatrol_Anim04, + ANIM_WorldKoopatrol_Anim05, + ANIM_WorldKoopatrol_Anim06, + ANIM_WorldKoopatrol_Anim07, + ANIM_WorldKoopatrol_Anim08, + ANIM_WorldKoopatrol_Anim09, + ANIM_WorldKoopatrol_Anim12, + ANIM_WorldKoopatrol_Anim14, + ANIM_WorldKoopatrol_Anim1B, + ANIM_LIST_END +}; + +EvtScript N(EVS_CapturePeach) = { + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(N(SetPeachFlag8)) + EVT_SET_GROUP(EVT_GROUP_00) + EVT_CALL(SetTimeFreezeMode, TIME_FREEZE_PARTIAL) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_262, 0) + EVT_CALL(ShowEmote, NPC_SELF, EMOTE_EXCLAMATION, 0, 20, TRUE, 0, 0, 0, 0) + EVT_CALL(NpcFacePlayer, NPC_SELF, 5) + EVT_WAIT(20) + EVT_CALL(PlayerFaceNpc, NPC_SELF, FALSE) + EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0005) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_WorldKoopatrol_Anim01) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_WorldKoopatrol_Anim08, ANIM_WorldKoopatrol_Anim01, 0, MSG_Peach_0174) + EVT_CALL(N(ApproachPlayer100Units), -1, LVar3, LVar0, LVar2) + EVT_IF_NE(LVar3, 0) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_WorldKoopatrol_Anim07) + EVT_CALL(SetNpcSpeed, NPC_SELF, EVT_FLOAT(5.0)) + EVT_CALL(NpcMoveTo, NPC_SELF, LVar0, LVar2, 0) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_WorldKoopatrol_Anim01) + EVT_END_IF + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_WorldKoopatrol_Anim08, ANIM_WorldKoopatrol_Anim01, 0, MSG_Peach_0175) + EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0017) + EVT_WAIT(20) + EVT_CALL(GotoMapSpecial, EVT_PTR("kkj_14"), kkj_14_ENTRY_B, TRANSITION_13) + EVT_WAIT(100) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_CALL(SetTimeFreezeMode, TIME_FREEZE_NORMAL) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_CheckForPeach_Koopatrol_01) = { + EVT_LOOP(0) + EVT_CALL(GetNpcPos, NPC_SELF, LVar0, LVar1, LVar2) + EVT_CALL(GetPlayerPos, LVar3, LVar4, LVar5) + EVT_IF_EQ(LVar1, LVar4) + EVT_CALL(N(GetPeachDisguise), LVar3) + EVT_IF_EQ(LVar3, PEACH_DISGUISE_NONE) + EVT_CALL(IsPlayerWithin, LVar0, LVar2, 80, LVar0) + EVT_IF_EQ(LVar0, 1) + EVT_CALL(BindNpcAI, NPC_SELF, EVT_PTR(N(EVS_CapturePeach))) + EVT_RETURN + EVT_END_IF + EVT_END_IF + EVT_END_IF + EVT_WAIT(1) + EVT_END_LOOP + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_CheckForPeach_Koopatrol_02) = { + EVT_LOOP(0) + EVT_CALL(N(GetPeachDisguise), LVar0) + EVT_IF_EQ(LVar0, PEACH_DISGUISE_NONE) + EVT_CALL(IsPlayerWithin, -275, -38, 30, LVar0) + EVT_IF_EQ(LVar0, 1) + EVT_CALL(SetNpcAnimation, NPC_Koopatrol_02, ANIM_WorldKoopatrol_Anim01) + EVT_CALL(SetNpcAnimation, NPC_Koopatrol_03, ANIM_WorldKoopatrol_Anim01) + EVT_CALL(BindNpcAI, NPC_SELF, EVT_PTR(N(EVS_CapturePeach))) + EVT_RETURN + EVT_END_IF + EVT_END_IF + EVT_WAIT(1) + EVT_END_LOOP + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcIdle_Koopatrol_01) = { + EVT_EXEC(N(EVS_CheckForPeach_Koopatrol_01)) + EVT_CALL(GetEntryID, LVar0) + EVT_IF_EQ(LVar0, kkj_11_ENTRY_1) + EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_8000000, 1) + EVT_CALL(WaitForPlayerInputEnabled) + EVT_THREAD + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(SetPlayerSpeed, EVT_FLOAT(2.0)) + EVT_CALL(PlayerMoveTo, 70, -325, 0) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_END_THREAD + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_WorldKoopatrol_Anim04) + EVT_CALL(SetNpcSpeed, NPC_SELF, EVT_FLOAT(2.0)) + EVT_CALL(NpcMoveTo, NPC_SELF, 0, -350, 0) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_WorldKoopatrol_Anim01) + EVT_CALL(InterpNpcYaw, NPC_SELF, 220, 5) + EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_8000000, 0) + EVT_END_IF + EVT_LOOP(0) + EVT_WAIT(1) + EVT_END_LOOP + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcIdle_Koopatrol_04) = { + EVT_EXEC(N(EVS_CheckForPeach_Koopatrol_01)) + EVT_CALL(GetEntryID, LVar0) + EVT_IF_EQ(LVar0, kkj_11_ENTRY_4) + EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_8000000, 1) + EVT_CALL(WaitForPlayerInputEnabled) + EVT_THREAD + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(SetPlayerSpeed, EVT_FLOAT(2.0)) + EVT_CALL(PlayerMoveTo, 70, -200, 0) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_END_THREAD + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_WorldKoopatrol_Anim04) + EVT_CALL(SetNpcSpeed, NPC_SELF, EVT_FLOAT(2.0)) + EVT_CALL(NpcMoveTo, NPC_SELF, 0, -240, 0) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_WorldKoopatrol_Anim01) + EVT_CALL(InterpNpcYaw, NPC_SELF, 220, 5) + EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_8000000, 0) + EVT_END_IF + EVT_LOOP(0) + EVT_WAIT(1) + EVT_END_LOOP + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcIdle_Koopatrol_02) = { + EVT_LOOP(0) + EVT_CALL(GetSelfVar, 1, LVar0) + EVT_IF_EQ(LVar0, 0) + EVT_CALL(SetNpcAnimation, NPC_Koopatrol_02, ANIM_WorldKoopatrol_Anim08) + EVT_CALL(SetSelfVar, 1, 1) + EVT_ELSE + EVT_CALL(SetNpcAnimation, NPC_Koopatrol_03, ANIM_WorldKoopatrol_Anim08) + EVT_CALL(SetSelfVar, 1, 0) + EVT_END_IF + EVT_CALL(RandInt, 60, LVar0) + EVT_ADD(LVar0, 30) + EVT_WAIT(LVar0) + EVT_CALL(SetNpcAnimation, NPC_Koopatrol_02, ANIM_WorldKoopatrol_Anim01) + EVT_CALL(SetNpcAnimation, NPC_Koopatrol_03, ANIM_WorldKoopatrol_Anim01) + EVT_WAIT(10) + EVT_END_LOOP + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInteract_Koopatrol_01) = { + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_WorldKoopatrol_Anim08, ANIM_WorldKoopatrol_Anim01, 16, MSG_Peach_0135) + EVT_CALL(GetSelfVar, 0, LVar0) + EVT_IF_EQ(LVar0, 1) + EVT_RETURN + EVT_END_IF + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_CALL(SetNpcAnimation, NPC_Koopatrol_01, ANIM_WorldKoopatrol_Anim04) + EVT_CALL(GetNpcPos, NPC_SELF, LVar3, LVar4, LVar5) + EVT_IF_GT(LVar0, 0) + EVT_ADD(LVar3, -50) + EVT_ELSE + EVT_ADD(LVar3, 50) + EVT_END_IF + EVT_CALL(SetNpcSpeed, NPC_SELF, EVT_FLOAT(2.0)) + EVT_CALL(NpcMoveTo, NPC_SELF, LVar3, LVar5, 0) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_WorldKoopatrol_Anim01) + EVT_CALL(InterpNpcYaw, NPC_SELF, 220, 5) + EVT_CALL(SetSelfVar, 0, 1) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitDoors_kkj_12_0)), TRIGGER_WALL_PRESS_A, COLLIDER_ttn, 1, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInteract_Koopatrol_04) = { + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_WorldKoopatrol_Anim08, ANIM_WorldKoopatrol_Anim01, 16, MSG_Peach_0135) + EVT_CALL(GetSelfVar, 0, LVar0) + EVT_IF_EQ(LVar0, 1) + EVT_RETURN + EVT_END_IF + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_WorldKoopatrol_Anim04) + EVT_CALL(GetNpcPos, NPC_SELF, LVar3, LVar4, LVar5) + EVT_IF_GT(LVar0, 0) + EVT_ADD(LVar3, -50) + EVT_ELSE + EVT_ADD(LVar3, 50) + EVT_END_IF + EVT_CALL(SetNpcSpeed, NPC_SELF, EVT_FLOAT(2.0)) + EVT_CALL(NpcMoveTo, NPC_SELF, LVar3, LVar5, 0) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_WorldKoopatrol_Anim01) + EVT_CALL(InterpNpcYaw, NPC_SELF, 220, 5) + EVT_CALL(SetSelfVar, 0, 1) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitDoor_kkj_14_0)), TRIGGER_WALL_PRESS_A, COLLIDER_ttn2, 1, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInteract_Koopatrol_02) = { + EVT_CALL(SetNpcAnimation, NPC_Koopatrol_02, ANIM_WorldKoopatrol_Anim01) + EVT_CALL(SetNpcAnimation, NPC_Koopatrol_03, ANIM_WorldKoopatrol_Anim01) + EVT_WAIT(10) + EVT_CALL(N(GetPeachDisguise), LVar0) + EVT_IF_EQ(LVar0, PEACH_DISGUISE_NONE) + EVT_CALL(NpcFacePlayer, NPC_SELF, 0) + EVT_WAIT(5) + EVT_CALL(BindNpcAI, NPC_SELF, EVT_PTR(N(EVS_CapturePeach))) + EVT_RETURN + EVT_END_IF + EVT_CALL(GetSelfVar, 0, LVar0) + EVT_IF_EQ(LVar0, 0) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_WorldKoopatrol_Anim08, ANIM_WorldKoopatrol_Anim01, 16, MSG_Peach_0131) + EVT_CALL(SetSelfVar, 0, 1) + EVT_ELSE + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_WorldKoopatrol_Anim08, ANIM_WorldKoopatrol_Anim01, 16, MSG_Peach_0132) + EVT_CALL(SetSelfVar, 0, 0) + EVT_END_IF + EVT_WAIT(10) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInteract_Koopatrol_03) = { + EVT_CALL(EnableNpcAI, NPC_Koopatrol_02, FALSE) + EVT_CALL(SetNpcAnimation, NPC_Koopatrol_02, ANIM_WorldKoopatrol_Anim01) + EVT_CALL(SetNpcAnimation, NPC_Koopatrol_03, ANIM_WorldKoopatrol_Anim01) + EVT_WAIT(10) + EVT_CALL(N(GetPeachDisguise), LVar0) + EVT_IF_EQ(LVar0, PEACH_DISGUISE_NONE) + EVT_CALL(NpcFacePlayer, NPC_SELF, 0) + EVT_WAIT(5) + EVT_CALL(BindNpcAI, NPC_SELF, EVT_PTR(N(EVS_CapturePeach))) + EVT_RETURN + EVT_END_IF + EVT_CALL(GetSelfVar, 0, LVar0) + EVT_IF_EQ(LVar0, 0) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_WorldKoopatrol_Anim08, ANIM_WorldKoopatrol_Anim01, 16, MSG_Peach_0133) + EVT_CALL(SetSelfVar, 0, 1) + EVT_ELSE + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_WorldKoopatrol_Anim08, ANIM_WorldKoopatrol_Anim01, 16, MSG_Peach_0134) + EVT_CALL(SetSelfVar, 0, 0) + EVT_END_IF + EVT_WAIT(10) + EVT_CALL(EnableNpcAI, NPC_Koopatrol_02, TRUE) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_Koopatrol_01) = { + EVT_CALL(GetEntryID, LVar0) + EVT_IF_EQ(LVar0, kkj_11_ENTRY_1) + EVT_CALL(SetNpcPos, NPC_SELF, -70, 100, -350) + EVT_CALL(SetNpcYaw, NPC_SELF, 90) + EVT_ELSE + EVT_CALL(SetNpcPos, NPC_SELF, 0, 100, -350) + EVT_CALL(SetNpcYaw, NPC_SELF, 200) + EVT_END_IF + EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(EVS_NpcIdle_Koopatrol_01))) + EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(EVS_NpcInteract_Koopatrol_01))) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_Koopatrol_02) = { + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_WorldKoopatrol_Anim01) + EVT_CALL(SetNpcPos, NPC_SELF, -295, 0, -30) + EVT_CALL(NpcFaceNpc, NPC_SELF, NPC_Koopatrol_03, 0) + EVT_EXEC(N(EVS_CheckForPeach_Koopatrol_02)) + EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(EVS_NpcIdle_Koopatrol_02))) + EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(EVS_NpcInteract_Koopatrol_02))) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_Koopatrol_03) = { + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_WorldKoopatrol_Anim01) + EVT_CALL(SetNpcPos, NPC_SELF, -255, 0, -55) + EVT_CALL(NpcFaceNpc, NPC_SELF, NPC_Koopatrol_02, 0) + EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(EVS_NpcInteract_Koopatrol_03))) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_Koopatrol_04) = { + EVT_CALL(GetEntryID, LVar0) + EVT_IF_EQ(LVar0, kkj_11_ENTRY_4) + EVT_CALL(SetNpcPos, NPC_SELF, -40, 0, -220) + EVT_CALL(SetNpcYaw, NPC_SELF, 90) + EVT_ELSE + EVT_CALL(SetNpcPos, NPC_SELF, 0, 0, -240) + EVT_CALL(SetNpcYaw, NPC_SELF, 220) + EVT_END_IF + EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(EVS_NpcIdle_Koopatrol_04))) + EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(EVS_NpcInteract_Koopatrol_04))) + EVT_RETURN + EVT_END +}; + +NpcData N(NpcData_Minions_Later)[] = { + { + .id = NPC_Koopatrol_01, + .pos = { 0.0f, -500.0f, 0.0f }, + .yaw = 0, + .init = &N(EVS_NpcInit_Koopatrol_01), + .settings = &N(NpcSettings_Koopatrol_Stationary), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_400000, + .drops = NO_DROPS, + .animations = KOOPATROL_ANIMS, + .extraAnimations = N(ExtraAnims_Koopatrol), + }, + { + .id = NPC_Koopatrol_02, + .pos = { 0.0f, -500.0f, 0.0f }, + .yaw = 0, + .init = &N(EVS_NpcInit_Koopatrol_02), + .settings = &N(NpcSettings_Koopatrol_Stationary), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_400000, + .drops = NO_DROPS, + .animations = KOOPATROL_ANIMS, + .extraAnimations = N(ExtraAnims_Koopatrol), + }, + { + .id = NPC_Koopatrol_03, + .pos = { 0.0f, -500.0f, 0.0f }, + .yaw = 0, + .init = &N(EVS_NpcInit_Koopatrol_03), + .settings = &N(NpcSettings_Koopatrol_Stationary), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_400000, + .drops = NO_DROPS, + .animations = KOOPATROL_ANIMS, + .extraAnimations = N(ExtraAnims_Koopatrol), + }, + { + .id = NPC_Koopatrol_04, + .pos = { 0.0f, -500.0f, 0.0f }, + .yaw = 0, + .init = &N(EVS_NpcInit_Koopatrol_04), + .settings = &N(NpcSettings_Koopatrol_Stationary), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_400000, + .drops = NO_DROPS, + .animations = KOOPATROL_ANIMS, + .extraAnimations = N(ExtraAnims_Koopatrol), + }, +}; + +NpcGroupList N(LaterNPCs) = { + NPC_GROUP(N(NpcData_Minions_Later)), + {} +}; diff --git a/src/world/area_kkj/kkj_12/AD4090.c b/src/world/area_kkj/kkj_12/AD4090.c deleted file mode 100644 index 9a0ca5ad9c..0000000000 --- a/src/world/area_kkj/kkj_12/AD4090.c +++ /dev/null @@ -1,21 +0,0 @@ -#include "kkj_12.h" - -static char* N(exit_str_0) = "kkj_11"; -static char* N(exit_str_1) = "kkj_13"; - -ApiStatus func_80240000_AD4090(Evt* script, s32 isInitialCall) { - s32 i; - - for (i = 0; i < 2; i++) { - D_80151328->sources[i].flags = 0; - } - - return ApiStatus_DONE2; -} - -ApiStatus func_80240034_AD40C4(Evt* script, s32 isInitialCall) { - Bytecode* args = script->ptrReadPos; - - gPlayerStatus.availableDisguiseType = evt_get_float_variable(script, *args++); - return ApiStatus_DONE2; -} diff --git a/src/world/area_kkj/kkj_12/AD4100.c b/src/world/area_kkj/kkj_12/AD4100.c deleted file mode 100644 index 241a5f63cb..0000000000 --- a/src/world/area_kkj/kkj_12/AD4100.c +++ /dev/null @@ -1,19 +0,0 @@ -#include "kkj_12.h" - -#include "world/common/atomic/UnkPhysicsFuncs.inc.c" - -#include "world/common/todo/GetPeachDisguise.inc.c" - -ApiStatus func_80240714_AD47A4(Evt* script, s32 isInitialCall) { - gGameStatusPtr->peachFlags |= PEACH_STATUS_FLAG_8; - return ApiStatus_DONE2; -} - -#include "world/common/todo/UnkGooberFunc.inc.c" - -ApiStatus func_8024089C_AD492C(Evt* script, s32 isInitialCall) { - D_80151328->sources[1].flags = 0; - return ApiStatus_DONE2; -} - -const char* kkj_12_str = "kkj_14"; diff --git a/src/world/area_kkj/kkj_12/kkj_12.h b/src/world/area_kkj/kkj_12/kkj_12.h index 45a538c1a3..c5b9f3d2b4 100644 --- a/src/world/area_kkj/kkj_12/kkj_12.h +++ b/src/world/area_kkj/kkj_12/kkj_12.h @@ -2,8 +2,22 @@ /// @brief Peach's Castle - Stairs Hallway (3F) #include "common.h" -#include "../kkj.h" #include "message_ids.h" #include "map.h" +#include "../kkj.h" +#include "mapfs/kkj_12_shape.h" +#include "mapfs/kkj_12_hit.h" + +enum { + NPC_Koopatrol_01 = 0, + NPC_Koopatrol_02 = 1, + NPC_Clubba = 2, +}; + #define NAMESPACE kkj_12 + +extern EvtScript N(EVS_Main); +extern EvtScript N(EVS_ExitDoors_kkj_13_0); + +extern NpcGroupList N(DefaultNPCs); diff --git a/src/world/area_kkj/kkj_12/kkj_12_0_header.c b/src/world/area_kkj/kkj_12/kkj_12_0_header.c new file mode 100644 index 0000000000..086108957a --- /dev/null +++ b/src/world/area_kkj/kkj_12/kkj_12_0_header.c @@ -0,0 +1,13 @@ +#include "kkj_12.h" + +EntryList N(Entrances) = { + [kkj_12_ENTRY_0] { -75.0, 0.0, 0.0, 90.0 }, + [kkj_12_ENTRY_1] { 1175.0, 110.0, 0.0, 270.0 }, +}; + +MapSettings N(settings) = { + .main = &N(EVS_Main), + .entryList = &N(Entrances), + .entryCount = ENTRY_COUNT(N(Entrances)), + .tattle = { MSG_MapTattle_kkj_12 }, +}; diff --git a/src/world/area_kkj/kkj_12/kkj_12_1_main.c b/src/world/area_kkj/kkj_12/kkj_12_1_main.c new file mode 100644 index 0000000000..05d56f560c --- /dev/null +++ b/src/world/area_kkj/kkj_12/kkj_12_1_main.c @@ -0,0 +1,68 @@ +#include "kkj_12.h" + +API_CALLABLE(N(DisableSpotlightSources)) { + s32 i; + + for (i = 0; i < 2; i++) { + D_80151328->sources[i].flags = LIGHT_SOURCE_DISABLED; + } + + return ApiStatus_DONE2; +} + +#include "../common/SetAvailableDisguise.inc.c" + +EvtScript N(EVS_ExitDoors_kkj_11_1) = EVT_EXIT_DOUBLE_DOOR(kkj_12_ENTRY_0, "kkj_11", kkj_11_ENTRY_1, + COLLIDER_deilit1, MODEL_door1, MODEL_door2); +EvtScript N(EVS_ExitDoors_kkj_13_0) = EVT_EXIT_DOUBLE_DOOR(kkj_12_ENTRY_1, "kkj_13", kkj_13_ENTRY_0, + COLLIDER_deilit2, MODEL_door4, MODEL_door3); + +EvtScript N(EVS_BindExitTriggers) = { + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitDoors_kkj_11_1)), TRIGGER_WALL_PRESS_A, COLLIDER_deilit1, 1, 0) + EVT_IF_EQ(GB_StoryProgress, STORY_CH6_BEGAN_PEACH_MISSION) + EVT_IF_EQ(GF_KKJ12_TrickedGuard, FALSE) + EVT_RETURN + EVT_END_IF + EVT_END_IF + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitDoors_kkj_13_0)), TRIGGER_WALL_PRESS_A, COLLIDER_deilit2, 1, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_EnterMap) = { + EVT_CALL(GetEntryID, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_EQ(kkj_12_ENTRY_0) + EVT_SET(LVar2, MODEL_door1) + EVT_SET(LVar3, MODEL_door2) + EVT_EXEC_WAIT(EnterDoubleDoor) + EVT_CASE_EQ(kkj_12_ENTRY_1) + EVT_SET(LVar2, MODEL_door4) + EVT_SET(LVar3, MODEL_door3) + EVT_EXEC_WAIT(EnterDoubleDoor) + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Main) = { + EVT_SET(GB_WorldLocation, LOCATION_PEACHS_CASTLE) + EVT_CALL(SetSpriteShading, SHADING_KKJ_12) + EVT_SETUP_CAMERA_DEFAULT() + EVT_IF_EQ(GB_StoryProgress, STORY_CH6_BEGAN_PEACH_MISSION) + EVT_CALL(N(SetAvailableDisguise), PEACH_DISGUISE_KOOPATROL) + EVT_CALL(MakeNpcs, FALSE, EVT_PTR(N(DefaultNPCs))) + EVT_ELSE + EVT_CALL(EnableModel, MODEL_o694, FALSE) + EVT_CALL(EnableModel, MODEL_o695, FALSE) + EVT_END_IF + EVT_IF_GE(GB_StoryProgress, STORY_CH8_REACHED_BOWSERS_CASTLE) + EVT_CALL(N(DisableSpotlightSources)) + EVT_END_IF + EVT_CALL(UseDoorSounds, DOOR_SOUNDS_LARGE) + EVT_EXEC(N(EVS_BindExitTriggers)) + EVT_EXEC(N(EVS_EnterMap)) + EVT_WAIT(1) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_kkj/kkj_12/kkj_12_2_npc.c b/src/world/area_kkj/kkj_12/kkj_12_2_npc.c new file mode 100644 index 0000000000..2a68deef22 --- /dev/null +++ b/src/world/area_kkj/kkj_12/kkj_12_2_npc.c @@ -0,0 +1,265 @@ +#include "kkj_12.h" + +#include "../common/Searchlights.inc.c" + +#include "world/common/todo/GetPeachDisguise.inc.c" +#include "../common/SetPeachFlag8.inc.c" +#include "../common/ApproachPlayer100Units.inc.c" + +API_CALLABLE(N(DisableLightSource1)) { + D_80151328->sources[1].flags = LIGHT_SOURCE_DISABLED; + return ApiStatus_DONE2; +} + +#include "world/common/enemy/Clubba.h" +#include "world/common/enemy/Koopatrol_Stationary.inc.c" +#include "world/common/npc/Dummy.inc.c" + +AnimID N(ExtraAnims_Koopatrol)[] = { + ANIM_WorldKoopatrol_Anim00, + ANIM_WorldKoopatrol_Anim01, + ANIM_WorldKoopatrol_Anim02, + ANIM_WorldKoopatrol_Anim04, + ANIM_WorldKoopatrol_Anim05, + ANIM_WorldKoopatrol_Anim06, + ANIM_WorldKoopatrol_Anim07, + ANIM_WorldKoopatrol_Anim08, + ANIM_WorldKoopatrol_Anim09, + ANIM_WorldKoopatrol_Anim12, + ANIM_WorldKoopatrol_Anim14, + ANIM_WorldKoopatrol_Anim1B, + ANIM_LIST_END +}; + +AnimID N(ExtraAnims_Clubba)[] = { + ANIM_WorldClubba_Anim00, + ANIM_WorldClubba_Anim02, + ANIM_WorldClubba_Anim03, + ANIM_WorldClubba_Anim04, + ANIM_WorldClubba_Anim05, + ANIM_WorldClubba_Anim08, + ANIM_WorldClubba_Anim07, + ANIM_WorldClubba_Anim13, + ANIM_WorldClubba_Anim14, + ANIM_LIST_END +}; + +EvtScript N(EVS_NpcInteract_Koopatrol_01) = { + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(N(GetPeachDisguise), LVar0) + EVT_IF_EQ(LVar0, PEACH_DISGUISE_CLUBBA) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_WorldKoopatrol_Anim09, ANIM_WorldKoopatrol_Anim02, 0, MSG_Peach_0143) + EVT_ELSE + EVT_CALL(GetSelfVar, 0, LVar0) + EVT_IF_EQ(LVar0, 0) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_WorldKoopatrol_Anim09, ANIM_WorldKoopatrol_Anim02, 0, MSG_Peach_0141) + EVT_CALL(SetSelfVar, 0, 1) + EVT_ELSE + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_WorldKoopatrol_Anim09, ANIM_WorldKoopatrol_Anim02, 0, MSG_Peach_0142) + EVT_CALL(SetSelfVar, 0, 0) + EVT_END_IF + EVT_END_IF + EVT_CALL(DisablePlayerInput, FALSE) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInteract_Koopatrol_02) = { + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(N(GetPeachDisguise), LVar0) + EVT_IF_EQ(LVar0, PEACH_DISGUISE_CLUBBA) + EVT_CALL(AdjustCam, CAM_DEFAULT, EVT_FLOAT(5.0), 0, EVT_FLOAT(350.0), EVT_FLOAT(15.0), EVT_FLOAT(-7.0)) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_WorldKoopatrol_Anim09, ANIM_WorldKoopatrol_Anim02, 0, MSG_Peach_0147) + EVT_THREAD + EVT_LOOP(0) + EVT_CALL(PlayerFaceNpc, NPC_Koopatrol_02, FALSE) + EVT_WAIT(1) + EVT_IF_EQ(GF_KKJ12_TrickedGuard, TRUE) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_END_THREAD + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_100, TRUE) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_WorldKoopatrol_Anim05) + EVT_CALL(SetNpcSpeed, NPC_SELF, EVT_FLOAT(2.0)) + EVT_CALL(NpcMoveTo, NPC_SELF, 1050, 0, 0) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_WorldKoopatrol_Anim09, ANIM_WorldKoopatrol_Anim02, 0, MSG_Peach_0148) + EVT_CALL(NpcMoveTo, NPC_SELF, 900, 0, 0) + EVT_CALL(SetNpcPos, NPC_SELF, 0, -500, 0) + EVT_SET(GF_KKJ12_TrickedGuard, TRUE) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitDoors_kkj_13_0)), TRIGGER_WALL_PRESS_A, COLLIDER_deilit2, 1, 0) + EVT_CALL(ResetCam, CAM_DEFAULT, EVT_FLOAT(4.0)) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_RETURN + EVT_END_IF + EVT_IF_EQ(GF_KKJ11_TrickedGuard, FALSE) + EVT_CALL(AdjustCam, CAM_DEFAULT, EVT_FLOAT(5.0), 0, EVT_FLOAT(350.0), EVT_FLOAT(15.0), EVT_FLOAT(-7.0)) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_WorldKoopatrol_Anim09, ANIM_WorldKoopatrol_Anim02, 0, MSG_Peach_0144) + EVT_WAIT(10) + EVT_SET(LVar0, ITEM_PEACH_KEY1) + EVT_CALL(ShowGotItem, LVar0, TRUE, 0) + EVT_CALL(AddKeyItem, LVar0) + EVT_SET(GF_KKJ11_TrickedGuard, TRUE) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_WorldKoopatrol_Anim09, ANIM_WorldKoopatrol_Anim02, 0, MSG_Peach_0145) + EVT_CALL(InterpNpcYaw, NPC_SELF, 270, 0) + EVT_CALL(ResetCam, CAM_DEFAULT, EVT_FLOAT(5.0)) + EVT_ELSE + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_WorldKoopatrol_Anim09, ANIM_WorldKoopatrol_Anim02, 16, MSG_Peach_0146) + EVT_END_IF + EVT_CALL(DisablePlayerInput, FALSE) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_CapturePeach) = { + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(N(SetPeachFlag8)) + EVT_SET_GROUP(EVT_GROUP_00) + EVT_CALL(SetTimeFreezeMode, TIME_FREEZE_PARTIAL) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_262, 0) + EVT_CALL(ShowEmote, NPC_SELF, EMOTE_EXCLAMATION, 0, 20, TRUE, 0, 0, 0, 0) + EVT_CALL(NpcFacePlayer, NPC_SELF, 5) + EVT_WAIT(20) + EVT_CALL(PlayerFaceNpc, NPC_SELF, FALSE) + EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0005) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_WorldKoopatrol_Anim02) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_WorldKoopatrol_Anim09, ANIM_WorldKoopatrol_Anim02, 0, MSG_Peach_0174) + EVT_CALL(N(ApproachPlayer100Units), NPC_SELF, LVar3, LVar0, LVar2) + EVT_IF_NE(LVar3, 0) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_WorldKoopatrol_Anim07) + EVT_CALL(SetNpcSpeed, NPC_SELF, EVT_FLOAT(5.0)) + EVT_CALL(NpcMoveTo, NPC_SELF, LVar0, LVar2, 0) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_WorldKoopatrol_Anim02) + EVT_END_IF + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_WorldKoopatrol_Anim09, ANIM_WorldKoopatrol_Anim02, 0, MSG_Peach_0175) + EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0017) + EVT_WAIT(20) + EVT_CALL(GotoMapSpecial, EVT_PTR("kkj_14"), kkj_14_ENTRY_B, TRANSITION_13) + EVT_WAIT(100) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_CALL(SetTimeFreezeMode, TIME_FREEZE_NORMAL) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcIdle_Koopatrol_01) = { + EVT_THREAD + EVT_SET(LVar2, 0) + EVT_LOOP(0) + EVT_CALL(N(UpdateSearchlight), LVar0, 100, 90, 0, 40, MODEL_o694, 0) + EVT_IF_EQ(LVar2, 0) + EVT_CALL(N(GetPeachDisguise), LVar1) + EVT_IF_EQ(LVar1, PEACH_DISGUISE_NONE) + EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_8000000, 1) + EVT_IF_NE(LVar0, 0) + EVT_CALL(BindNpcAI, NPC_SELF, EVT_PTR(N(EVS_CapturePeach))) + EVT_SET(LVar2, 1) + EVT_END_IF + EVT_ELSE + EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_8000000, 0) + EVT_END_IF + EVT_END_IF + EVT_WAIT(1) + EVT_END_LOOP + EVT_END_THREAD + EVT_CALL(SetNpcSpeed, NPC_SELF, EVT_FLOAT(2.0)) + EVT_LOOP(0) + EVT_CALL(NpcMoveTo, NPC_SELF, 900, 0, 0) + EVT_CALL(N(GetAngleBetweenPoints), LVar0, 900, 0, 800, 0) + EVT_CALL(InterpNpcYaw, NPC_SELF, LVar0, 15) + EVT_CALL(NpcMoveTo, NPC_SELF, 800, 0, 0) + EVT_CALL(N(GetAngleBetweenPoints), LVar0, 800, 0, 900, 0) + EVT_CALL(InterpNpcYaw, NPC_SELF, LVar0, 15) + EVT_END_LOOP + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcIdle_Koopatrol_02) = { + EVT_THREAD + EVT_SET(LVar2, 0) + EVT_LOOP(0) + EVT_CALL(N(UpdateSearchlight), LVar0, 100, 90, 0, 40, MODEL_o695, 1) + EVT_IF_EQ(LVar2, 0) + EVT_CALL(N(GetPeachDisguise), LVar1) + EVT_IF_EQ(LVar1, PEACH_DISGUISE_NONE) + EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_8000000, 1) + EVT_IF_NE(LVar0, 0) + EVT_CALL(BindNpcAI, NPC_SELF, EVT_PTR(N(EVS_CapturePeach))) + EVT_SET(LVar2, 1) + EVT_END_IF + EVT_ELSE + EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_8000000, 0) + EVT_END_IF + EVT_END_IF + EVT_WAIT(1) + EVT_END_LOOP + EVT_END_THREAD + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_Koopatrol_01) = { + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_WorldKoopatrol_Anim05) + EVT_CALL(SetNpcPos, NPC_SELF, 800, 110, 0) + EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(EVS_NpcIdle_Koopatrol_01))) + EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(EVS_NpcInteract_Koopatrol_01))) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_Koopatrol_02) = { + EVT_IF_NE(GF_KKJ12_TrickedGuard, FALSE) + EVT_CALL(EnableModel, MODEL_o695, FALSE) + EVT_CALL(N(DisableLightSource1)) + EVT_CALL(RemoveNpc, NPC_SELF) + EVT_RETURN + EVT_END_IF + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_WorldKoopatrol_Anim02) + EVT_CALL(SetNpcPos, NPC_SELF, 1170, 110, 0) + EVT_CALL(SetNpcYaw, NPC_SELF, 270) + EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(EVS_NpcIdle_Koopatrol_02))) + EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(EVS_NpcInteract_Koopatrol_02))) + EVT_RETURN + EVT_END +}; + +NpcData N(NpcData_Koopatrol_01)[] = { + { + .id = NPC_Koopatrol_01, + .pos = { 0.0f, -500.0f, 0.0f }, + .yaw = 0, + .init = &N(EVS_NpcInit_Koopatrol_01), + .settings = &N(NpcSettings_Koopatrol_Stationary), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = NO_DROPS, + .animations = KOOPATROL_ANIMS, + .extraAnimations = N(ExtraAnims_Koopatrol), + }, + { + .id = NPC_Koopatrol_02, + .pos = { 0.0f, -500.0f, 0.0f }, + .yaw = 0, + .init = &N(EVS_NpcInit_Koopatrol_02), + .settings = &N(NpcSettings_Koopatrol_Stationary), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_400000, + .drops = NO_DROPS, + .animations = KOOPATROL_ANIMS, + .extraAnimations = N(ExtraAnims_Koopatrol), + }, + { + .id = NPC_Clubba, + .pos = { NPC_DISPOSE_LOCATION }, + .yaw = 0, + .settings = &N(NpcSettings_Dummy), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = NO_DROPS, + .animations = CLUBBA_ANIMS, + .extraAnimations = N(ExtraAnims_Clubba), + }, +}; + +NpcGroupList N(DefaultNPCs) = { + NPC_GROUP(N(NpcData_Koopatrol_01)), + {} +}; diff --git a/src/world/area_kkj/kkj_13/AD5ED0.c b/src/world/area_kkj/kkj_13/AD5ED0.c deleted file mode 100644 index c12378e01b..0000000000 --- a/src/world/area_kkj/kkj_13/AD5ED0.c +++ /dev/null @@ -1,6 +0,0 @@ -#include "kkj_13.h" - -static char* N(exit_str_0) = "kkj_12"; -static char* N(exit_str_1) = "kkj_22"; - -#include "world/common/todo/SetPlayerSpriteSet2_MapInit.inc.c" diff --git a/src/world/area_kkj/kkj_13/AD5EF0.c b/src/world/area_kkj/kkj_13/AD5EF0.c deleted file mode 100644 index 17f5e5dfcd..0000000000 --- a/src/world/area_kkj/kkj_13/AD5EF0.c +++ /dev/null @@ -1,4 +0,0 @@ -#include "kkj_13.h" - -#include "world/common/atomic/TexturePan.inc.c" - diff --git a/src/world/area_kkj/kkj_13/AD6200.c b/src/world/area_kkj/kkj_13/AD6200.c deleted file mode 100644 index 7bbc619702..0000000000 --- a/src/world/area_kkj/kkj_13/AD6200.c +++ /dev/null @@ -1,111 +0,0 @@ -#include "kkj_13.h" -#include "effects.h" - -ApiStatus func_80240330_AD6200(Evt* script, s32 isInitialCall) { - Npc* npc = get_npc_safe(1); - f32 x = npc->pos.x; - f32 y = npc->pos.y; - f32 z = npc->pos.z; - - sfx_adjust_env_sound_pos(SOUND_23D, SOUND_SPACE_MODE_0, x, y, z); - script->varTable[0] = y; - - return ApiStatus_DONE2; -} - -ApiStatus func_80240390_AD6260(Evt* script, s32 isInitialCall) { - Npc* npc = get_npc_safe(1); - f32 x = npc->pos.x; - f32 y = npc->pos.y; - f32 z = npc->pos.z; - - sfx_adjust_env_sound_pos(SOUND_23D, SOUND_SPACE_MODE_0, x, y, z); - script->varTable[0] = y; - - return ApiStatus_DONE2; -} - -ApiStatus func_802403F0_AD62C0(Evt* script, s32 isInitialCall) { - if (isInitialCall) { - script->functionTemp[1] = 0; - } - - script->functionTemp[1] += 64; - - if (script->functionTemp[1] > 255) { - script->functionTemp[1] = 255; - } - - set_screen_overlay_color(0, 160, 160, 160); - set_screen_overlay_params_front(1, script->functionTemp[1]); - - if (script->functionTemp[1] == 255) { - return ApiStatus_DONE2; - } - - return ApiStatus_BLOCK; -} - -ApiStatus func_8024046C_AD633C(Evt* script, s32 isInitialCall) { - if (isInitialCall) { - script->functionTemp[1] = 255; - } - - script->functionTemp[1] -= 64; - - if (script->functionTemp[1] <= 0) { - script->functionTemp[1] = 0; - } - - set_screen_overlay_color(0, 160, 160, 160); - set_screen_overlay_params_front(1, script->functionTemp[1]); - - if (script->functionTemp[1] == 0) { - return ApiStatus_DONE2; - } - - return ApiStatus_BLOCK; -} - -typedef struct UnkKKJ13 { - /* 0x00 */ s16 unk_00; - /* 0x02 */ s16 unk_02; -} UnkKKJ13; // size = 0x4 - -extern UnkKKJ13 D_80243614_AD94E4[28]; // TODO remove hard-coded size once data is migrated - -ApiStatus func_802404E0_AD63B0(Evt* script, s32 isInitialCall) { - EffectInstance* effect; - f32 temp_f20; - f32 temp_f24; - f32 temp_f26; - s32 a0; - f32 a1; - f32 a2; - s32 i; - - for (i = 0; i < ARRAY_COUNT(D_80243614_AD94E4); i++) { - a0 = (i & 1) + 2; - temp_f20 = D_80243614_AD94E4[i].unk_00; - temp_f24 = (temp_f20 * cos_deg(D_80243614_AD94E4[i].unk_02)) * 1.3; - temp_f26 = (temp_f20 * sin_deg(D_80243614_AD94E4[i].unk_02)) * 1.5; - a1 = temp_f24 + 600.0f; - a2 = temp_f26 + 100.0f; - temp_f24 *= 0.1; - temp_f26 *= 0.1; - temp_f24 += cos_deg(temp_f20 * 15.0f) * 5.0f; - effect = fx_ice_shard(a0, a1, a2, -150.0f, ((i & 3) * 0.4) + 1.0, ((i & 3) * 4) + 30); - effect->data.iceShard->animFrame = 0; - effect->data.iceShard->animRate = (rand_int(10) * 0.2) + 0.1; - effect->data.iceShard->rotation = 35 * i; - effect->data.iceShard->angularVel = rand_int(10) - 5; - effect->data.iceShard->vel.x = temp_f24; - effect->data.iceShard->vel.y = temp_f26; - effect->data.iceShard->vel.z = 2.0f; - effect->data.iceShard->gravAccel = -0.1f; - } - return ApiStatus_DONE2; -} - -const char* N(exit_str_0) = "osr_03"; -const char* N(exit_str_1) = "hos_10"; diff --git a/src/world/area_kkj/kkj_13/kkj_13.h b/src/world/area_kkj/kkj_13/kkj_13.h index c463021a96..97600e7906 100644 --- a/src/world/area_kkj/kkj_13/kkj_13.h +++ b/src/world/area_kkj/kkj_13/kkj_13.h @@ -2,8 +2,37 @@ /// @brief Peach's Castle - Window Hallway (4F) #include "common.h" -#include "../kkj.h" #include "message_ids.h" #include "map.h" +#include "../kkj.h" +#include "mapfs/kkj_13_shape.h" +#include "mapfs/kkj_13_hit.h" + +#include "sprite/npc/WorldBowser.h" +#include "sprite/npc/WorldKammy.h" +#include "sprite/npc/WorldKoopatrol.h" + +enum { + // shared + NPC_Bowser_Body = 0, + NPC_Bowser_Prop = 1, + // chapter 8 + NPC_CaptivePeach = 2, + // intro + NPC_Koopatrol_01 = 2, + NPC_Koopatrol_02 = 3, + NPC_Kammy = 4, + NPC_Peach = 5, +}; + #define NAMESPACE kkj_13 + +extern EvtScript N(EVS_Main); +extern EvtScript N(EVS_SetupMusic); +extern EvtScript N(EVS_Scene_MarioConfrontsBowser); +extern EvtScript N(EVS_Scene_BowserAttacks); +extern EvtScript N(EVS_Scene_PeachCaptured); + +extern NpcGroupList N(IntroNPCs); +extern NpcGroupList N(ChapterNPCs); diff --git a/src/world/area_kkj/kkj_13/kkj_13_0_header.c b/src/world/area_kkj/kkj_13/kkj_13_0_header.c new file mode 100644 index 0000000000..b3eeae5d3d --- /dev/null +++ b/src/world/area_kkj/kkj_13/kkj_13_0_header.c @@ -0,0 +1,18 @@ +#include "kkj_13.h" + +#include "world/common/todo/SetPlayerSpriteSet2_MapInit.inc.c" + +EntryList N(Entrances) = { + [kkj_13_ENTRY_0] { -95.0, 0.0, 0.0, 90.0 }, + [kkj_13_ENTRY_1] { 1295.0, 0.0, 0.0, 270.0 }, + [kkj_13_ENTRY_2] { 630.0, 0.0, 0.0, 90.0 }, + [kkj_13_ENTRY_3] { 0.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_kkj_13 }, +}; diff --git a/src/world/area_kkj/kkj_13/kkj_13_1_music.c b/src/world/area_kkj/kkj_13/kkj_13_1_music.c new file mode 100644 index 0000000000..879c53fb52 --- /dev/null +++ b/src/world/area_kkj/kkj_13/kkj_13_1_music.c @@ -0,0 +1,20 @@ +#include "kkj_13.h" + +EvtScript N(EVS_SetupMusic) = { + EVT_SWITCH(GB_StoryProgress) + EVT_CASE_EQ(STORY_INTRO) + EVT_CASE_GE(STORY_CH8_REACHED_PEACHS_CASTLE) + EVT_IF_EQ(GF_KKJ13_BowserTaunts, FALSE) + EVT_THREAD + EVT_WAIT(30) + EVT_CALL(SetMusicTrack, 0, SONG_BOWSER_THEME, 0, 8) + EVT_END_THREAD + EVT_ELSE + EVT_CALL(SetMusicTrack, 0, SONG_BOWSER_THEME, 0, 8) + EVT_END_IF + EVT_CASE_DEFAULT + EVT_END_SWITCH + EVT_CALL(UseDoorSounds, DOOR_SOUNDS_LARGE) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_kkj/kkj_13/kkj_13_2_main.c b/src/world/area_kkj/kkj_13/kkj_13_2_main.c new file mode 100644 index 0000000000..1bb614faf5 --- /dev/null +++ b/src/world/area_kkj/kkj_13/kkj_13_2_main.c @@ -0,0 +1,94 @@ +#include "kkj_13.h" + +#include "world/common/atomic/TexturePan.inc.c" + +Gfx N(setup_gfx_candle_lights)[] = { + gsDPPipeSync(), + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), + gsDPSetCycleType(G_CYC_2CYCLE), + gsDPSetTexturePersp(G_TP_PERSP), + gsDPSetTextureDetail(G_TD_CLAMP), + gsDPSetTextureLOD(G_TL_TILE), + gsDPSetTextureLUT(G_TT_NONE), + gsDPSetTextureFilter(G_TF_BILERP), + gsDPSetTextureConvert(G_TC_FILT), + gsDPSetPrimColor(0, 0, 75, 31, 19, 255), + gsDPSetEnvColor(255, 118, 77, 0), + gsDPSetCombineLERP(TEXEL0, TEXEL1, TEXEL0, 1, 1, TEXEL0, TEXEL1, 1, 0, PRIMITIVE, COMBINED, ENVIRONMENT, COMBINED, TEXEL1, TEXEL1, TEXEL1), + gsDPSetRenderMode(G_RM_PASS, G_RM_ZB_CLD_SURF2), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_SHADE | G_CULL_BACK | G_SHADING_SMOOTH), + gsSPEndDisplayList(), +}; + +EvtScript N(EVS_ExitDoors_kkj_12_1) = EVT_EXIT_DOUBLE_DOOR(kkj_13_ENTRY_0, "kkj_12", kkj_12_ENTRY_1, + COLLIDER_deilit1, MODEL_door1, MODEL_door2); +EvtScript N(EVS_ExitDoors_kkj_22_0) = EVT_EXIT_DOUBLE_DOOR(kkj_13_ENTRY_1, "kkj_22", kkj_22_ENTRY_0, + COLLIDER_deilit2, MODEL_door4, MODEL_door3); + +EvtScript N(EVS_EnterMap) = { + EVT_CALL(GetEntryID, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_EQ(kkj_13_ENTRY_0) + EVT_SET(LVar2, MODEL_door1) + EVT_SET(LVar3, MODEL_door2) + EVT_EXEC_WAIT(EnterDoubleDoor) + EVT_EXEC(N(EVS_Scene_MarioConfrontsBowser)) + EVT_CASE_EQ(kkj_13_ENTRY_1) + EVT_SET(LVar2, MODEL_door4) + EVT_SET(LVar3, MODEL_door3) + EVT_EXEC_WAIT(EnterDoubleDoor) + EVT_CASE_EQ(kkj_13_ENTRY_2) + EVT_EXEC(N(EVS_Scene_BowserAttacks)) + EVT_CASE_EQ(kkj_13_ENTRY_3) + EVT_EXEC(N(EVS_Scene_PeachCaptured)) + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Main) = { + EVT_SET(GB_WorldLocation, LOCATION_PEACHS_CASTLE) + EVT_CALL(SetSpriteShading, SHADING_KKJ_13) + EVT_SETUP_CAMERA_DEFAULT() + EVT_IF_EQ(GB_StoryProgress, STORY_INTRO) + EVT_CALL(MakeNpcs, FALSE, EVT_PTR(N(IntroNPCs))) + EVT_END_IF + EVT_IF_GE(GB_StoryProgress, STORY_CH8_OPENED_PATH_TO_STAR_WAY) + EVT_CALL(MakeNpcs, FALSE, EVT_PTR(N(ChapterNPCs))) + EVT_END_IF + EVT_CALL(GetEntryID, LVar0) + EVT_IF_EQ(LVar0, kkj_13_ENTRY_2) + EVT_CALL(EnableGroup, MODEL_g152, FALSE) + EVT_CALL(EnableGroup, MODEL_g154, FALSE) + EVT_CALL(EnableGroup, MODEL_g153, FALSE) + EVT_ELSE + EVT_CALL(EnableGroup, MODEL_g133, FALSE) + EVT_CALL(EnableGroup, MODEL_g147, FALSE) + EVT_CALL(EnableGroup, MODEL_g153, FALSE) + EVT_END_IF + EVT_IF_GE(GB_StoryProgress, STORY_CH8_OPENED_PATH_TO_STAR_WAY) + EVT_IF_EQ(GF_KKJ13_BowserTaunts, FALSE) + EVT_CALL(EnableGroup, MODEL_g153, TRUE) + EVT_CALL(TranslateGroup, MODEL_g153, 780, 90, 0) + EVT_CALL(RotateGroup, MODEL_g153, -60, 0, 1, 0) + EVT_END_IF + EVT_END_IF + EVT_CALL(SetTexPanner, MODEL_o685, 0) + EVT_THREAD + TEX_PAN_PARAMS_ID(TEX_PANNER_0) + TEX_PAN_PARAMS_STEP( 0, 0, 40, 900) + 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_CALL(SetModelCustomGfx, MODEL_o685, CUSTOM_GFX_0, FOG_MODE_UNCHANGED) + EVT_CALL(SetCustomGfx, CUSTOM_GFX_0, EVT_PTR(N(setup_gfx_candle_lights)), NULL) + EVT_EXEC(N(EVS_SetupMusic)) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitDoors_kkj_12_1)), TRIGGER_WALL_PRESS_A, COLLIDER_deilit1, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitDoors_kkj_22_0)), TRIGGER_WALL_PRESS_A, COLLIDER_deilit2, 1, 0) + EVT_EXEC(N(EVS_EnterMap)) + EVT_WAIT(1) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_kkj/kkj_13/kkj_13_3_npcs_finale.c b/src/world/area_kkj/kkj_13/kkj_13_3_npcs_finale.c new file mode 100644 index 0000000000..ff426ae5a4 --- /dev/null +++ b/src/world/area_kkj/kkj_13/kkj_13_3_npcs_finale.c @@ -0,0 +1,385 @@ +#include "kkj_13.h" + +#include "world/common/npc/Peach.h" + +#include "world/common/npc/Bowser.inc.c" +#include "world/common/npc/Dummy.inc.c" + +API_CALLABLE(N(UpdatePropellerSoundPos)) { + Npc* npc = get_npc_safe(NPC_Bowser_Prop); + f32 x = npc->pos.x; + f32 y = npc->pos.y; + f32 z = npc->pos.z; + + sfx_adjust_env_sound_pos(SOUND_23D, SOUND_SPACE_MODE_0, x, y, z); + script->varTable[0] = y; + + return ApiStatus_DONE2; +} + +EvtScript N(EVS_UpdatePropellerSounds) = { + EVT_CALL(PlaySoundAtNpc, NPC_Bowser_Prop, SOUND_80000066, 0) + EVT_LOOP(0) + EVT_CALL(N(UpdatePropellerSoundPos)) + EVT_IF_LT(LVar0, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_IF_EQ(GF_KKJ13_BowserTaunts, TRUE) + EVT_BREAK_LOOP + EVT_END_IF + EVT_WAIT(1) + EVT_END_LOOP + EVT_CALL(StopSound, SOUND_80000066) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_MoveToBattlePositions) = { + EVT_THREAD + EVT_CALL(SetNpcPos, NPC_Bowser_Prop, NPC_DISPOSE_LOCATION) + EVT_CALL(PlayerMoveTo, 525, 0, 50) + EVT_CALL(SetPlayerAnimation, ANIM_Mario_BeforeJump) + EVT_END_THREAD + EVT_THREAD + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, 600, 0, 0) + EVT_CALL(SetPanTarget, CAM_DEFAULT, 600, 0, 0) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(1.5)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_END_THREAD + EVT_THREAD + EVT_WAIT(20) + EVT_CALL(SetNpcJumpscale, NPC_Bowser_Body, EVT_FLOAT(0.0)) + EVT_CALL(NpcJump0, NPC_Bowser_Body, 675, 0, 0, 10) + EVT_CALL(PlaySoundAtNpc, NPC_Bowser_Body, SOUND_20A0, 0) + EVT_END_THREAD + EVT_THREAD + EVT_WAIT(20) + EVT_CALL(SetNpcAnimation, NPC_Bowser_Body, ANIM_WorldBowser_Jump) + EVT_WAIT(5) + EVT_CALL(SetNpcAnimation, NPC_Bowser_Body, ANIM_WorldBowser_Land) + EVT_WAIT(5) + EVT_CALL(SetNpcAnimation, NPC_Bowser_Body, ANIM_WorldBowser_PostJump) + EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 20, EVT_FLOAT(2.0)) + EVT_CALL(SetNpcAnimation, NPC_Bowser_Body, ANIM_WorldBowser_Idle) + EVT_END_THREAD + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Scene_MarioConfrontsBowser) = { + EVT_IF_LT(GB_StoryProgress, STORY_CH8_OPENED_PATH_TO_STAR_WAY) + EVT_RETURN + EVT_END_IF + EVT_IF_EQ(GF_KKJ13_BowserTaunts, TRUE) + EVT_RETURN + EVT_END_IF + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(SetNpcPos, NPC_Bowser_Body, 725, 210, -25) + EVT_CALL(SetNpcPos, NPC_Bowser_Prop, 725, 210, -25) + EVT_EXEC(N(EVS_UpdatePropellerSounds)) + EVT_CALL(SpeakToPlayer, NPC_CaptivePeach, ANIM_Peach_C001C, ANIM_Peach_C001B, 0, MSG_CH8_006F) + EVT_CALL(EnableNpcShadow, NPC_Bowser_Body, FALSE) + EVT_CALL(SetCamType, CAM_DEFAULT, 1, FALSE) + EVT_SET(LVar0, 725) + EVT_SET(LVar1, 50) + EVT_SET(LVar2, -25) + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(4.0)) + EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(11.0), EVT_FLOAT(-2.5)) + EVT_CALL(SetCamDistance, CAM_DEFAULT, 600) + EVT_CALL(SetCamPosA, CAM_DEFAULT, EVT_FLOAT(85.0), EVT_FLOAT(-3.5)) + EVT_CALL(SetCamPosB, CAM_DEFAULT, EVT_FLOAT(210.0), EVT_FLOAT(240.0)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_WAIT(60) + EVT_CALL(EnableNpcShadow, NPC_Bowser_Body, TRUE) + EVT_THREAD + EVT_CALL(SetNpcJumpscale, NPC_Bowser_Body, EVT_FLOAT(0.0)) + EVT_CALL(NpcJump0, NPC_Bowser_Body, 725, 50, -25, 20) + EVT_END_THREAD + EVT_CALL(SetNpcJumpscale, NPC_Bowser_Prop, EVT_FLOAT(0.0)) + EVT_CALL(NpcJump0, NPC_Bowser_Prop, 725, 50, -25, 20) + EVT_WAIT(10) + EVT_CALL(GetNpcPos, NPC_Bowser_Body, 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(4.0)) + EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(20.0), EVT_FLOAT(-12.0)) + EVT_CALL(SetCamDistance, CAM_DEFAULT, 350) + EVT_CALL(SetCamPosA, CAM_DEFAULT, EVT_FLOAT(72.5), EVT_FLOAT(-25.0)) + EVT_CALL(SetCamPosB, CAM_DEFAULT, EVT_FLOAT(210.0), EVT_FLOAT(240.0)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_WAIT(10) + EVT_CALL(SpeakToPlayer, NPC_Bowser_Body, ANIM_WorldBowser_ClownCarTalk, ANIM_WorldBowser_ClownCarIdle, 0, MSG_CH8_0070) + EVT_WAIT(5) + EVT_CALL(GetNpcPos, NPC_CaptivePeach, 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(1.0)) + EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(15.0), EVT_FLOAT(-7.0)) + EVT_CALL(SetCamDistance, CAM_DEFAULT, 325) + EVT_CALL(SetCamPosA, CAM_DEFAULT, EVT_FLOAT(72.0), EVT_FLOAT(0.0)) + EVT_CALL(SetCamPosB, CAM_DEFAULT, EVT_FLOAT(170.0), EVT_FLOAT(240.0)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_WAIT(20) + EVT_CALL(SpeakToPlayer, NPC_CaptivePeach, ANIM_Peach_C001C, ANIM_Peach_C001B, 0, MSG_CH8_0071) + EVT_WAIT(20) + EVT_CALL(SetPlayerPos, 400, 0, -15) + EVT_CALL(PartnerIsFlying, LVar0) + EVT_IF_EQ(LVar0, FALSE) + EVT_CALL(SetNpcPos, NPC_PARTNER, 370, 20, -15) + EVT_ELSE + EVT_CALL(SetNpcPos, NPC_PARTNER, 370, 0, -15) + EVT_END_IF + EVT_CALL(ClearPartnerMoveHistory, NPC_PARTNER) + EVT_CALL(ResetCam, CAM_DEFAULT, EVT_FLOAT(90.0)) + EVT_EXEC_WAIT(N(EVS_MoveToBattlePositions)) + EVT_WAIT(50) + EVT_CALL(SpeakToPlayer, NPC_Bowser_Body, ANIM_WorldBowser_Talk, ANIM_WorldBowser_Idle, 0, MSG_CH8_0072) + EVT_WAIT(10) + EVT_CALL(SetNpcVar, NPC_Bowser_Body, 0, 1) + EVT_WAIT(10) + EVT_THREAD + EVT_CALL(PlayerMoveTo, 580, 0, 25) + EVT_END_THREAD + EVT_THREAD + EVT_CALL(SetNpcAnimation, NPC_Bowser_Body, ANIM_WorldBowser_Walk) + EVT_CALL(NpcMoveTo, NPC_Bowser_Body, 630, 0, 25) + EVT_CALL(SetNpcAnimation, NPC_Bowser_Body, ANIM_WorldBowser_Idle) + EVT_END_THREAD + EVT_CALL(DisablePlayerInput, FALSE) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcIdle_BowserAwaitBattle) = { + EVT_LABEL(0) + EVT_CALL(SetSelfVar, 0, 0) + EVT_LOOP(0) + EVT_CALL(GetSelfVar, 0, LVar0) + EVT_IF_NE(LVar0, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_WAIT(1) + EVT_END_LOOP + EVT_CALL(StartBossBattle, SONG_BOWSER_THEME) + EVT_GOTO(0) + EVT_RETURN + EVT_END +}; + +Vec3f N(ToWindowPath)[] = { + { 800.0, 50.0, 0.0 }, + { 780.0, 40.0, 0.0 }, + { 700.0, 20.0, 5.0 }, + { 620.0, 15.0, 15.0 }, + { 610.0, 25.0, 0.0 }, + { 595.0, 50.0, -15.0 }, +}; + +Vec3f N(ThroughWindowPath)[] = { + { 595.0, 50.0, -15.0 }, + { 595.0, 45.0, -150.0 }, + { 595.0, 35.0, -170.0 }, + { 595.0, 40.0, -190.0 }, +}; + +Vec3f N(UpAndAwayPath)[] = { + { 595.0, 40.0, -190.0 }, + { 595.0, 145.0, -185.0 }, + { 595.0, 250.0, -180.0 }, +}; + +EvtScript N(EVS_FlyBowserAndPeach) = { + EVT_LOOP(0) + EVT_CALL(GetNextPathPos) + EVT_CALL(SetNpcPos, NPC_Bowser_Body, LVar1, LVar2, LVar3) + EVT_CALL(SetNpcPos, NPC_Bowser_Prop, LVar1, LVar2, LVar3) + EVT_ADD(LVar1, 28) + EVT_ADD(LVar2, 40) + EVT_ADD(LVar3, -3) + EVT_CALL(SetNpcPos, NPC_CaptivePeach, LVar1, LVar2, LVar3) + EVT_WAIT(1) + EVT_IF_EQ(LVar0, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_BowserFliesAway) = { + EVT_CALL(SetNpcPos, NPC_Bowser_Body, 800, 0, 0) + EVT_CALL(SetNpcYaw, NPC_Bowser_Body, 270) + EVT_CALL(SetNpcPos, NPC_Bowser_Prop, 800, 0, 0) + EVT_CALL(SetNpcYaw, NPC_Bowser_Prop, 270) + EVT_CALL(SetNpcPos, NPC_CaptivePeach, 828, 90, -3) + EVT_EXEC(N(EVS_UpdatePropellerSounds)) + EVT_THREAD + EVT_WAIT(15) + EVT_CALL(SetPlayerAnimation, ANIM_Mario_1002B) + EVT_WAIT(20) + EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_CALL(InterpPlayerYaw, 0, 1) + EVT_END_THREAD + EVT_CALL(LoadPath, 25, EVT_PTR(N(ToWindowPath)), ARRAY_COUNT(N(ToWindowPath)), EASING_LINEAR) + EVT_EXEC_WAIT(N(EVS_FlyBowserAndPeach)) + EVT_CALL(SetNpcAnimation, NPC_Bowser_Body, ANIM_WorldBowser_ClownCarLaugh) + EVT_WAIT(40) + EVT_CALL(LoadPath, 25, EVT_PTR(N(ThroughWindowPath)), ARRAY_COUNT(N(ThroughWindowPath)), EASING_LINEAR) + EVT_EXEC_WAIT(N(EVS_FlyBowserAndPeach)) + EVT_CALL(SetNpcAnimation, NPC_Bowser_Body, ANIM_WorldBowser_ClownCarIdle) + EVT_WAIT(15) + EVT_CALL(LoadPath, 25, EVT_PTR(N(UpAndAwayPath)), ARRAY_COUNT(N(UpAndAwayPath)), EASING_LINEAR) + EVT_EXEC(N(EVS_FlyBowserAndPeach)) + EVT_WAIT(10) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Scene_BowserDefeated) = { + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(DisablePartnerAI, 1) + EVT_CALL(EnableGroup, MODEL_g153, FALSE) + EVT_CALL(SetPlayerPos, 525, 0, 0) + EVT_CALL(PartnerIsFlying, LVar0) + EVT_IF_EQ(LVar0, FALSE) + EVT_SET(LVar1, 10) + EVT_ELSE + EVT_SET(LVar1, 0) + EVT_END_IF + EVT_CALL(SetNpcPos, NPC_PARTNER, 490, LVar1, 0) + EVT_CALL(SetNpcYaw, NPC_PARTNER, 90) + EVT_CALL(SetNpcPos, NPC_Bowser_Body, 675, 0, 0) + EVT_CALL(AdjustCam, CAM_DEFAULT, EVT_FLOAT(90.0), 75, 450, EVT_FLOAT(17.0), EVT_FLOAT(-7.0)) + EVT_CALL(SetNpcAnimation, NPC_Bowser_Body, ANIM_WorldBowser_Tantrum) + EVT_WAIT(30) + EVT_CALL(SetNpcAnimation, NPC_Bowser_Body, ANIM_WorldBowser_Idle) + EVT_WAIT(10) + EVT_CALL(SpeakToPlayer, NPC_Bowser_Body, ANIM_WorldBowser_Talk, ANIM_WorldBowser_Idle, 0, MSG_CH8_0078) + EVT_WAIT(20) + EVT_CALL(InterpNpcYaw, NPC_Bowser_Body, 90, 1) + EVT_WAIT(10) + EVT_CALL(SetNpcAnimation, NPC_Bowser_Body, ANIM_WorldBowser_Walk) + EVT_CALL(NpcMoveTo, NPC_Bowser_Body, 800, 0, 20) + EVT_CALL(SetNpcAnimation, NPC_Bowser_Body, ANIM_WorldBowser_ClownCarIdle) + EVT_CALL(SetNpcAnimation, NPC_CaptivePeach, ANIM_Peach_C001E) + EVT_CALL(SpeakToPlayer, NPC_CaptivePeach, ANIM_Peach_C001C, ANIM_Peach_C001B, 0, MSG_CH8_0079) + EVT_CALL(EnablePartnerAI) + EVT_CALL(PlayerMoveTo, 580, 0, 10) + EVT_EXEC_WAIT(N(EVS_BowserFliesAway)) + EVT_WAIT(10) + EVT_CALL(SpeakToPlayer, NPC_Bowser_Body, ANIM_WorldBowser_Talk, ANIM_WorldBowser_Idle, 0, MSG_CH8_007A) + EVT_CALL(ResetCam, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_SET(GF_KKJ13_BowserTaunts, TRUE) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcDefeat_Bowser_Body) = { + EVT_CALL(GetBattleOutcome, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_EQ(OUTCOME_PLAYER_WON) + EVT_CALL(SetEncounterStatusFlags, ENCOUNTER_STATUS_FLAG_2, TRUE) + EVT_EXEC(N(EVS_Scene_BowserDefeated)) + EVT_CASE_EQ(OUTCOME_PLAYER_LOST) + EVT_CASE_EQ(OUTCOME_PLAYER_FLED) + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_Bowser_Body) = { + EVT_CALL(SetNpcPos, NPC_Bowser_Body, NPC_DISPOSE_LOCATION) + EVT_IF_EQ(GF_KKJ13_BowserTaunts, TRUE) + EVT_RETURN + EVT_END_IF + EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(EVS_NpcIdle_BowserAwaitBattle))) + EVT_CALL(BindNpcDefeat, NPC_SELF, EVT_PTR(N(EVS_NpcDefeat_Bowser_Body))) + EVT_CALL(SetNpcAnimation, NPC_Bowser_Body, ANIM_WorldBowser_ClownCarIdle) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_Bowser_Prop) = { + EVT_CALL(EnableNpcShadow, NPC_Bowser_Prop, FALSE) + EVT_CALL(SetNpcPos, NPC_Bowser_Prop, NPC_DISPOSE_LOCATION) + EVT_IF_EQ(GF_KKJ13_BowserTaunts, TRUE) + EVT_RETURN + EVT_END_IF + EVT_CALL(SetNpcAnimation, NPC_Bowser_Prop, ANIM_WorldBowser_ClownCarPropeller) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_CaptivePeach) = { + EVT_CALL(SetNpcPos, NPC_CaptivePeach, NPC_DISPOSE_LOCATION) + EVT_IF_EQ(GF_KKJ13_BowserTaunts, TRUE) + EVT_RETURN + EVT_END_IF + EVT_CALL(SetNpcPos, NPC_CaptivePeach, 775, 90, 0) + EVT_CALL(SetNpcAnimation, NPC_CaptivePeach, ANIM_Peach_C001C) + EVT_RETURN + EVT_END +}; + +AnimID N(ExtraAnims_Bowser)[] = { + ANIM_WorldBowser_Still, + ANIM_WorldBowser_Idle, + ANIM_WorldBowser_Walk, + ANIM_WorldBowser_Run, + ANIM_WorldBowser_Talk, + ANIM_WorldBowser_Jump, + ANIM_WorldBowser_Land, + ANIM_WorldBowser_PostJump, + ANIM_WorldBowser_ClownCarIdle, + ANIM_WorldBowser_Tantrum, + ANIM_WorldBowser_ClownCarTalk, + ANIM_WorldBowser_ClownCarLaugh, + ANIM_WorldBowser_ClownCarPropeller, + ANIM_LIST_END +}; + +NpcData N(NpcData_Bowser_Body) = { + .id = NPC_Bowser_Body, + .pos = { 0.0f, -500.0f, 0.0f }, + .yaw = 270, + .init = &N(EVS_NpcInit_Bowser_Body), + .settings = &N(NpcSettings_Bowser), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_NO_DROPS, + .drops = NO_DROPS, + .animations = BOWSER_ANIMS, + .extraAnimations = N(ExtraAnims_Bowser), +}; + +NpcData N(NpcData_Bowser_Prop) = { + .id = NPC_Bowser_Prop, + .pos = { 0.0f, -500.0f, 0.0f }, + .yaw = 270, + .init = &N(EVS_NpcInit_Bowser_Prop), + .settings = &N(NpcSettings_Dummy), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_NO_DROPS, + .drops = NO_DROPS, + .animations = BOWSER_ANIMS, + .extraAnimations = N(ExtraAnims_Bowser), +}; + +NpcData N(NpcData_CaptivePeach) = { + .id = NPC_CaptivePeach, + .pos = { 670.0f, 0.0f, -12.0f }, + .yaw = 270, + .init = &N(EVS_NpcInit_CaptivePeach), + .settings = &N(NpcSettings_Dummy), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_20000 | ENEMY_FLAG_40000 | ENEMY_FLAG_NO_DROPS, + .drops = NO_DROPS, + .animations = PEACH_ANIMS, +}; + +NpcGroupList N(ChapterNPCs) = { + NPC_GROUP(N(NpcData_Bowser_Body), BTL_KPA2_FORMATION_02), + NPC_GROUP(N(NpcData_Bowser_Prop), BTL_KPA2_FORMATION_02), + NPC_GROUP(N(NpcData_CaptivePeach)), + {} +}; diff --git a/src/world/area_kkj/kkj_13/kkj_13_4_npcs_intro.c b/src/world/area_kkj/kkj_13/kkj_13_4_npcs_intro.c new file mode 100644 index 0000000000..39309c416a --- /dev/null +++ b/src/world/area_kkj/kkj_13/kkj_13_4_npcs_intro.c @@ -0,0 +1,147 @@ +#include "kkj_13.h" + +#define NAME_SUFFIX _Intro + +#include "world/common/npc/Bowser.inc.c" +#include "world/common/npc/Dummy.inc.c" +#include "world/common/enemy/Kammy.inc.c" +#include "world/common/enemy/Koopatrol_Stationary.inc.c" +#include "world/common/npc/Peach.inc.c" + +EvtScript N(EVS_NpcIdle_BowserAwaitBattle) = { + EVT_CALL(SetSelfVar, 0, 1) + EVT_LOOP(0) + EVT_WAIT(1) + EVT_CALL(GetSelfVar, 0, LVar0) + EVT_IF_EQ(LVar0, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_CALL(ModifyGlobalOverrideFlags, 1, GLOBAL_OVERRIDES_20000) + EVT_CALL(StartBossBattle, SONG_BOWSER_THEME) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcDefeat_Bowser_Body) = { + EVT_CALL(SetSelfVar, 0, 1) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_Bowser_Body) = { + EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(EVS_NpcIdle_BowserAwaitBattle))) + EVT_CALL(BindNpcDefeat, NPC_SELF, EVT_PTR(N(EVS_NpcDefeat_Bowser_Body))) + EVT_RETURN + EVT_END +}; + +AnimID N(ExtraAnims_Bowser)[] = { + ANIM_WorldBowser_Still, + ANIM_WorldBowser_Idle, + ANIM_WorldBowser_BrandishIdle, + ANIM_WorldBowser_Walk, + ANIM_WorldBowser_Run, + ANIM_WorldBowser_Talk, + ANIM_WorldBowser_TalkEyesClosed, + ANIM_WorldBowser_BrandishTalk, + ANIM_WorldBowser_RearUpTalk, + ANIM_WorldBowser_RearUpLaugh, + ANIM_WorldBowser_Brandish, + ANIM_WorldBowser_RearUpMock, + ANIM_WorldBowser_PostJump, + ANIM_WorldBowser_ClownCarStill, + ANIM_WorldBowser_ClownCarIdle, + ANIM_WorldBowser_ClownCarPropeller, + ANIM_LIST_END +}; + +AnimID N(ExtraAnims_Kammy)[] = { + ANIM_WorldKammy_Anim01, + ANIM_WorldKammy_Anim02, + ANIM_WorldKammy_Anim04, + ANIM_WorldKammy_Anim09, + ANIM_WorldKammy_Anim0A, + ANIM_WorldKammy_Anim0B, + ANIM_LIST_END +}; + +AnimID N(ExtraAnims_Koopatrol)[] = { + ANIM_WorldKoopatrol_Anim00, + ANIM_WorldKoopatrol_Anim01, + ANIM_WorldKoopatrol_Anim04, + ANIM_WorldKoopatrol_Anim06, + ANIM_LIST_END +}; + +NpcData N(NpcData_Bowser) = { + .id = NPC_Bowser_Body, + .pos = { 0.0f, -500.0f, 0.0f }, + .yaw = 270, + .init = &N(EVS_NpcInit_Bowser_Body), + .settings = &N(NpcSettings_Bowser), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_NO_DROPS, + .drops = NO_DROPS, + .animations = BOWSER_ANIMS, + .extraAnimations = N(ExtraAnims_Bowser), +}; + +NpcData N(NpcData_Characters)[] = { + { + .id = NPC_Bowser_Prop, + .pos = { 0.0f, -500.0f, 0.0f }, + .yaw = 270, + .settings = &N(NpcSettings_Dummy), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = NO_DROPS, + .animations = BOWSER_ANIMS, + .extraAnimations = N(ExtraAnims_Bowser), + }, + { + .id = NPC_Koopatrol_01, + .pos = { 0.0f, -500.0f, 0.0f }, + .yaw = 0, + .settings = &N(NpcSettings_Koopatrol_Stationary), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = NO_DROPS, + .animations = KOOPATROL_ANIMS, + .extraAnimations = N(ExtraAnims_Koopatrol), + }, + { + .id = NPC_Koopatrol_02, + .pos = { 0.0f, -500.0f, 0.0f }, + .yaw = 0, + .settings = &N(NpcSettings_Koopatrol_Stationary), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = NO_DROPS, + .animations = KOOPATROL_ANIMS, + .extraAnimations = N(ExtraAnims_Koopatrol), + }, + { + .id = NPC_Kammy, + .pos = { 0.0f, -500.0f, 0.0f }, + .yaw = 270, + .settings = &N(NpcSettings_Kammy), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = NO_DROPS, + .animations = KAMMY_ANIMS, + .extraAnimations = N(ExtraAnims_Kammy), + }, + { + .id = NPC_Peach, + .pos = { 670.0f, 0.0f, -12.0f }, + .yaw = 270, + .settings = &N(NpcSettings_Peach), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_20000, + .drops = NO_DROPS, + .animations = PEACH_ANIMS, + }, +}; + +#define NAME_SUFFIX + +NpcGroupList N(IntroNPCs) = { + NPC_GROUP(N(NpcData_Bowser_Intro), BTL_KPA2_FORMATION_01), + NPC_GROUP(N(NpcData_Characters_Intro)), + {} +}; diff --git a/src/world/area_kkj/kkj_13/kkj_13_5_intro_scenes.c b/src/world/area_kkj/kkj_13/kkj_13_5_intro_scenes.c new file mode 100644 index 0000000000..4efc36cbd3 --- /dev/null +++ b/src/world/area_kkj/kkj_13/kkj_13_5_intro_scenes.c @@ -0,0 +1,506 @@ +#include "kkj_13.h" +#include "effects.h" +#include "sprite.h" + +API_CALLABLE(N(UpdatePropellerSoundPos_Intro)) { + Npc* npc = get_npc_safe(NPC_Bowser_Prop); + f32 x = npc->pos.x; + f32 y = npc->pos.y; + f32 z = npc->pos.z; + + sfx_adjust_env_sound_pos(SOUND_23D, SOUND_SPACE_MODE_0, x, y, z); + script->varTable[0] = y; + + return ApiStatus_DONE2; +} + +EvtScript N(EVS_UpdatePropellerSounds_Intro) = { + EVT_CALL(PlaySoundAtNpc, NPC_Bowser_Prop, SOUND_80000066, 0) + EVT_LOOP(0) + EVT_CALL(N(UpdatePropellerSoundPos_Intro)) + EVT_IF_LT(LVar0, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_WAIT(1) + EVT_END_LOOP + EVT_CALL(StopSound, SOUND_80000066) + EVT_RETURN + EVT_END +}; + +API_CALLABLE(N(ScreenWhiteFlashOn)) { + if (isInitialCall) { + script->functionTemp[1] = 0; + } + + script->functionTemp[1] += 64; + + if (script->functionTemp[1] > 255) { + script->functionTemp[1] = 255; + } + + set_screen_overlay_color(0, 160, 160, 160); + set_screen_overlay_params_front(1, script->functionTemp[1]); + + if (script->functionTemp[1] == 255) { + return ApiStatus_DONE2; + } + + return ApiStatus_BLOCK; +} + +API_CALLABLE(N(ScreenWhiteFlashOff)) { + if (isInitialCall) { + script->functionTemp[1] = 255; + } + + script->functionTemp[1] -= 64; + + if (script->functionTemp[1] <= 0) { + script->functionTemp[1] = 0; + } + + set_screen_overlay_color(0, 160, 160, 160); + set_screen_overlay_params_front(1, script->functionTemp[1]); + + if (script->functionTemp[1] == 0) { + return ApiStatus_DONE2; + } + + return ApiStatus_BLOCK; +} + +typedef struct GlassShardPosition { + /* 0x00 */ s16 radius; + /* 0x02 */ s16 angle; +} GlassShardPosition; // size = 0x4 + +GlassShardPosition N(GlassPositions)[] = { + { .radius = 5, .angle = 0 }, + { .radius = 5, .angle = 90 }, + { .radius = 5, .angle = 180 }, + { .radius = 5, .angle = 270 }, + { .radius = 10, .angle = 30 }, + { .radius = 10, .angle = 90 }, + { .radius = 10, .angle = 150 }, + { .radius = 10, .angle = 210 }, + { .radius = 10, .angle = 270 }, + { .radius = 10, .angle = 330 }, + { .radius = 20, .angle = 0 }, + { .radius = 20, .angle = 60 }, + { .radius = 20, .angle = 120 }, + { .radius = 20, .angle = 180 }, + { .radius = 20, .angle = 240 }, + { .radius = 20, .angle = 300 }, + { .radius = 30, .angle = 15 }, + { .radius = 30, .angle = 45 }, + { .radius = 30, .angle = 75 }, + { .radius = 30, .angle = 105 }, + { .radius = 30, .angle = 135 }, + { .radius = 30, .angle = 165 }, + { .radius = 30, .angle = 195 }, + { .radius = 30, .angle = 225 }, + { .radius = 30, .angle = 255 }, + { .radius = 30, .angle = 285 }, + { .radius = 30, .angle = 315 }, + { .radius = 30, .angle = 345 }, +}; + +API_CALLABLE(N(ShatterWindow)) { + EffectInstance* effect; + f32 radius; + f32 x, y; + s32 type; + f32 posX; + f32 posY; + s32 i; + + for (i = 0; i < ARRAY_COUNT(N(GlassPositions)); i++) { + type = (i & 1) + 2; + radius = N(GlassPositions)[i].radius; + x = (radius * cos_deg(N(GlassPositions)[i].angle)) * 1.3; + y = (radius * sin_deg(N(GlassPositions)[i].angle)) * 1.5; + posX = x + 600.0f; + posY = y + 100.0f; + x *= 0.1; + y *= 0.1; + x += cos_deg(radius * 15.0f) * 5.0f; + effect = fx_ice_shard(type, posX, posY, -150.0f, ((i & 3) * 0.4) + 1.0, ((i & 3) * 4) + 30); + effect->data.iceShard->animFrame = 0; + effect->data.iceShard->animRate = (rand_int(10) * 0.2) + 0.1; + effect->data.iceShard->rotation = 35 * i; + effect->data.iceShard->angularVel = rand_int(10) - 5; + effect->data.iceShard->vel.x = x; + effect->data.iceShard->vel.y = y; + effect->data.iceShard->vel.z = 2.0f; + effect->data.iceShard->gravAccel = -0.1f; + } + return ApiStatus_DONE2; +} + +Vec3f N(FlyThroughWindowPath)[] = { + { 450.0, 150.0, -300.0 }, + { 550.0, 105.0, -180.0 }, + { 650.0, 60.0, -75.0 }, + { 850.0, 90.0, 0.0 }, +}; + +Vec3f N(PlayerThrownPath)[] = { + { 660.0, 0.0, 15.0 }, + { 634.0, 60.0, -83.0 }, + { 608.0, 80.0, -150.0 }, + { 582.0, 60.0, -233.0 }, + { 556.0, 0.0, -315.0 }, + { 530.0, -60.0, -398.0 }, +}; + +EvtScript N(EVS_FocusCam_Everyone) = { + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, 720, 0, 0) + EVT_CALL(SetPanTarget, CAM_DEFAULT, 720, 0, 0) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, LVar0) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_FocusCam_OnPeach) = { + EVT_CALL(GetNpcPos, NPC_Peach, LVar0, LVar1, LVar2) + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_CALL(SetCamDistance, CAM_DEFAULT, EVT_FLOAT(300.0)) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(90.0)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_FocusCam_OnBowser) = { + EVT_CALL(GetNpcPos, NPC_Bowser_Body, LVar1, LVar2, LVar3) + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, LVar1, LVar2, LVar3) + EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar1, LVar2, LVar3) + EVT_CALL(SetCamDistance, CAM_DEFAULT, EVT_FLOAT(300.0)) + EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(17.0), EVT_FLOAT(-11.0)) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, LVar0) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Scene_BowserAttacks) = { + EVT_CALL(SetMusicTrack, 0, SONG_BOWSER_ATTACKS, 0, 8) + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(SetNpcPos, NPC_Peach, 680, 0, -15) + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, 600, 0, -15) + EVT_CALL(SetPanTarget, CAM_DEFAULT, 600, 0, -15) + EVT_CALL(SetCamDistance, CAM_DEFAULT, EVT_FLOAT(300.0)) + EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(17.0), EVT_FLOAT(-10.0)) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(90.0)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_THREAD + EVT_CALL(PlaySound, SOUND_80000056) + EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 30, EVT_FLOAT(1.0)) + EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 30, EVT_FLOAT(0.5)) + EVT_CALL(PlaySound, SOUND_33 | SOUND_ID_TRIGGER_CHANGE_SOUND) + EVT_CALL(func_802D62E4, SOUND_33) + EVT_END_THREAD + EVT_THREAD + EVT_CALL(SetPlayerJumpscale, 0) + EVT_LOOP(2) + EVT_CALL(InterpPlayerYaw, 270, 0) + EVT_CALL(PlayerJump1, 550, 0, 0, 20) + EVT_CALL(InterpPlayerYaw, 90, 0) + EVT_CALL(PlayerJump1, 630, 0, 0, 20) + EVT_END_LOOP + EVT_CALL(PlayerMoveTo, 550, 0, 30) + EVT_CALL(PlayerMoveTo, 575, 0, 30) + EVT_CALL(InterpPlayerYaw, 90, 7) + EVT_END_THREAD + EVT_THREAD + EVT_LOOP(2) + EVT_CALL(SetPlayerAnimation, ANIM_Mario_60003) + EVT_WAIT(15) + EVT_CALL(SetPlayerAnimation, ANIM_Mario_Running) + EVT_WAIT(15) + EVT_END_LOOP + EVT_END_THREAD + EVT_THREAD + EVT_CALL(SetNpcAnimation, NPC_Peach, ANIM_Peach_A0004) + EVT_LOOP(2) + EVT_CALL(NpcMoveTo, NPC_Peach, 600, -2, 20) + EVT_CALL(NpcMoveTo, NPC_Peach, 680, -2, 20) + EVT_END_LOOP + EVT_CALL(SetNpcAnimation, NPC_Peach, ANIM_Peach_A0002) + EVT_CALL(NpcMoveTo, NPC_Peach, 600, -2, 30) + EVT_CALL(NpcMoveTo, NPC_Peach, 625, -2, 30) + EVT_CALL(SetNpcAnimation, NPC_Peach, ANIM_Peach_A0001) + EVT_CALL(InterpNpcYaw, NPC_Peach, 270, 7) + EVT_END_THREAD + EVT_WAIT(160) + EVT_CALL(SetNpcAnimation, NPC_Peach, ANIM_Peach_C0000) + EVT_WAIT(10) + EVT_CALL(SetNpcAnimation, NPC_Peach, ANIM_Peach_C0026) + EVT_CALL(SpeakToPlayer, NPC_Peach, ANIM_Peach_C0001,ANIM_Peach_C0026, 0, MSG_Intro_004E) + EVT_CALL(SetNpcAnimation, NPC_Peach, ANIM_Peach_C0002) + EVT_WAIT(10) + EVT_CALL(SetNpcAnimation, NPC_Peach, ANIM_Peach_A0001) + EVT_WAIT(10) + EVT_CALL(SetNpcAnimation, NPC_Peach, SPRITE_ID_BACK_FACING | ANIM_Peach_A0001) + EVT_WAIT(20) + EVT_CALL(GetNpcPos, NPC_Peach, LVar0, LVar1, LVar2) + EVT_CALL(NpcJump0, NPC_Peach, LVar0, LVar1, LVar2, 10) + EVT_WAIT(10) + EVT_CALL(InterpPlayerYaw, 0, 7) + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, 600, 0, -15) + EVT_CALL(SetPanTarget, CAM_DEFAULT, 600, 0, -15) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(5.0)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_CALL(SpeakToPlayer, NPC_Peach, SPRITE_ID_BACK_FACING | ANIM_Peach_A0001, SPRITE_ID_BACK_FACING | ANIM_Peach_A0001, 5, MSG_Intro_004F) + EVT_WAIT(30) + EVT_THREAD + EVT_CALL(SetNpcAnimation, NPC_Bowser_Body, ANIM_WorldBowser_ClownCarIdle) + EVT_CALL(SetNpcAnimation, NPC_Bowser_Prop, ANIM_WorldBowser_ClownCarPropeller) + EVT_CALL(SetNpcYaw, NPC_Bowser_Body, 90) + EVT_CALL(SetNpcYaw, NPC_Bowser_Prop, 90) + EVT_EXEC(N(EVS_UpdatePropellerSounds_Intro)) + EVT_CALL(LoadPath, 50, EVT_PTR(N(FlyThroughWindowPath)), ARRAY_COUNT(N(FlyThroughWindowPath)), EASING_LINEAR) + EVT_LOOP(0) + EVT_CALL(GetNextPathPos) + EVT_CALL(SetNpcPos, NPC_Bowser_Body, LVar1, LVar2, LVar3) + EVT_CALL(SetNpcPos, NPC_Bowser_Prop, LVar1, LVar2, LVar3) + EVT_WAIT(1) + EVT_IF_EQ(LVar0, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_CALL(SetNpcAnimation, NPC_Bowser_Body, ANIM_WorldBowser_Idle) + EVT_CALL(SetNpcPos, NPC_Bowser_Body, 820, 20, 0) + EVT_CALL(SetNpcYaw, NPC_Bowser_Body, 270) + EVT_END_THREAD + EVT_THREAD + EVT_CALL(SetNpcAnimation, NPC_Kammy, ANIM_WorldKammy_Anim0B) + EVT_CALL(SetNpcYaw, NPC_Kammy, 90) + EVT_WAIT(10) + EVT_CALL(LoadPath, 50, EVT_PTR(N(FlyThroughWindowPath)), ARRAY_COUNT(N(FlyThroughWindowPath)), EASING_LINEAR) + EVT_LOOP(0) + EVT_CALL(GetNextPathPos) + EVT_CALL(SetNpcPos, NPC_Kammy, LVar1, LVar2, LVar3) + EVT_WAIT(1) + EVT_IF_EQ(LVar0, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_CALL(SetNpcAnimation, NPC_Kammy, ANIM_WorldKammy_Anim01) + EVT_CALL(SetNpcPos, NPC_Kammy, 920, 0, 0) + EVT_CALL(SetNpcYaw, NPC_Kammy, 270) + EVT_END_THREAD + EVT_THREAD + EVT_WAIT(20) + EVT_CALL(N(ScreenWhiteFlashOn)) + EVT_CALL(EnableGroup, MODEL_g133, FALSE) + EVT_CALL(EnableGroup, MODEL_g147, FALSE) + EVT_CALL(EnableGroup, MODEL_g152, TRUE) + EVT_CALL(EnableGroup, MODEL_g154, TRUE) + EVT_CALL(PlaySoundAt, SOUND_2097, 0, 600, 60, -150) + EVT_PLAY_EFFECT(EFFECT_SPARKLES, 0, 600, 60, -150, 120) + EVT_CALL(N(ShatterWindow)) + EVT_WAIT(1) + EVT_CALL(N(ScreenWhiteFlashOff)) + EVT_END_THREAD + EVT_THREAD + EVT_WAIT(20) + EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 10, EVT_FLOAT(2.0)) + EVT_END_THREAD + EVT_LOOP(70) + EVT_WAIT(1) + EVT_CALL(PlayerFaceNpc, NPC_Bowser_Body, FALSE) + EVT_CALL(NpcFaceNpc, NPC_Peach, NPC_Bowser_Body, 0) + EVT_END_LOOP + EVT_CALL(SetNpcAnimation, NPC_Peach, ANIM_Peach_A0001) + EVT_WAIT(30) + EVT_CALL(SetNpcPos, NPC_Bowser_Prop, NPC_DISPOSE_LOCATION) + EVT_CALL(SetMusicTrack, 0, SONG_BOWSER_THEME, 0, 8) + EVT_THREAD + EVT_WAIT(5) + EVT_CALL(SetNpcJumpscale, NPC_Bowser_Body, EVT_FLOAT(0.0)) + EVT_CALL(NpcJump0, NPC_Bowser_Body, 810, 0, 0, 5) + EVT_CALL(PlaySoundAtNpc, NPC_Bowser_Body, SOUND_20A0, 0) + EVT_CALL(SetNpcAnimation, NPC_Bowser_Body, ANIM_WorldBowser_PostJump) + EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 20, EVT_FLOAT(2.0)) + EVT_CALL(SetNpcAnimation, NPC_Bowser_Body, ANIM_WorldBowser_Idle) + EVT_END_THREAD + EVT_CALL(SetPanTarget, CAM_DEFAULT, 740, 0, 0) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(2.0)) + EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_WAIT(30) + EVT_THREAD + EVT_CALL(SetNpcAnimation, NPC_Kammy, ANIM_WorldKammy_Anim02) + EVT_CALL(NpcMoveTo, NPC_Kammy, 880, 0, 20) + EVT_CALL(SetNpcAnimation, NPC_Kammy, ANIM_WorldKammy_Anim01) + EVT_END_THREAD + EVT_CALL(SpeakToNpc, NPC_Bowser_Body, ANIM_WorldBowser_Talk, ANIM_WorldBowser_Idle, 0, NPC_Peach, MSG_Intro_0050) + EVT_CALL(SetPanTarget, CAM_DEFAULT, 625, 0, -15) + EVT_CALL(SetCamDistance, CAM_DEFAULT, EVT_FLOAT(300.0)) + EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(17.0), EVT_FLOAT(-11.0)) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(90.0)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_CALL(SpeakToNpc, NPC_Peach, ANIM_Peach_C0007, ANIM_Peach_C0008, 0, NPC_Bowser_Body, MSG_Intro_0051) + EVT_SET(LVar0, EVT_FLOAT(1.0)) + EVT_EXEC_WAIT(N(EVS_FocusCam_OnBowser)) + EVT_CALL(SpeakToNpc, NPC_Bowser_Body, ANIM_WorldBowser_TalkEyesClosed, ANIM_WorldBowser_Idle, 0, NPC_Peach, MSG_Intro_0052) + EVT_THREAD + EVT_CALL(SetNpcAnimation, NPC_Bowser_Body, ANIM_WorldBowser_Walk) + EVT_CALL(NpcMoveTo, NPC_Bowser_Body, 770, 0, 30) + EVT_CALL(SetNpcAnimation, NPC_Bowser_Body, ANIM_WorldBowser_Idle) + EVT_END_THREAD + EVT_THREAD + EVT_CALL(SetNpcAnimation, NPC_Kammy, ANIM_WorldKammy_Anim02) + EVT_CALL(NpcMoveTo, NPC_Kammy, 840, 0, 30) + EVT_CALL(SetNpcAnimation, NPC_Kammy, ANIM_WorldKammy_Anim01) + EVT_END_THREAD + EVT_WAIT(5) + EVT_SET(LVar0, EVT_FLOAT(90.0)) + EVT_EXEC_WAIT(N(EVS_FocusCam_Everyone)) + EVT_WAIT(5) + EVT_CALL(PlayerMoveTo, 660, 0, 15) + EVT_CALL(SetPlayerAnimation, ANIM_Mario_BeforeJump) + EVT_WAIT(15) + EVT_CALL(SpeakToPlayer, NPC_Bowser_Body, ANIM_WorldBowser_Talk, ANIM_WorldBowser_Idle, 0, MSG_Intro_0053) + EVT_CALL(SpeakToPlayer, NPC_Peach, ANIM_Peach_C0013, ANIM_Peach_C0012, 5, MSG_Intro_0054) + EVT_WAIT(10) + EVT_CALL(SetNpcAnimation, NPC_Bowser_Body, ANIM_WorldBowser_RearUpLaugh) + EVT_CALL(SpeakToPlayer, NPC_Bowser_Body, ANIM_WorldBowser_RearUpLaugh, ANIM_WorldBowser_RearUpLaugh, 0, MSG_Intro_0055) + EVT_SET(LVar0, EVT_FLOAT(90.0)) + EVT_EXEC_WAIT(N(EVS_FocusCam_OnBowser)) + EVT_CALL(SpeakToPlayer, NPC_Bowser_Body, ANIM_WorldBowser_RearUpTalk, ANIM_WorldBowser_RearUpTalk, 0, MSG_Intro_0056) + EVT_SET(LVar0, EVT_FLOAT(5.0)) + EVT_EXEC_WAIT(N(EVS_FocusCam_Everyone)) + EVT_CALL(SetNpcVar, NPC_Bowser_Body, 0, 0) + EVT_WAIT(5) + EVT_CALL(PlayerMoveTo, 695, 0, 10) + EVT_CALL(SetPlayerJumpscale, EVT_FLOAT(0.75)) + EVT_CALL(PlayerJump, 720, 80, 0, 20) + EVT_CALL(DisablePlayerPhysics, TRUE) + EVT_LOOP(0) + EVT_WAIT(1) + EVT_CALL(GetNpcVar, NPC_Bowser_Body, 0, LVar0) + EVT_IF_EQ(LVar0, 1) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_CALL(SetPlayerActionState, ACTION_STATE_LAND) + EVT_CALL(SetPlayerPos, 660, 0, 15) + EVT_WAIT(1) + EVT_CALL(SetPlayerAnimation, ANIM_Mario_FallDown) + EVT_CALL(SetNpcAnimation, NPC_Peach, ANIM_Peach_C0006) + EVT_CALL(SetNpcAnimation, NPC_Bowser_Body, ANIM_WorldBowser_RearUpLaugh) + EVT_EXEC_WAIT(N(EVS_FocusCam_OnPeach)) + EVT_WAIT(10) + EVT_CALL(SpeakToPlayer, NPC_Peach, ANIM_Peach_C0006, ANIM_Peach_C0006, 5, MSG_Intro_005D) + EVT_WAIT(10) + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, 790, 0, 0) + EVT_CALL(SetPanTarget, CAM_DEFAULT, 790, 0, 0) + EVT_CALL(SetCamDistance, CAM_DEFAULT, EVT_FLOAT(300.0)) + EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(17.0), EVT_FLOAT(-11.0)) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(90.0)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_WAIT(10) + EVT_CALL(SpeakToPlayer, NPC_Bowser_Body, ANIM_WorldBowser_RearUpLaugh, ANIM_WorldBowser_RearUpLaugh, 5, MSG_Intro_005E) + EVT_WAIT(10) + EVT_CALL(SpeakToPlayer, NPC_Kammy, ANIM_WorldKammy_Anim04, ANIM_WorldKammy_Anim01, 5, MSG_Intro_005F) + EVT_CALL(SetNpcAnimation, NPC_Bowser_Body, ANIM_WorldBowser_Idle) + EVT_CALL(InterpNpcYaw, NPC_Bowser_Body, 90, 5) + EVT_WAIT(10) + EVT_CALL(SetNpcAnimation, NPC_Bowser_Body, ANIM_WorldBowser_Brandish) + EVT_WAIT(20) + EVT_CALL(SetNpcAnimation, NPC_Bowser_Body, ANIM_WorldBowser_BrandishIdle) + EVT_CALL(SpeakToNpc, NPC_Bowser_Body, ANIM_WorldBowser_BrandishTalk, ANIM_WorldBowser_BrandishIdle, 0, NPC_Kammy, MSG_Intro_0060) + EVT_WAIT(10) + EVT_SET(LVar0, EVT_FLOAT(90.0)) + EVT_EXEC_WAIT(N(EVS_FocusCam_Everyone)) + EVT_CALL(SetNpcAnimation, NPC_Bowser_Body, ANIM_WorldBowser_Idle) + EVT_CALL(InterpNpcYaw, NPC_Bowser_Body, 270, 10) + EVT_WAIT(20) + EVT_CALL(SpeakToPlayer, NPC_Bowser_Body, ANIM_WorldBowser_Talk, ANIM_WorldBowser_Idle, 5, MSG_Intro_0061) + EVT_CALL(SetNpcAnimation, NPC_Bowser_Body, ANIM_WorldBowser_Brandish) + EVT_WAIT(10) + EVT_CALL(FadeOutMusic, 0, 500) + EVT_CALL(PlaySoundAtNpc, NPC_Bowser_Body, SOUND_2121, 0) + EVT_PLAY_EFFECT(EFFECT_GATHER_ENERGY_PINK, 0, 780, 95, 27, 1, 30) + EVT_WAIT(40) + EVT_THREAD + EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 10, EVT_FLOAT(4.0)) + EVT_END_THREAD + EVT_CALL(PlaySoundAtPlayer, SOUND_2127, 0) + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_ADD(LVar2, 5) + EVT_PLAY_EFFECT(EFFECT_LIGHTNING, 4, LVar0, LVar1, LVar2, 0, 0) + EVT_THREAD + EVT_CALL(PlaySoundAtPlayer, SOUND_390, 0) + EVT_CALL(SetPlayerAnimation, ANIM_Mario_FallBack) + EVT_CALL(LoadPath, 30, EVT_PTR(N(PlayerThrownPath)), ARRAY_COUNT(N(PlayerThrownPath)), EASING_LINEAR) + EVT_SET(LVar4, 0) + EVT_LOOP(0) + EVT_CALL(GetNextPathPos) + EVT_CALL(SetPlayerPos, LVar1, LVar2, LVar3) + EVT_ADD(LVar4, 45) + EVT_CALL(InterpPlayerYaw, LVar4, 0) + EVT_WAIT(1) + EVT_IF_EQ(LVar0, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_END_THREAD + EVT_WAIT(30) + EVT_CALL(GotoMap, EVT_PTR("osr_03"), osr_03_ENTRY_2) + EVT_WAIT(100) + EVT_CALL(DisablePlayerPhysics, FALSE) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Scene_PeachCaptured) = { + EVT_CALL(FadeOutMusic, 0, 500) + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(SetNpcAnimation, NPC_Peach, SPRITE_ID_BACK_FACING | ANIM_Peach_A0001) + EVT_CALL(SetNpcYaw, NPC_Peach, 315) + EVT_CALL(SetNpcPos, NPC_Peach, 613, 0, -90) + EVT_CALL(SetNpcAnimation, NPC_Bowser_Body, ANIM_WorldBowser_RearUpLaugh) + EVT_CALL(SetNpcPos, NPC_Bowser_Body, 750, 0, 0) + EVT_CALL(SetNpcAnimation, NPC_Kammy, ANIM_WorldKammy_Anim01) + EVT_CALL(SetNpcPos, NPC_Kammy, 820, 0, 0) + EVT_SET(LVar0, EVT_FLOAT(90.0)) + EVT_EXEC_WAIT(N(EVS_FocusCam_Everyone)) + EVT_CALL(SetNpcSpeed, NPC_Peach, EVT_FLOAT(3.0)) + EVT_CALL(NpcMoveTo, NPC_Peach, 570, -130, 0) + EVT_CALL(SpeakToPlayer, NPC_Peach, SPRITE_ID_BACK_FACING | ANIM_Peach_A0001, SPRITE_ID_BACK_FACING | ANIM_Peach_A0001, 5, MSG_Intro_0062) + EVT_WAIT(10) + EVT_CALL(InterpNpcYaw, NPC_Kammy, 90, 0) + EVT_WAIT(10) + EVT_CALL(SetNpcAnimation, NPC_Kammy, ANIM_WorldKammy_Anim04) + EVT_WAIT(30) + EVT_CALL(SetNpcAnimation, NPC_Kammy, ANIM_WorldKammy_Anim01) + EVT_THREAD + EVT_CALL(SetNpcAnimation, NPC_CaptivePeach, ANIM_WorldKoopatrol_Anim06) + EVT_CALL(SetNpcPos, NPC_CaptivePeach, 900, 0, 30) + EVT_CALL(SetNpcSpeed, NPC_CaptivePeach, EVT_FLOAT(4.0)) + EVT_CALL(NpcMoveTo, NPC_CaptivePeach, 660, 30, 0) + EVT_END_THREAD + EVT_THREAD + EVT_CALL(SetNpcAnimation, NPC_Koopatrol_02, ANIM_WorldKoopatrol_Anim06) + EVT_CALL(SetNpcPos, NPC_Koopatrol_02, 940, 0, 30) + EVT_CALL(SetNpcSpeed, NPC_Koopatrol_02, EVT_FLOAT(4.0)) + EVT_CALL(NpcMoveTo, NPC_Koopatrol_02, 700, 30, 0) + EVT_END_THREAD + EVT_WAIT(30) + EVT_CALL(InterpNpcYaw, NPC_Kammy, 270, 0) + EVT_CALL(GotoMap, EVT_PTR("hos_10"), hos_10_ENTRY_5) + EVT_WAIT(100) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_kkj/kkj_14/ADAEA0.c b/src/world/area_kkj/kkj_14/ADAEA0.c deleted file mode 100644 index 37d6d544ec..0000000000 --- a/src/world/area_kkj/kkj_14/ADAEA0.c +++ /dev/null @@ -1,10 +0,0 @@ -#include "kkj_14.h" - -ApiStatus func_80240000_ADAEA0(Evt* script, s32 isInitialCall) { - if (evt_get_variable(NULL, GB_StoryProgress) == -128) { - sprintf(wMapBgName, "nok_bg"); - } - return ApiStatus_BLOCK; -} - -static char* N(exit_str_0) = "pra_01\0\0kkj_11\0\0kkj_01\0\0kkj_26\0\0kkj_15\0\0kkj_27\0\0kkj_26"; diff --git a/src/world/area_kkj/kkj_14/ADAEF0.c b/src/world/area_kkj/kkj_14/ADAEF0.c deleted file mode 100644 index 39480b8bc6..0000000000 --- a/src/world/area_kkj/kkj_14/ADAEF0.c +++ /dev/null @@ -1,44 +0,0 @@ -#include "kkj_14.h" - -extern s32 D_80241D38_ADCBD8; -extern u8 D_80241D3B_ADCBDB; - -#include "world/common/atomic/TexturePan.inc.c" - -ApiStatus func_8024035C_ADB1FC(Evt* script, s32 isInitialCall) { - gGameStatusPtr->peachFlags &= ~PEACH_STATUS_FLAG_IS_PEACH; - gPlayerData.currentPartner = script->varTable[0]; - - return ApiStatus_DONE2; -} - -ApiStatus func_80240384_ADB224(Evt* script, s32 isInitialCall) { - gGameStatusPtr->peachFlags |= PEACH_STATUS_FLAG_HAS_PARASOL; - return ApiStatus_DONE2; -} - -#include "world/common/todo/GetPeachDisguise.inc.c" - -ApiStatus func_802403CC_ADB26C(Evt* script, s32 isInitialCall) { - Bytecode* args = script->ptrReadPos; - - D_80241D38_ADCBD8 = evt_get_variable(script, *args++); - return ApiStatus_DONE2; -} - -void func_802403F8_ADB298(void) { - gDPSetCycleType(gMasterGfxPos++, G_CYC_2CYCLE); - gDPSetRenderMode(gMasterGfxPos++, G_RM_PASS, G_RM_AA_ZB_XLU_SURF2); - gDPSetCombineLERP(gMasterGfxPos++, TEXEL0, 0, TEXEL1, 0, TEXEL0, 0, TEXEL1, 0, 0, 0, 0, COMBINED, 0, 0, 0, PRIMITIVE); - gDPSetPrimColor(gMasterGfxPos++, 0, 0, 0, 0, 0, D_80241D3B_ADCBDB); -} - -ApiStatus func_80240480_ADB320(Evt* script, s32 isInitialCall) { - gGameStatusPtr->peachFlags |= PEACH_STATUS_FLAG_HAS_INGREDIENT; - return ApiStatus_DONE2; -} - -ApiStatus func_8024049C_ADB33C(Evt* script, s32 isInitialCall) { - gGameStatusPtr->peachFlags &= ~PEACH_STATUS_FLAG_HAS_INGREDIENT; - return ApiStatus_DONE2; -} diff --git a/src/world/area_kkj/kkj_14/kkj_14.h b/src/world/area_kkj/kkj_14/kkj_14.h index e06b31a755..56765ea39f 100644 --- a/src/world/area_kkj/kkj_14/kkj_14.h +++ b/src/world/area_kkj/kkj_14/kkj_14.h @@ -2,8 +2,49 @@ /// @brief Peach's Castle - Peach's Room (2F) #include "common.h" -#include "../kkj.h" #include "message_ids.h" #include "map.h" +#include "../kkj.h" +#include "mapfs/kkj_14_shape.h" +#include "mapfs/kkj_14_hit.h" + +#include "sprite/npc/Twink.h" +#include "sprite/npc/WorldKoopatrol.h" +#include "sprite/npc/WorldBowser.h" +#include "sprite/npc/WorldKammy.h" + +enum { + // chapter 2/4 + NPC_Bowser = 0, + NPC_Kammy = 1, + // npc_guards + NPC_Koopatrol_Guard_01 = 0, + NPC_Koopatrol_Guard_02 = 1, + // chapter 7 + NPC_Ch7_Bowser = 0, + NPC_Ch7_Koopatrol_01 = 1, + NPC_Ch7_Koopatrol_02 = 2, + NPC_Ch7_Kammy = 3, +}; + #define NAMESPACE kkj_14 + +extern EvtScript N(EVS_Main); +extern EvtScript N(EVS_SetupMusic); +extern EvtScript N(EVS_SetupInteractables); +extern EvtScript N(EVS_Scene_Chapter0); +extern EvtScript N(EVS_Scene_Chapter1); +extern EvtScript N(EVS_Scene_Chapter2); +extern EvtScript N(EVS_Scene_Chapter3); +extern EvtScript N(EVS_Scene_Chapter4); +extern EvtScript N(EVS_Scene_Chapter5); +extern EvtScript N(EVS_Scene_Chapter6); +extern EvtScript N(EVS_Scene_Chapter7); +extern EvtScript N(EVS_Scene_TossedBackInRoom); +extern EvtScript N(EVS_EndPeachChapter7); + +extern NpcGroupList N(Chapter0NPCs); +extern NpcGroupList N(Chapter2NPCs); +extern NpcGroupList N(Chapter7NPCs); +extern NpcGroupList N(TossBackNPCs); diff --git a/src/world/area_kkj/kkj_14/kkj_14_0_header.c b/src/world/area_kkj/kkj_14/kkj_14_0_header.c new file mode 100644 index 0000000000..0d07c89af4 --- /dev/null +++ b/src/world/area_kkj/kkj_14/kkj_14_0_header.c @@ -0,0 +1,31 @@ +#include "kkj_14.h" + +s32 N(map_init)(void) { + if (evt_get_variable(NULL, GB_StoryProgress) == STORY_INTRO) { + sprintf(wMapBgName, "nok_bg"); + } + return FALSE; +} + +EntryList N(Entrances) = { + [kkj_14_ENTRY_0] { -375.0, 0.0, -30.0, 90.0 }, + [kkj_14_ENTRY_1] { 435.0, 30.0, -33.0, 270.0 }, + [kkj_14_ENTRY_2] { -122.0, 10.0, -82.0, 180.0 }, + [kkj_14_ENTRY_3] { -20.0, 0.0, 30.0, 270.0 }, + [kkj_14_ENTRY_4] { -140.0, 0.0, 0.0, 270.0 }, + [kkj_14_ENTRY_5] { 40.0, 0.0, 30.0, 180.0 }, + [kkj_14_ENTRY_6] { -20.0, 0.0, 0.0, 270.0 }, + [kkj_14_ENTRY_7] { 0.0, 0.0, 30.0, 180.0 }, + [kkj_14_ENTRY_8] { -130.0, 0.0, 0.0, 180.0 }, + [kkj_14_ENTRY_9] { -60.0, 0.0, 0.0, 270.0 }, + [kkj_14_ENTRY_A] { 380.0, 30.0, 10.0, 270.0 }, + [kkj_14_ENTRY_B] { 150.0, 0.0, -30.0, 90.0 }, +}; + +MapSettings N(settings) = { + .main = &N(EVS_Main), + .entryList = &N(Entrances), + .entryCount = ENTRY_COUNT(N(Entrances)), + .background = &gBackgroundImage, + .tattle = { MSG_MapTattle_kkj_14 }, +}; diff --git a/src/world/area_kkj/kkj_14/kkj_14_10_chapter2.c b/src/world/area_kkj/kkj_14/kkj_14_10_chapter2.c new file mode 100644 index 0000000000..8673b471d0 --- /dev/null +++ b/src/world/area_kkj/kkj_14/kkj_14_10_chapter2.c @@ -0,0 +1,238 @@ +#include "kkj_14.h" + +Vec3f N(TwinkEmergePath)[] = { + { 110.0, 0.0, -190.0 }, + { 160.0, 70.0, -150.0 }, + { 100.0, 40.0, -60.0 }, + { 20.0, 70.0, -100.0 }, + { -60.0, 40.0, -20.0 }, + { 0.0, 20.0, 30.0 }, +}; + +EvtScript N(EVS_OpenAndCloseDoor_Ch2) = { + EVT_CALL(PlaySoundAtCollider, COLLIDER_ttw, SOUND_BASIC_DOOR_OPEN, 0) + EVT_CALL(MakeLerp, 0, 120, 14, EASING_LINEAR) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_CALL(RotateModel, MODEL_o4, LVar0, 0, 1, 0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_WAIT(40) + EVT_CALL(MakeLerp, 120, 0, 8, EASING_LINEAR) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_CALL(RotateModel, MODEL_o4, LVar0, 0, 1, 0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_CALL(PlaySoundAtCollider, COLLIDER_ttw, SOUND_BASIC_DOOR_CLOSE, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_OpenDoor_Ch2) = { + EVT_CALL(PlaySoundAtCollider, COLLIDER_ttw, SOUND_BASIC_DOOR_OPEN, 0) + EVT_CALL(MakeLerp, 0, 120, 14, EASING_COS_FAST_OVERSHOOT) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_CALL(RotateModel, MODEL_o4, LVar0, 0, 1, 0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_CloseDoor_Ch2) = { + EVT_CALL(MakeLerp, 120, 0, 8, EASING_COS_FAST_OVERSHOOT) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_CALL(RotateModel, MODEL_o4, LVar0, 0, 1, 0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_CALL(PlaySoundAtCollider, COLLIDER_ttw, SOUND_BASIC_DOOR_CLOSE, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_FocusCam_Door_Ch2) = { + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, -330, 0, -30) + EVT_CALL(SetPanTarget, CAM_DEFAULT, -330, 0, -30) + EVT_CALL(SetCamDistance, CAM_DEFAULT, EVT_FLOAT(325.0)) + EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(17.0), EVT_FLOAT(-11.0)) + EVT_CALL(SetCamPosA, CAM_DEFAULT, EVT_FLOAT(-310.0), EVT_FLOAT(32.0)) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(90.0)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Scene_Chapter2) = { + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(SetMusicTrack, 0, SONG_BOWSER_THEME, 0, 8) + EVT_CALL(DisablePartnerAI, 0) + EVT_CALL(SetNpcPos, NPC_PARTNER, 110, 0, -190) + EVT_CALL(SetNpcYaw, NPC_PARTNER, 270) + EVT_CALL(InterpPlayerYaw, 270, 0) + EVT_EXEC_WAIT(N(EVS_FocusCam_Door_Ch2)) + EVT_EXEC(N(EVS_OpenAndCloseDoor_Ch2)) + EVT_WAIT(10) + EVT_CALL(SetNpcPos, NPC_Bowser, -470, 0, -30) + EVT_CALL(SetNpcVar, NPC_Bowser, 0, 1) + EVT_THREAD + EVT_CALL(SetNpcAnimation, NPC_Bowser, ANIM_WorldBowser_Walk) + EVT_CALL(SetNpcSpeed, NPC_Bowser, EVT_FLOAT(3.0)) + EVT_CALL(NpcMoveTo, NPC_Bowser, -30, 30, 0) + EVT_CALL(SetNpcAnimation, NPC_Bowser, ANIM_WorldBowser_Idle) + EVT_CALL(SetNpcVar, NPC_Bowser, 0, 0) + EVT_END_THREAD + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(90.0)) + EVT_LOOP(0) + EVT_CALL(GetNpcPos, NPC_Bowser, LVar0, LVar1, LVar2) + EVT_ADD(LVar0, 30) + EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_CALL(GetNpcVar, NPC_Bowser, 0, LVar0) + EVT_WAIT(1) + EVT_IF_EQ(LVar0, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_CALL(SpeakToPlayer, NPC_Bowser, ANIM_WorldBowser_TalkEyesClosed, ANIM_WorldBowser_TalkEyesClosed, 0, MSG_Peach_005C) + EVT_CALL(SetNpcAnimation, NPC_Bowser, ANIM_WorldBowser_Idle) + EVT_WAIT(1) + EVT_CALL(EndSpeech, NPC_Bowser, ANIM_WorldBowser_Talk, ANIM_WorldBowser_Idle, 0) + EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0012) + EVT_CALL(InterpPlayerYaw, 90, 3) + EVT_WAIT(10) + EVT_CALL(SpeakToPlayer, NPC_PLAYER, ANIM_Peach_C0013, ANIM_Peach_C0012, 5, MSG_Peach_005D) + EVT_CALL(SpeakToPlayer, NPC_Bowser, ANIM_WorldBowser_TalkEyesClosed, ANIM_WorldBowser_TalkEyesClosed, 5, MSG_Peach_005E) + EVT_CALL(SetNpcAnimation, NPC_Bowser, ANIM_WorldBowser_Idle) + EVT_CALL(EndSpeech, NPC_Bowser, ANIM_WorldBowser_Talk, ANIM_WorldBowser_Idle, 5) + EVT_WAIT(10) + EVT_CALL(SetPlayerAnimation, ANIM_Peach_A0001) + EVT_CALL(InterpPlayerYaw, 270, 0) + EVT_CALL(InterpNpcYaw, NPC_Bowser, 270, 0) + EVT_EXEC_WAIT(N(EVS_FocusCam_Door_Ch2)) + EVT_WAIT(5) + EVT_EXEC(N(EVS_OpenDoor_Ch2)) + EVT_CALL(SetMusicTrack, 0, SONG_KAMMY_KOOPA_THEME, 0, 8) + EVT_CALL(SetNpcPos, NPC_Kammy, -470, 0, -30) + EVT_CALL(SetNpcAnimation, NPC_Kammy, ANIM_WorldKammy_Anim03) + EVT_CALL(SetNpcSpeed, NPC_Kammy, EVT_FLOAT(5.0)) + EVT_CALL(NpcMoveTo, NPC_Kammy, -340, -30, 0) + EVT_CALL(SetNpcAnimation, NPC_Kammy, ANIM_WorldKammy_Anim01) + EVT_WAIT(10) + EVT_CALL(SpeakToNpc, NPC_Kammy, ANIM_WorldKammy_Anim04, ANIM_WorldKammy_Anim01, 0, NPC_Bowser, MSG_Peach_005F) + EVT_CALL(SetCamDistance, CAM_DEFAULT, 350) + EVT_CALL(SetPanTarget, CAM_DEFAULT, -30, 0, -30) + EVT_CALL(SetCamPosA, CAM_DEFAULT, -287, 32) + EVT_WAIT(5) + EVT_CALL(SetNpcAnimation, NPC_Kammy, ANIM_WorldKammy_Anim03) + EVT_CALL(SetNpcSpeed, NPC_Kammy, EVT_FLOAT(5.0)) + EVT_CALL(NpcMoveTo, NPC_Kammy, -110, 30, 0) + EVT_CALL(SetNpcAnimation, NPC_Kammy, ANIM_WorldKammy_Anim01) + EVT_CALL(SpeakToNpc, NPC_Kammy, ANIM_WorldKammy_Anim04, ANIM_WorldKammy_Anim01, 0, NPC_Bowser, MSG_Peach_0060) + EVT_CALL(SpeakToNpc, NPC_Bowser, ANIM_WorldBowser_Talk, ANIM_WorldBowser_Idle, 0, NPC_Kammy, MSG_Peach_0061) + EVT_CALL(SetNpcAnimation, NPC_Kammy, ANIM_WorldKammy_Anim02) + EVT_CALL(NpcMoveTo, NPC_Kammy, -90, 40, 10) + EVT_CALL(SetNpcAnimation, NPC_Kammy, ANIM_WorldKammy_Anim01) + EVT_WAIT(10) + EVT_CALL(SpeakToNpc, NPC_Kammy, ANIM_WorldKammy_Anim04, ANIM_WorldKammy_Anim01, 0, NPC_Bowser, MSG_Peach_0062) + EVT_CALL(GetNpcPos, NPC_Bowser, LVar0, LVar1, LVar2) + EVT_CALL(SetNpcAnimation, NPC_Bowser, ANIM_WorldBowser_Shock) + EVT_CALL(NpcJump0, NPC_Bowser, LVar0, LVar1, LVar2, 10) + EVT_CALL(SetNpcAnimation, NPC_Bowser, ANIM_WorldBowser_Idle) + EVT_WAIT(10) + EVT_CALL(SpeakToNpc, NPC_Bowser, ANIM_WorldBowser_Talk, ANIM_WorldBowser_Idle, 0, NPC_Kammy, MSG_Peach_0063) + EVT_CALL(SpeakToNpc, NPC_Kammy, ANIM_WorldKammy_Anim04, ANIM_WorldKammy_Anim01, 0, NPC_Bowser, MSG_Peach_0064) + EVT_CALL(SetNpcAnimation, NPC_Bowser, ANIM_WorldBowser_ArmsCrossed) + EVT_WAIT(50) + EVT_CALL(SpeakToNpc, NPC_Bowser, ANIM_WorldBowser_Talk, ANIM_WorldBowser_Idle, 0, NPC_Kammy, MSG_Peach_0065) + EVT_THREAD + EVT_CALL(SetNpcAnimation, NPC_Bowser, ANIM_WorldBowser_Walk) + EVT_CALL(SetNpcSpeed, NPC_Bowser, EVT_FLOAT(3.0)) + EVT_CALL(NpcMoveTo, NPC_Bowser, -470, -30, 0) + EVT_END_THREAD + EVT_CALL(SetNpcVar, NPC_Kammy, 0, 1) + EVT_THREAD + EVT_WAIT(40) + EVT_CALL(SetNpcAnimation, NPC_Kammy, ANIM_WorldKammy_Anim02) + EVT_CALL(SetNpcSpeed, NPC_Kammy, EVT_FLOAT(3.0)) + EVT_CALL(NpcMoveTo, NPC_Kammy, -470, -30, 0) + EVT_CALL(SetNpcVar, NPC_Kammy, 0, 0) + EVT_END_THREAD + EVT_THREAD + EVT_CALL(MakeLerp, 350, 400, 100, EASING_LINEAR) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_CALL(SetCamDistance, CAM_DEFAULT, LVar0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_END_THREAD + EVT_LOOP(0) + EVT_CALL(GetNpcPos, NPC_Bowser, LVar0, LVar1, LVar2) + EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_CALL(GetNpcVar, NPC_Kammy, 0, LVar0) + EVT_WAIT(1) + EVT_IF_EQ(LVar0, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_EXEC(N(EVS_CloseDoor_Ch2)) + EVT_WAIT(30) + EVT_CALL(SetMusicTrack, 0, SONG_PRISONER_PEACH_THEME, 0, 8) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(90.0)) + EVT_CALL(SetCamDistance, CAM_DEFAULT, 300) + EVT_CALL(SetPanTarget, CAM_DEFAULT, 20, 0, 30) + EVT_WAIT(3) + EVT_THREAD + EVT_LOOP(0) + EVT_CALL(GetNpcPos, NPC_PARTNER, LVar0, LVar1, LVar2) + EVT_IF_LT(LVar0, -58) + EVT_BREAK_LOOP + EVT_END_IF + EVT_WAIT(1) + EVT_END_LOOP + EVT_CALL(InterpNpcYaw, NPC_PARTNER, 90, 0) + EVT_END_THREAD + EVT_CALL(LoadPath, 80, EVT_PTR(N(TwinkEmergePath)), ARRAY_COUNT(N(TwinkEmergePath)), EASING_LINEAR) + EVT_LOOP(0) + EVT_CALL(GetNextPathPos) + EVT_CALL(SetNpcPos, NPC_PARTNER, LVar1, LVar2, LVar3) + EVT_WAIT(1) + EVT_IF_EQ(LVar0, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_WAIT(10) + EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0000) + EVT_WAIT(10) + EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0026) + EVT_CALL(SpeakToPlayer, NPC_PLAYER, ANIM_Peach_C0001, ANIM_Peach_C0026, 5, MSG_Peach_0066) + EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0002) + EVT_WAIT(10) + EVT_CALL(SetPlayerAnimation, ANIM_Peach_A0001) + EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_Twink_Talk, ANIM_Twink_Idle, 0, MSG_Peach_0067) + EVT_CALL(SpeakToPlayer, NPC_PLAYER, ANIM_Peach_D0004, ANIM_Peach_A0001, 5, MSG_Peach_0068) + EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_Twink_Talk, ANIM_Twink_Idle, 0, MSG_Peach_0069) + EVT_CALL(SpeakToPlayer, NPC_PLAYER, ANIM_Peach_D0004, ANIM_Peach_A0001, 5, MSG_Peach_006A) + EVT_EXEC(N(EVS_SetupMusic)) + EVT_CALL(ResetCam, CAM_DEFAULT, EVT_FLOAT(4.0)) + EVT_CALL(EnablePartnerAI) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_kkj/kkj_14/kkj_14_11_chapter3.c b/src/world/area_kkj/kkj_14/kkj_14_11_chapter3.c new file mode 100644 index 0000000000..ae977ffafd --- /dev/null +++ b/src/world/area_kkj/kkj_14/kkj_14_11_chapter3.c @@ -0,0 +1,70 @@ +#include "kkj_14.h" + +Vec3f N(TwinkPacingPath1)[] = { + { -40.0, 90.0, 0.0 }, + { -10.0, 65.0, -20.0 }, + { 20.0, 70.0, -10.0 }, +}; + +Vec3f N(TwinkPacingPath2)[] = { + { 20.0, 70.0, -10.0 }, + { -30.0, 45.0, -20.0 }, + { -80.0, 50.0, -10.0 }, +}; + +Vec3f N(TwinkPacingPath3)[] = { + { -80.0, 50.0, -10.0 }, + { -70.0, 35.0, -5.0 }, + { -60.0, 30.0, 0.0 }, +}; + +EvtScript N(EVS_Scene_Chapter3) = { + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(InterpPlayerYaw, 270, 0) + EVT_CALL(DisablePartnerAI, 0) + EVT_CALL(SetNpcPos, NPC_PARTNER, -40, 90, 0) + EVT_CALL(InterpNpcYaw, NPC_PARTNER, 90, 0) + EVT_CALL(AdjustCam, CAM_DEFAULT, EVT_FLOAT(90.0), -20, 250, EVT_FLOAT(17.0), EVT_FLOAT(-11.0)) + EVT_CALL(LoadPath, 24, EVT_PTR(N(TwinkPacingPath1)), ARRAY_COUNT(N(TwinkPacingPath1)), EASING_LINEAR) + EVT_LOOP(0) + EVT_CALL(GetNextPathPos) + EVT_CALL(SetNpcPos, NPC_PARTNER, LVar1, LVar2, LVar3) + EVT_WAIT(1) + EVT_IF_EQ(LVar0, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_CALL(NpcFacePlayer, NPC_PARTNER, 5) + EVT_WAIT(20) + EVT_CALL(LoadPath, 30, EVT_PTR(N(TwinkPacingPath2)), ARRAY_COUNT(N(TwinkPacingPath2)), EASING_LINEAR) + EVT_LOOP(0) + EVT_CALL(GetNextPathPos) + EVT_CALL(SetNpcPos, NPC_PARTNER, LVar1, LVar2, LVar3) + EVT_WAIT(1) + EVT_IF_EQ(LVar0, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_CALL(NpcFacePlayer, NPC_PARTNER, 5) + EVT_WAIT(20) + EVT_CALL(LoadPath, 10, EVT_PTR(N(TwinkPacingPath3)), ARRAY_COUNT(N(TwinkPacingPath3)), EASING_LINEAR) + EVT_LOOP(0) + EVT_CALL(GetNextPathPos) + EVT_CALL(SetNpcPos, NPC_PARTNER, LVar1, LVar2, LVar3) + EVT_WAIT(1) + EVT_IF_EQ(LVar0, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_CALL(NpcFacePlayer, NPC_PARTNER, 5) + EVT_WAIT(10) + EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_Twink_Talk, ANIM_Twink_Idle, 0, MSG_Peach_007E) + EVT_CALL(SpeakToPlayer, NPC_PLAYER, ANIM_Peach_D0004, ANIM_Peach_A0001, 5, MSG_Peach_007F) + EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_Twink_Talk, ANIM_Twink_Idle, 0, MSG_Peach_0080) + EVT_CALL(SpeakToPlayer, NPC_PLAYER, ANIM_Peach_D0004, ANIM_Peach_A0001, 5, MSG_Peach_0081) + EVT_CALL(ResetCam, CAM_DEFAULT, EVT_FLOAT(2.0)) + EVT_CALL(EnablePartnerAI) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_kkj/kkj_14/kkj_14_12_chapter4.c b/src/world/area_kkj/kkj_14/kkj_14_12_chapter4.c new file mode 100644 index 0000000000..e34cc8f90f --- /dev/null +++ b/src/world/area_kkj/kkj_14/kkj_14_12_chapter4.c @@ -0,0 +1,22 @@ +#include "kkj_14.h" + +EvtScript N(EVS_Scene_Chapter4) = { + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(InterpPlayerYaw, 270, 0) + EVT_CALL(DisablePartnerAI, 0) + EVT_CALL(SetNpcPos, NPC_PARTNER, -60, 30, 0) + EVT_CALL(SetNpcYaw, NPC_PARTNER, 90) + EVT_CALL(AdjustCam, CAM_DEFAULT, EVT_FLOAT(90.0), -20, 250, EVT_FLOAT(17.0), EVT_FLOAT(-11.0)) + EVT_WAIT(30) + EVT_CALL(SpeakToPlayer, NPC_PLAYER, ANIM_Peach_D0004, ANIM_Peach_A0001, 5, MSG_Peach_0097) + EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_Twink_Talk, ANIM_Twink_Idle, 0, MSG_Peach_0098) + EVT_CALL(SpeakToPlayer, NPC_PLAYER, ANIM_Peach_D0004, ANIM_Peach_A0001, 5, MSG_Peach_0099) + EVT_THREAD + EVT_CALL(NpcFlyTo, NPC_PARTNER, -30, 55, 30, 30, -5, EASING_LINEAR) + EVT_CALL(EnablePartnerAI) + EVT_END_THREAD + EVT_CALL(ResetCam, CAM_DEFAULT, EVT_FLOAT(2.0)) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_kkj/kkj_14/kkj_14_13_chapter5.c b/src/world/area_kkj/kkj_14/kkj_14_13_chapter5.c new file mode 100644 index 0000000000..8023a5c14f --- /dev/null +++ b/src/world/area_kkj/kkj_14/kkj_14_13_chapter5.c @@ -0,0 +1,47 @@ +#include "kkj_14.h" + +EvtScript N(EVS_Scene_Chapter5) = { + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(InterpPlayerYaw, 270, 0) + EVT_CALL(DisablePartnerAI, 0) + EVT_CALL(SetNpcPos, NPC_PARTNER, -170, 40, -5) + EVT_CALL(InterpNpcYaw, NPC_PARTNER, 90, 0) + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, -140, 0, 0) + EVT_CALL(SetPanTarget, CAM_DEFAULT, -140, 0, 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_THREAD + EVT_CALL(SetCamDistance, CAM_DEFAULT, EVT_FLOAT(275.0)) + EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(17.0), EVT_FLOAT(-11.0)) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(0.6)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_END_THREAD + EVT_LOOP(2) + EVT_CALL(PlayerMoveTo, -110, 0, 25) + EVT_WAIT(5) + EVT_CALL(PlayerMoveTo, -130, 0, 25) + EVT_WAIT(5) + EVT_END_LOOP + EVT_CALL(PlayerMoveTo, -110, 0, 25) + EVT_CALL(InterpPlayerYaw, 270, 5) + EVT_CALL(SpeakToPlayer, NPC_PLAYER, ANIM_Peach_D0004, ANIM_Peach_A0001, 5, MSG_Peach_00EB) + EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_Twink_Talk, ANIM_Twink_Idle, 0, MSG_Peach_00EC) + EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0000) + EVT_WAIT(10) + EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0026) + EVT_CALL(SpeakToPlayer, NPC_PLAYER, ANIM_Peach_C0001, ANIM_Peach_C0026, 5, MSG_Peach_00ED) + EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0002) + EVT_WAIT(10) + EVT_CALL(SetPlayerAnimation, ANIM_Peach_A0001) + EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_Twink_Talk, ANIM_Twink_Idle, 0, MSG_Peach_00EE) + EVT_THREAD + EVT_CALL(NpcFlyTo, NPC_PARTNER, -140, 55, 0, 30, -5, EASING_LINEAR) + EVT_CALL(EnablePartnerAI) + EVT_END_THREAD + EVT_CALL(ResetCam, CAM_DEFAULT, EVT_FLOAT(2.0)) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_kkj/kkj_14/kkj_14_14_chapter6.c b/src/world/area_kkj/kkj_14/kkj_14_14_chapter6.c new file mode 100644 index 0000000000..2f56c14324 --- /dev/null +++ b/src/world/area_kkj/kkj_14/kkj_14_14_chapter6.c @@ -0,0 +1,34 @@ +#include "kkj_14.h" + +EvtScript N(EVS_Scene_Chapter6) = { + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(InterpPlayerYaw, 270, 0) + EVT_CALL(DisablePartnerAI, 0) + EVT_CALL(SetNpcPos, NPC_PARTNER, -140, 25, 0) + EVT_CALL(SetNpcYaw, NPC_PARTNER, 90) + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, -100, 0, 0) + EVT_CALL(SetPanTarget, CAM_DEFAULT, -100, 0, 0) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(90.0)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_CALL(SetCamDistance, CAM_DEFAULT, EVT_FLOAT(250.0)) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(2.0)) + EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_WAIT(30) + EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0000) + EVT_WAIT(10) + EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0026) + EVT_CALL(SpeakToPlayer, NPC_PLAYER, ANIM_Peach_C0001, ANIM_Peach_C0026, 5, MSG_Peach_012F) + EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0002) + EVT_WAIT(10) + EVT_CALL(SetPlayerAnimation, ANIM_Peach_A0001) + EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_Twink_Talk, ANIM_Twink_Idle, 0, MSG_Peach_0130) + EVT_THREAD + EVT_CALL(NpcFlyTo, NPC_PARTNER, -90, 55, 0, 30, -5, EASING_LINEAR) + EVT_CALL(EnablePartnerAI) + EVT_END_THREAD + EVT_CALL(ResetCam, CAM_DEFAULT, EVT_FLOAT(2.0)) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_kkj/kkj_14/kkj_14_15_chapter7.c b/src/world/area_kkj/kkj_14/kkj_14_15_chapter7.c new file mode 100644 index 0000000000..68d4e71cb8 --- /dev/null +++ b/src/world/area_kkj/kkj_14/kkj_14_15_chapter7.c @@ -0,0 +1,438 @@ +#include "kkj_14.h" +#include "effects.h" + +Vec3f N(TwinkHidePath)[] = { + { 440.0, 65.0, 0.0 }, + { 420.0, 120.0, -20.0 }, + { 400.0, 80.0, -35.0 }, + { 375.0, 80.0, -50.0 }, + { 375.0, 100.0, -50.0 }, +}; + +Vec3f N(TwinkAttackPath)[] = { + { 375.0, 100.0, -50.0 }, + { 375.0, 80.0, -50.0 }, + { 390.0, 90.0, 10.0 }, +}; + +EvtScript N(EVS_ApproachPeach) = { + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_THREAD + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_SUB(LVar0, 26) + EVT_SUB(LVar2, 2) + EVT_CALL(SetNpcAnimation, NPC_Ch7_Koopatrol_01, ANIM_WorldKoopatrol_Anim06) + EVT_CALL(SetNpcSpeed, NPC_Ch7_Koopatrol_01, EVT_FLOAT(5.0)) + EVT_CALL(NpcMoveTo, NPC_Ch7_Koopatrol_01, LVar0, 70, 0) + EVT_CALL(NpcFacePlayer, NPC_Ch7_Koopatrol_01, 5) + EVT_CALL(NpcMoveTo, NPC_Ch7_Koopatrol_01, LVar0, LVar2, 0) + EVT_CALL(SetNpcAnimation, NPC_Ch7_Koopatrol_01, ANIM_WorldKoopatrol_Anim01) + EVT_END_THREAD + EVT_CALL(SetNpcVar, NPC_Ch7_Koopatrol_02, 0, 1) + EVT_THREAD + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_ADD(LVar0, 26) + EVT_ADD(LVar2, 2) + EVT_CALL(SetNpcAnimation, NPC_Ch7_Koopatrol_02, ANIM_WorldKoopatrol_Anim06) + EVT_CALL(SetNpcSpeed, NPC_Ch7_Koopatrol_02, EVT_FLOAT(5.0)) + EVT_CALL(NpcMoveTo, NPC_Ch7_Koopatrol_02, LVar0, 70, 0) + EVT_CALL(NpcFacePlayer, NPC_Ch7_Koopatrol_02, 5) + EVT_CALL(NpcMoveTo, NPC_Ch7_Koopatrol_02, LVar0, LVar2, 0) + EVT_CALL(SetNpcAnimation, NPC_Ch7_Koopatrol_02, ANIM_WorldKoopatrol_Anim01) + EVT_CALL(SetNpcVar, NPC_Ch7_Koopatrol_02, 0, 0) + EVT_END_THREAD + EVT_LOOP(0) + EVT_WAIT(1) + EVT_CALL(GetNpcVar, NPC_Ch7_Koopatrol_02, 0, LVar0) + EVT_IF_EQ(LVar0, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_WAIT(10) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_TiePeachUp) = { + EVT_THREAD + EVT_CALL(SetNpcAnimation, NPC_Ch7_Koopatrol_01, ANIM_WorldKoopatrol_Anim18) + EVT_CALL(GetNpcPos, NPC_Ch7_Koopatrol_01, LVar0, LVar1, LVar2) + EVT_LOOP(5) + EVT_LOOP(5) + EVT_ADD(LVar0, 2) + EVT_CALL(SetNpcPos, NPC_Ch7_Koopatrol_01, LVar0, LVar1, LVar2) + EVT_WAIT(1) + EVT_END_LOOP + EVT_LOOP(5) + EVT_SUB(LVar0, 2) + EVT_CALL(SetNpcPos, NPC_Ch7_Koopatrol_01, LVar0, LVar1, LVar2) + EVT_WAIT(1) + EVT_END_LOOP + EVT_END_LOOP + EVT_CALL(SetNpcAnimation, NPC_Ch7_Koopatrol_01, ANIM_WorldKoopatrol_Anim01) + EVT_END_THREAD + EVT_THREAD + EVT_CALL(SetNpcAnimation, NPC_Ch7_Koopatrol_02, ANIM_WorldKoopatrol_Anim18) + EVT_CALL(GetNpcPos, NPC_Ch7_Koopatrol_02, LVar0, LVar1, LVar2) + EVT_LOOP(5) + EVT_LOOP(5) + EVT_SUB(LVar0, 2) + EVT_CALL(SetNpcPos, NPC_Ch7_Koopatrol_02, LVar0, LVar1, LVar2) + EVT_WAIT(1) + EVT_END_LOOP + EVT_LOOP(5) + EVT_ADD(LVar0, 2) + EVT_CALL(SetNpcPos, NPC_Ch7_Koopatrol_02, LVar0, LVar1, LVar2) + EVT_WAIT(1) + EVT_END_LOOP + EVT_END_LOOP + EVT_CALL(SetNpcAnimation, NPC_Ch7_Koopatrol_02, ANIM_WorldKoopatrol_Anim01) + EVT_END_THREAD + EVT_THREAD + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_SUB(LVar0, 16) + EVT_LOOP(50) + EVT_CALL(RandInt, 32, LVar3) + EVT_CALL(RandInt, 50, LVar4) + EVT_ADD(LVar3, LVar0) + EVT_ADD(LVar4, LVar1) + EVT_PLAY_EFFECT(EFFECT_WALKING_DUST, 1, LVar3, LVar4, LVar2, 1, 1) + EVT_WAIT(1) + EVT_END_LOOP + EVT_END_THREAD + EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0005) + EVT_WAIT(10) + EVT_THREAD + EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0006) + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_CALL(ShowMessageAtWorldPos, MSG_Peach_016D, LVar0, LVar1, LVar2) + EVT_END_THREAD + EVT_SET(LVar0, 0) + EVT_SET(LVar1, 45) + EVT_LOOP(20) + EVT_CALL(InterpPlayerYaw, LVar0, 0) + EVT_ADD(LVar0, LVar1) + EVT_ADD(LVar1, 2) + EVT_WAIT(1) + EVT_END_LOOP + EVT_CALL(SetPlayerAnimation, ANIM_Peach_C001E) + EVT_LOOP(20) + EVT_CALL(InterpPlayerYaw, LVar0, 0) + EVT_ADD(LVar0, LVar1) + EVT_SUB(LVar1, 2) + EVT_WAIT(1) + EVT_END_LOOP + EVT_CALL(InterpPlayerYaw, 270, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_PickUpPeach) = { + EVT_THREAD + EVT_CALL(GetNpcPos, NPC_Ch7_Koopatrol_01, LVar0, LVar1, LVar2) + EVT_CALL(SetNpcAnimation, NPC_Ch7_Koopatrol_01, ANIM_WorldKoopatrol_Anim12) + EVT_ADD(LVar0, 10) + EVT_CALL(NpcMoveTo, NPC_Ch7_Koopatrol_01, LVar0, LVar2, 10) + EVT_END_THREAD + EVT_THREAD + EVT_CALL(GetNpcPos, NPC_Ch7_Koopatrol_02, LVar0, LVar1, LVar2) + EVT_CALL(SetNpcAnimation, NPC_Ch7_Koopatrol_02, ANIM_WorldKoopatrol_Anim12) + EVT_SUB(LVar0, 10) + EVT_CALL(NpcMoveTo, NPC_Ch7_Koopatrol_02, LVar0, LVar2, 10) + EVT_END_THREAD + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_WAIT(1) + EVT_LOOP(4) + EVT_ADD(LVar1, 2) + EVT_CALL(SetPlayerPos, LVar0, LVar1, LVar2) + EVT_WAIT(1) + EVT_END_LOOP + EVT_CALL(SetPlayerAnimation, ANIM_Peach_D0008) + EVT_LOOP(5) + EVT_ADD(LVar1, 4) + EVT_CALL(SetPlayerPos, LVar0, LVar1, LVar2) + EVT_WAIT(1) + EVT_END_LOOP + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_CarryPeachAway) = { + EVT_CALL(InterpNpcYaw, NPC_Ch7_Koopatrol_01, 270, 3) + EVT_WAIT(10) + EVT_THREAD + EVT_LOOP(0) + EVT_CALL(GetNpcPos, NPC_Ch7_Koopatrol_02, LVar0, LVar1, LVar2) + EVT_SUB(LVar0, 22) + EVT_ADD(LVar1, 30) + EVT_ADD(LVar2, 2) + EVT_CALL(SetPlayerPos, LVar0, LVar1, LVar2) + EVT_WAIT(1) + EVT_END_LOOP + EVT_END_THREAD + EVT_THREAD + EVT_CALL(SetNpcAnimation, NPC_Ch7_Koopatrol_01, ANIM_WorldKoopatrol_Anim14) + EVT_CALL(SetNpcSpeed, NPC_Ch7_Koopatrol_01, EVT_FLOAT(5.0)) + EVT_CALL(NpcMoveTo, NPC_Ch7_Koopatrol_01, 364, 68, 0) + EVT_CALL(NpcMoveTo, NPC_Ch7_Koopatrol_01, 84, 68, 0) + EVT_END_THREAD + EVT_THREAD + EVT_CALL(SetNpcAnimation, NPC_Ch7_Koopatrol_02, ANIM_WorldKoopatrol_Anim14) + EVT_CALL(SetNpcSpeed, NPC_Ch7_Koopatrol_02, EVT_FLOAT(5.0)) + EVT_CALL(NpcMoveTo, NPC_Ch7_Koopatrol_02, 396, 72, 0) + EVT_CALL(NpcMoveTo, NPC_Ch7_Koopatrol_02, 116, 72, 0) + EVT_END_THREAD + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_OpenAndCloseDoor_Ch7) = { + EVT_CALL(PlaySoundAtCollider, COLLIDER_ttw, SOUND_BASIC_DOOR_OPEN, 0) + EVT_CALL(MakeLerp, 0, 120, 14, EASING_LINEAR) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_CALL(RotateModel, MODEL_o4, LVar0, 0, 1, 0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_WAIT(40) + EVT_CALL(MakeLerp, 120, 0, 8, EASING_LINEAR) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_CALL(RotateModel, MODEL_o4, LVar0, 0, 1, 0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_CALL(PlaySoundAtCollider, COLLIDER_ttw, SOUND_BASIC_DOOR_CLOSE, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_OpenDoor_Ch7) = { + EVT_CALL(PlaySoundAtCollider, COLLIDER_ttw, SOUND_BASIC_DOOR_OPEN, 0) + EVT_CALL(MakeLerp, 0, 120, 14, EASING_COS_FAST_OVERSHOOT) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_CALL(RotateModel, MODEL_o4, LVar0, 0, 1, 0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_FocusCam_Door_Ch7) = { + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, -340, 0, -30) + EVT_CALL(SetPanTarget, CAM_DEFAULT, -340, 0, -30) + EVT_CALL(SetCamDistance, CAM_DEFAULT, EVT_FLOAT(275.0)) + EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(17.0), EVT_FLOAT(-13.0)) + EVT_CALL(SetCamPosA, CAM_DEFAULT, EVT_FLOAT(-310.0), EVT_FLOAT(32.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_RETURN + EVT_END +}; + +EvtScript N(EVS_FocusCam_Bed) = { + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, 380, 30, 10) + EVT_CALL(SetPanTarget, CAM_DEFAULT, 380, 30, 10) + EVT_CALL(SetCamDistance, CAM_DEFAULT, EVT_FLOAT(350.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_RETURN + EVT_END +}; + +EvtScript N(EVS_Scene_Chapter7) = { + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(DisablePlayerPhysics, TRUE) + EVT_CALL(DisablePartnerAI, 0) + EVT_CALL(SetMusicTrack, 0, SONG_BOWSER_THEME, 0, 8) + EVT_CALL(SetNpcPos, NPC_PARTNER, 440, 65, 0) + EVT_CALL(SetNpcYaw, NPC_PARTNER, 270) + EVT_CALL(RotateModel, MODEL_o83, 80, 0, -1, 0) + EVT_CALL(RotateModel, MODEL_o85, 80, 0, 1, 0) + EVT_CALL(RotateModel, MODEL_o84, 80, 0, -1, 0) + EVT_CALL(RotateModel, MODEL_o86, 80, 0, 1, 0) + EVT_EXEC_WAIT(N(EVS_FocusCam_Door_Ch7)) + EVT_WAIT(30) + EVT_EXEC(N(EVS_OpenAndCloseDoor_Ch7)) + EVT_CALL(SetNpcAnimation, NPC_Ch7_Bowser, ANIM_WorldBowser_Walk) + EVT_CALL(SetNpcPos, NPC_Ch7_Bowser, -470, 0, -30) + EVT_CALL(SetNpcSpeed, NPC_Ch7_Bowser, EVT_FLOAT(3.0)) + EVT_CALL(NpcMoveTo, NPC_Ch7_Bowser, -290, -30, 0) + EVT_CALL(SetNpcAnimation, NPC_Ch7_Bowser, ANIM_WorldBowser_Idle) + EVT_WAIT(10) + EVT_CALL(SpeakToPlayer, NPC_Ch7_Bowser, ANIM_WorldBowser_Talk, ANIM_WorldBowser_Idle, 0, MSG_Peach_0161) + EVT_WAIT(10) + EVT_EXEC_WAIT(N(EVS_FocusCam_Bed)) + EVT_CALL(LoadPath, 30, EVT_PTR(N(TwinkHidePath)), ARRAY_COUNT(N(TwinkHidePath)), EASING_LINEAR) + EVT_LOOP(0) + EVT_CALL(GetNextPathPos) + EVT_CALL(SetNpcPos, NPC_PARTNER, LVar1, LVar2, LVar3) + EVT_WAIT(1) + EVT_IF_EQ(LVar0, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_CALL(SetNpcAnimation, NPC_PARTNER, ANIM_Twink_Sad) + EVT_CALL(SetNpcPos, NPC_Ch7_Bowser, 100, 0, 20) + EVT_CALL(SetNpcFlagBits, NPC_Ch7_Bowser, NPC_FLAG_GRAVITY, TRUE) + EVT_CALL(SetNpcAnimation, NPC_Ch7_Bowser, ANIM_WorldBowser_Walk) + EVT_CALL(NpcMoveTo, NPC_Ch7_Bowser, 300, 20, 0) + EVT_CALL(SetNpcAnimation, NPC_Ch7_Bowser, ANIM_WorldBowser_Idle) + EVT_WAIT(10) + EVT_CALL(SetCamDistance, CAM_DEFAULT, EVT_FLOAT(325.0)) + EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(17.0), EVT_FLOAT(-11.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_CALL(SpeakToPlayer, NPC_Ch7_Bowser, ANIM_WorldBowser_Talk, ANIM_WorldBowser_Idle, 0, MSG_Peach_0162) + EVT_CALL(InterpPlayerYaw, 90, 5) + EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0012) + EVT_CALL(SpeakToPlayer, NPC_PLAYER, ANIM_Peach_C0013, ANIM_Peach_C0012, 5, MSG_Peach_0163) + EVT_CALL(SpeakToPlayer, NPC_Ch7_Bowser, ANIM_WorldBowser_Talk, ANIM_WorldBowser_Idle, 5, MSG_Peach_0164) + EVT_CALL(InterpPlayerYaw, 270, 5) + EVT_WAIT(10) + EVT_CALL(SpeakToPlayer, NPC_PLAYER, ANIM_Peach_C0013, ANIM_Peach_C0012, 5, MSG_Peach_0165) + EVT_CALL(SpeakToPlayer, NPC_Ch7_Bowser, ANIM_WorldBowser_TalkEyesClosed, ANIM_WorldBowser_TalkEyesClosed, 5, MSG_Peach_0166) + EVT_CALL(SetNpcAnimation, NPC_Ch7_Bowser, ANIM_WorldBowser_Idle) + EVT_CALL(EndSpeech, NPC_Ch7_Bowser, ANIM_WorldBowser_Talk, ANIM_WorldBowser_Idle, 5) + EVT_CALL(SpeakToPlayer, NPC_PLAYER, ANIM_Peach_C0013, ANIM_Peach_C0012, 5, MSG_Peach_0167) + EVT_WAIT(30) + EVT_CALL(SetPlayerAnimation, ANIM_Peach_A0001) + EVT_EXEC_WAIT(N(EVS_FocusCam_Door_Ch7)) + EVT_EXEC(N(EVS_OpenDoor_Ch7)) + EVT_CALL(SetNpcAnimation, NPC_Ch7_Kammy, ANIM_WorldKammy_Anim03) + EVT_CALL(SetNpcPos, NPC_Ch7_Kammy, -470, 0, -30) + EVT_CALL(SetNpcSpeed, NPC_Ch7_Bowser, EVT_FLOAT(5.0)) + EVT_CALL(NpcMoveTo, NPC_Ch7_Kammy, -340, -30, 0) + EVT_CALL(SetNpcAnimation, NPC_Ch7_Kammy, ANIM_WorldKammy_Anim01) + EVT_WAIT(10) + EVT_CALL(SpeakToNpc, NPC_Ch7_Kammy, ANIM_WorldKammy_Anim04, ANIM_WorldKammy_Anim01, 0, NPC_Ch7_Bowser, MSG_Peach_0168) + EVT_CALL(SetNpcAnimation, NPC_Ch7_Bowser, ANIM_WorldBowser_Idle) + EVT_CALL(SetNpcYaw, NPC_Ch7_Bowser, 270) + EVT_CALL(SetNpcYaw, NPC_PARTNER, 270) + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, 250, 30, 10) + EVT_CALL(SetPanTarget, CAM_DEFAULT, 250, 30, 10) + EVT_CALL(SetCamDistance, CAM_DEFAULT, EVT_FLOAT(325.0)) + EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(17.0), EVT_FLOAT(-11.0)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_WAIT(10) + EVT_CALL(SetNpcPos, NPC_Ch7_Kammy, 50, 0, -10) + EVT_CALL(SetNpcAnimation, NPC_Ch7_Kammy, ANIM_WorldKammy_Anim03) + EVT_CALL(NpcMoveTo, NPC_Ch7_Kammy, 180, -10, 0) + EVT_CALL(SetNpcAnimation, NPC_Ch7_Kammy, ANIM_WorldKammy_Anim01) + EVT_WAIT(10) + EVT_CALL(SpeakToNpc, NPC_Ch7_Bowser, ANIM_WorldBowser_Talk, ANIM_WorldBowser_Idle, 0, NPC_Ch7_Kammy, MSG_Peach_0169) + EVT_CALL(SpeakToNpc, NPC_Ch7_Kammy, ANIM_WorldKammy_Anim04, ANIM_WorldKammy_Anim01, 0, NPC_Ch7_Bowser, MSG_Peach_016A) + EVT_CALL(SetNpcAnimation, NPC_Ch7_Bowser, ANIM_WorldBowser_Shock) + EVT_CALL(GetNpcPos, NPC_Ch7_Bowser, LVar0, LVar1, LVar2) + EVT_CALL(NpcJump0, NPC_Ch7_Bowser, LVar0, LVar1, LVar2, 10) + EVT_CALL(SetNpcAnimation, NPC_Ch7_Bowser, ANIM_WorldBowser_Idle) + EVT_CALL(SpeakToNpc, NPC_Ch7_Bowser, ANIM_WorldBowser_Talk, ANIM_WorldBowser_Idle, 0, NPC_Ch7_Kammy, MSG_Peach_016B) + EVT_WAIT(10) + EVT_THREAD + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(4.0)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_END_THREAD + EVT_CALL(InterpNpcYaw, NPC_Ch7_Bowser, 270, 10) + EVT_WAIT(10) + EVT_CALL(SpeakToPlayer, NPC_Ch7_Bowser, ANIM_WorldBowser_Talk, ANIM_WorldBowser_Idle, 0, MSG_Peach_016C) + EVT_WAIT(10) + EVT_CALL(SetNpcPos, NPC_Ch7_Koopatrol_01, 48, 0, 70) + EVT_CALL(SetNpcPos, NPC_Ch7_Koopatrol_02, 100, 0, 70) + EVT_CALL(SetNpcFlagBits, NPC_Ch7_Koopatrol_01, NPC_FLAG_GRAVITY, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_Ch7_Koopatrol_02, NPC_FLAG_GRAVITY, TRUE) + EVT_WAIT(10) + EVT_EXEC_WAIT(N(EVS_ApproachPeach)) + EVT_EXEC_WAIT(N(EVS_TiePeachUp)) + EVT_CALL(SetNpcAnimation, NPC_PARTNER, ANIM_Twink_Angry) + EVT_CALL(LoadPath, 15, EVT_PTR(N(TwinkAttackPath)), ARRAY_COUNT(N(TwinkAttackPath)), EASING_LINEAR) + EVT_LOOP(0) + EVT_CALL(GetNextPathPos) + EVT_CALL(SetNpcPos, NPC_PARTNER, LVar1, LVar2, LVar3) + EVT_WAIT(1) + EVT_IF_EQ(LVar0, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_Twink_TalkAngry, ANIM_Twink_Sad, 5, MSG_Peach_016E) + EVT_CALL(SetNpcVar, NPC_Ch7_Bowser, 0, 0) + EVT_THREAD + EVT_CALL(NpcFlyTo, NPC_PARTNER, 410, 80, 10, 7, 0, EASING_LINEAR) + EVT_LOOP(2) + EVT_CALL(NpcFlyTo, NPC_PARTNER, 400, 70, 10, 5, 0, EASING_LINEAR) + EVT_PLAY_EFFECT(EFFECT_LANDING_DUST, 0, 400, 70, 10, 0) + EVT_CALL(NpcFlyTo, NPC_PARTNER, 410, 80, 10, 5, 0, EASING_LINEAR) + EVT_END_LOOP + EVT_CALL(NpcFlyTo, NPC_PARTNER, 360, 80, 10, 7, 0, EASING_LINEAR) + EVT_LOOP(0) + EVT_CALL(NpcFlyTo, NPC_PARTNER, 360, 70, 10, 5, 0, EASING_LINEAR) + EVT_PLAY_EFFECT(EFFECT_LANDING_DUST, 0, 360, 70, 10, 0) + EVT_CALL(NpcFlyTo, NPC_PARTNER, 350, 80, 10, 5, 0, EASING_LINEAR) + EVT_CALL(GetNpcVar, NPC_Ch7_Bowser, 0, LVar0) + EVT_IF_EQ(LVar0, 1) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_CALL(SetNpcVar, NPC_Ch7_Bowser, 0, 2) + EVT_END_THREAD + EVT_CALL(SpeakToPlayer, NPC_Ch7_Bowser, ANIM_WorldBowser_Talk, ANIM_WorldBowser_Idle, 5, MSG_Peach_016F) + EVT_WAIT(20) + EVT_CALL(SpeakToPlayer, NPC_Ch7_Bowser, ANIM_WorldBowser_AngryTalk, ANIM_WorldBowser_Idle, 5, MSG_Peach_0170) + EVT_CALL(SetNpcVar, NPC_Ch7_Bowser, 0, 1) + EVT_LOOP(0) + EVT_WAIT(1) + EVT_CALL(GetNpcVar, NPC_Ch7_Bowser, 0, LVar0) + EVT_IF_EQ(LVar0, 2) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_CALL(SetNpcAnimation, NPC_Ch7_Bowser, ANIM_WorldBowser_Walk) + EVT_CALL(NpcMoveTo, NPC_Ch7_Bowser, 310, 20, 5) + EVT_CALL(SetNpcAnimation, NPC_Ch7_Bowser, ANIM_WorldBowser_Swipe) + EVT_WAIT(3) + EVT_CALL(InterpPlayerYaw, 90, 0) + EVT_CALL(PlaySoundAt, SOUND_HIT_PLAYER_NORMAL, 0, 350, 80, 10) + EVT_PLAY_EFFECT(EFFECT_FIREWORK, 0, 350, 80, 10, 1, 0) + EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_IGNORE_WORLD_COLLISION, TRUE) + EVT_CALL(SetNpcSpeed, NPC_PARTNER, EVT_FLOAT(7.5)) + EVT_CALL(NpcFlyTo, NPC_PARTNER, 500, 130, 10, 0, 0, EASING_LINEAR) + EVT_CALL(SpeakToPlayer, NPC_PLAYER, ANIM_Peach_C001E, ANIM_Peach_C001E, 5, MSG_Peach_0171) + EVT_WAIT(10) + EVT_CALL(SetNpcAnimation, NPC_Ch7_Bowser, ANIM_WorldBowser_Idle) + EVT_CALL(SpeakToPlayer, NPC_Ch7_Bowser, ANIM_WorldBowser_Talk, ANIM_WorldBowser_Idle, 5, MSG_Peach_0172) + EVT_WAIT(10) + EVT_CHILD_THREAD + EVT_LOOP(0) + EVT_CALL(NpcFacePlayer, NPC_Ch7_Bowser, 0) + EVT_WAIT(1) + EVT_END_LOOP + EVT_END_CHILD_THREAD + EVT_EXEC_WAIT(N(EVS_PickUpPeach)) + EVT_CALL(SpeakToPlayer, NPC_PLAYER, ANIM_Peach_D0008, ANIM_Peach_D0008, 5, MSG_Peach_0173) + EVT_EXEC_WAIT(N(EVS_CarryPeachAway)) + EVT_WAIT(30) + EVT_EXEC_WAIT(N(EVS_EndPeachChapter7)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 0) + EVT_CALL(EnablePartnerAI) + EVT_CALL(DisablePlayerPhysics, FALSE) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_kkj/kkj_14/kkj_14_1_music.c b/src/world/area_kkj/kkj_14/kkj_14_1_music.c new file mode 100644 index 0000000000..bb028eab3c --- /dev/null +++ b/src/world/area_kkj/kkj_14/kkj_14_1_music.c @@ -0,0 +1,19 @@ +#include "kkj_14.h" + +EvtScript N(EVS_SetupMusic) = { + EVT_SWITCH(GB_StoryProgress) + EVT_CASE_OR_EQ(STORY_CH0_BEGAN_PEACH_MISSION) + EVT_CASE_OR_EQ(STORY_CH1_BEGAN_PEACH_MISSION) + EVT_CASE_OR_EQ(STORY_CH3_BEGAN_PEACH_MISSION) + EVT_CALL(SetMusicTrack, 0, SONG_PRISONER_PEACH_THEME, 0, 8) + EVT_END_CASE_GROUP + EVT_CASE_OR_EQ(STORY_CH2_BEGAN_PEACH_MISSION) + EVT_CASE_OR_EQ(STORY_CH4_BEGAN_PEACH_MISSION) + EVT_CASE_OR_EQ(STORY_CH5_BEGAN_PEACH_MISSION) + EVT_CASE_OR_EQ(STORY_CH6_BEGAN_PEACH_MISSION) + EVT_CALL(SetMusicTrack, 0, SONG_PEACH_MISSION, 0, 8) + EVT_END_CASE_GROUP + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_kkj/kkj_14/kkj_14_2_main.c b/src/world/area_kkj/kkj_14/kkj_14_2_main.c new file mode 100644 index 0000000000..c5205d593f --- /dev/null +++ b/src/world/area_kkj/kkj_14/kkj_14_2_main.c @@ -0,0 +1,231 @@ +#include "kkj_14.h" + +#include "world/common/atomic/TexturePan.inc.c" +#include "../common/RestoreFromPeachState.inc.c" + +API_CALLABLE(N(EnableParasol)) { + gGameStatusPtr->peachFlags |= PEACH_STATUS_FLAG_HAS_PARASOL; + return ApiStatus_DONE2; +} + +Gfx N(setup_gfx_candle_lights)[] = { + gsDPPipeSync(), + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), + gsDPSetCycleType(G_CYC_2CYCLE), + gsDPSetTexturePersp(G_TP_PERSP), + gsDPSetTextureDetail(G_TD_CLAMP), + gsDPSetTextureLOD(G_TL_TILE), + gsDPSetTextureLUT(G_TT_NONE), + gsDPSetTextureFilter(G_TF_BILERP), + gsDPSetTextureConvert(G_TC_FILT), + gsDPSetPrimColor(0, 0, 75, 31, 19, 255), + gsDPSetEnvColor(255, 118, 77, 0), + gsDPSetCombineLERP(TEXEL0, TEXEL1, TEXEL0, 1, 1, TEXEL0, TEXEL1, 1, 0, PRIMITIVE, COMBINED, ENVIRONMENT, COMBINED, TEXEL1, TEXEL1, TEXEL1), + gsDPSetRenderMode(G_RM_PASS, G_RM_ZB_CLD_SURF2), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_SHADE | G_CULL_BACK | G_SHADING_SMOOTH), + gsSPEndDisplayList(), +}; + +EvtScript N(EVS_EndPeachChapter7) = { + EVT_SET(LVar0, GB_KKJ_LastPartner) + EVT_CALL(N(RestoreFromPeachState)) + EVT_CALL(PlaySound, SOUND_DC) + EVT_CALL(GotoMapSpecial, EVT_PTR("pra_01"), pra_01_ENTRY_4, TRANSITION_12) + EVT_WAIT(100) +}; + +EvtScript N(EVS_ExitDoor_GrandHall) = { + EVT_SET_GROUP(EVT_GROUP_1B) + EVT_CALL(DisablePlayerInput, TRUE) + EVT_SET(AF_KKJ_13, TRUE) + EVT_CALL(UseDoorSounds, DOOR_SOUNDS_BASIC) + EVT_SET(LVar0, kkj_14_ENTRY_0) + EVT_SET(LVar1, COLLIDER_ttw) + EVT_SET(LVar2, MODEL_o4) + EVT_SET(LVar3, DOOR_SWING_IN) + EVT_EXEC(ExitSingleDoor) + EVT_WAIT(17) + EVT_IF_EQ(GB_StoryProgress, STORY_INTRO) + EVT_CALL(GotoMap, EVT_PTR("kkj_01"), kkj_01_ENTRY_4) + EVT_ELSE + EVT_CALL(GotoMap, EVT_PTR("kkj_11"), kkj_11_ENTRY_4) + EVT_END_IF + EVT_WAIT(100) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_ExitDoors_Balcony) = { + EVT_SET_GROUP(EVT_GROUP_1B) + EVT_CALL(DisablePlayerInput, TRUE) + EVT_SET(AF_KKJ_13, FALSE) + EVT_CALL(UseDoorSounds, DOOR_SOUNDS_DOOR) + EVT_SET(LVar0, kkj_14_ENTRY_1) + EVT_SET(LVar1, COLLIDER_tte) + EVT_SET(LVar2, MODEL_o83) + EVT_SET(LVar3, MODEL_o85) + EVT_SET(LVar4, MODEL_o84) + EVT_SET(LVar5, MODEL_o86) + EVT_EXEC(ExitSplitDoubleDoor) + EVT_WAIT(17) + EVT_CALL(GotoMap, EVT_PTR("kkj_26"), kkj_26_ENTRY_0) + EVT_WAIT(100) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_ExitWalk_SecretPassage) = { + EVT_SET_GROUP(EVT_GROUP_1B) + EVT_SET(AF_KKJ_13, FALSE) + EVT_CALL(UseExitHeading, 60, kkj_14_ENTRY_2) + EVT_EXEC(ExitWalk) + EVT_IF_EQ(GF_KKJ14_SkipSecretPassage, FALSE) + EVT_CALL(GotoMap, EVT_PTR("kkj_27"), kkj_27_ENTRY_0) + EVT_ELSE + EVT_CALL(GotoMap, EVT_PTR("kkj_15"), kkj_15_ENTRY_1) + EVT_END_IF + EVT_WAIT(100) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_ShowMessage_CantOpen) = { + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(ShowMessageAtScreenPos, MSG_Menus_Inspect_DoesntOpen, 160, 40) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_BindExitTriggers) = { + EVT_IF_EQ(GB_StoryProgress, STORY_INTRO) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ShowMessage_CantOpen)), TRIGGER_WALL_PRESS_A, COLLIDER_tte, 1, 0) + EVT_ELSE + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitDoors_Balcony)), TRIGGER_WALL_PRESS_A, COLLIDER_tte, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_SecretPassage)), TRIGGER_FLOOR_ABOVE, COLLIDER_o119, 1, 0) + EVT_END_IF + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitDoor_GrandHall)), TRIGGER_WALL_PRESS_A, COLLIDER_ttw, 1, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_EnterMap) = { + EVT_CALL(GetEntryID, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_EQ(kkj_14_ENTRY_0) + EVT_CALL(UseDoorSounds, DOOR_SOUNDS_BASIC) + EVT_SET(LVar2, MODEL_o4) + EVT_SET(LVar3, DOOR_SWING_IN) + EVT_EXEC_WAIT(EnterSingleDoor) + EVT_EXEC(N(EVS_BindExitTriggers)) + EVT_CASE_EQ(kkj_14_ENTRY_1) + EVT_CALL(UseDoorSounds, DOOR_SOUNDS_DOOR) + EVT_SET(LVar2, MODEL_o83) + EVT_SET(LVar3, MODEL_o85) + EVT_SET(LVar4, MODEL_o84) + EVT_SET(LVar5, MODEL_o86) + EVT_EXEC_WAIT(EnterSplitDoubleDoor) + EVT_EXEC(N(EVS_BindExitTriggers)) + EVT_CASE_EQ(kkj_14_ENTRY_2) + EVT_SET(LVar0, EVT_PTR(N(EVS_BindExitTriggers))) + EVT_EXEC(EnterWalk) + EVT_CASE_EQ(kkj_14_ENTRY_3) + EVT_EXEC(N(EVS_Scene_Chapter0)) + EVT_CASE_EQ(kkj_14_ENTRY_4) + EVT_EXEC(N(EVS_Scene_Chapter1)) + EVT_EXEC(N(EVS_BindExitTriggers)) + EVT_CASE_EQ(kkj_14_ENTRY_5) + EVT_EXEC(N(EVS_Scene_Chapter2)) + EVT_EXEC(N(EVS_BindExitTriggers)) + EVT_CASE_EQ(kkj_14_ENTRY_6) + EVT_EXEC(N(EVS_Scene_Chapter3)) + EVT_EXEC(N(EVS_BindExitTriggers)) + EVT_CASE_EQ(kkj_14_ENTRY_7) + EVT_EXEC(N(EVS_Scene_Chapter4)) + EVT_EXEC(N(EVS_BindExitTriggers)) + EVT_CASE_EQ(kkj_14_ENTRY_8) + EVT_EXEC(N(EVS_Scene_Chapter5)) + EVT_EXEC(N(EVS_BindExitTriggers)) + EVT_CASE_EQ(kkj_14_ENTRY_9) + EVT_EXEC(N(EVS_Scene_Chapter6)) + EVT_EXEC(N(EVS_BindExitTriggers)) + EVT_CASE_EQ(kkj_14_ENTRY_A) + EVT_EXEC(N(EVS_Scene_Chapter7)) + EVT_CASE_EQ(kkj_14_ENTRY_B) + EVT_EXEC(N(EVS_Scene_TossedBackInRoom)) + EVT_EXEC(N(EVS_BindExitTriggers)) + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Main) = { + EVT_SET(GB_WorldLocation, LOCATION_PEACHS_CASTLE) + EVT_CALL(SetSpriteShading, SHADING_NONE) + EVT_SETUP_CAMERA_DEFAULT() + EVT_CALL(GetEntryID, LVar0) + EVT_IF_GE(LVar0, kkj_14_ENTRY_3) + EVT_IF_NE(LVar0, kkj_14_ENTRY_B) + EVT_SET(GF_KKJ14_RevealedButton, FALSE) + EVT_SET(GF_KKJ14_OpenedPassage, FALSE) + EVT_END_IF + EVT_SWITCH(LVar0) + EVT_CASE_EQ(kkj_14_ENTRY_3) + EVT_SET(GB_StoryProgress, STORY_CH0_BEGAN_PEACH_MISSION) + EVT_SET(GB_KKJ_CaughtCount, 0) + EVT_SET(GF_KKJ14_SkipSecretPassage, FALSE) + EVT_CALL(MakeNpcs, FALSE, EVT_PTR(N(Chapter0NPCs))) + EVT_CASE_EQ(kkj_14_ENTRY_4) + EVT_SET(GB_StoryProgress, STORY_CH1_BEGAN_PEACH_MISSION) + EVT_SET(GB_KKJ_CaughtCount, 0) + EVT_SET(GF_KKJ14_SkipSecretPassage, FALSE) + EVT_CASE_EQ(kkj_14_ENTRY_5) + EVT_SET(GB_StoryProgress, STORY_CH2_BEGAN_PEACH_MISSION) + EVT_SET(GB_KKJ_CaughtCount, 0) + EVT_SET(GF_KKJ14_SkipSecretPassage, FALSE) + EVT_SET(AF_KKJ_06, FALSE) + EVT_CALL(MakeNpcs, FALSE, EVT_PTR(N(Chapter2NPCs))) + EVT_CASE_EQ(kkj_14_ENTRY_6) + EVT_SET(GB_StoryProgress, STORY_CH3_BEGAN_PEACH_MISSION) + EVT_SET(GB_KKJ_CaughtCount, 0) + EVT_SET(GF_KKJ14_SkipSecretPassage, FALSE) + EVT_CASE_EQ(kkj_14_ENTRY_7) + EVT_SET(GB_StoryProgress, STORY_CH4_BEGAN_PEACH_MISSION) + EVT_SET(GB_KKJ_CaughtCount, 0) + EVT_SET(GF_KKJ14_SkipSecretPassage, TRUE) + EVT_CASE_EQ(kkj_14_ENTRY_8) + EVT_SET(GB_StoryProgress, STORY_CH5_BEGAN_PEACH_MISSION) + EVT_SET(GB_KKJ_CaughtCount, 0) + EVT_SET(GF_KKJ14_SkipSecretPassage, TRUE) + EVT_CASE_EQ(kkj_14_ENTRY_9) + EVT_CALL(N(EnableParasol)) + EVT_SET(GB_StoryProgress, STORY_CH6_BEGAN_PEACH_MISSION) + EVT_SET(GB_KKJ_CaughtCount, 0) + EVT_SET(GF_KKJ14_SkipSecretPassage, TRUE) + EVT_CASE_EQ(kkj_14_ENTRY_A) + EVT_CALL(MakeNpcs, FALSE, EVT_PTR(N(Chapter7NPCs))) + EVT_CASE_EQ(kkj_14_ENTRY_B) + EVT_ADD(GB_KKJ_CaughtCount, 1) + EVT_CALL(MakeNpcs, FALSE, EVT_PTR(N(TossBackNPCs))) + EVT_END_SWITCH + EVT_END_IF + EVT_EXEC(N(EVS_SetupInteractables)) + EVT_CALL(GetEntryID, LVar0) + EVT_IF_NE(LVar0, kkj_14_ENTRY_5) + EVT_EXEC(N(EVS_SetupMusic)) + EVT_END_IF + EVT_EXEC(N(EVS_EnterMap)) + EVT_CALL(SetTexPanner, MODEL_o154, TEX_PANNER_0) + EVT_THREAD + TEX_PAN_PARAMS_ID(TEX_PANNER_0) + TEX_PAN_PARAMS_STEP( 0, 0, 40, 900) + 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_CALL(SetModelCustomGfx, MODEL_o154, CUSTOM_GFX_0, FOG_MODE_UNCHANGED) + EVT_CALL(SetCustomGfx, CUSTOM_GFX_0, EVT_PTR(N(setup_gfx_candle_lights)), NULL) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_kkj/kkj_14/kkj_14_3_interactables.c b/src/world/area_kkj/kkj_14/kkj_14_3_interactables.c new file mode 100644 index 0000000000..c0cc8ef31a --- /dev/null +++ b/src/world/area_kkj/kkj_14/kkj_14_3_interactables.c @@ -0,0 +1,427 @@ +#include "kkj_14.h" +#include "effects.h" + +#include "world/common/todo/GetPeachDisguise.inc.c" + +EvtScript N(EVS_Inspect_Fireplace) = { + EVT_CALL(DisablePlayerInput, TRUE) + EVT_SWITCH(GB_StoryProgress) + EVT_CASE_EQ(STORY_CH1_BEGAN_PEACH_MISSION) + EVT_IF_EQ(GF_KKJ14_RevealedButton, FALSE) + EVT_IF_EQ(AF_KKJ_14, FALSE) + EVT_CALL(DisablePartnerAI, 0) + EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0000) + EVT_WAIT(10) + EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0026) + EVT_CALL(SpeakToPlayer, NPC_PLAYER, ANIM_Peach_C0001, ANIM_Peach_C0026, 5, MSG_Peach_0039) + EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_Twink_Talk, ANIM_Twink_Idle, 0, MSG_Peach_003A) + EVT_CALL(SpeakToPlayer, NPC_PLAYER, ANIM_Peach_C0001, ANIM_Peach_C0026, 5, MSG_Peach_003B) + EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0002) + EVT_WAIT(10) + EVT_CALL(SetPlayerAnimation, ANIM_Peach_A0001) + EVT_SET(AF_KKJ_14, TRUE) + EVT_CALL(EnablePartnerAI) + EVT_ELSE + EVT_CALL(ShowMessageAtScreenPos, MSG_Peach_017B, 160, 40) + EVT_END_IF + EVT_ELSE + EVT_CALL(ShowMessageAtScreenPos, MSG_Peach_017B, 160, 40) + EVT_END_IF + EVT_CASE_RANGE(STORY_CH2_BEGAN_PEACH_MISSION, STORY_CH7_BEGAN_PEACH_MISSION) + EVT_CALL(ShowMessageAtScreenPos, MSG_Peach_017B, 160, 40) + EVT_CASE_DEFAULT + EVT_CALL(ShowMessageAtScreenPos, MSG_Intro_0043, 160, 40) + EVT_END_SWITCH + EVT_CALL(DisablePlayerInput, FALSE) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Inspect_Dresses) = { + EVT_CALL(DisablePlayerInput, TRUE) + EVT_SWITCH(GB_StoryProgress) + EVT_CASE_EQ(STORY_CH1_BEGAN_PEACH_MISSION) + EVT_IF_EQ(GF_KKJ14_RevealedButton, FALSE) + EVT_IF_EQ(AF_KKJ_15, FALSE) + EVT_CALL(DisablePartnerAI, 0) + EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_Twink_Talk, ANIM_Twink_Idle, 0, MSG_Peach_003C) + EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0000) + EVT_WAIT(10) + EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0026) + EVT_CALL(SpeakToPlayer, NPC_PLAYER, ANIM_Peach_C0001, ANIM_Peach_C0026, 5, MSG_Peach_003D) + EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0002) + EVT_WAIT(10) + EVT_CALL(SetPlayerAnimation, ANIM_Peach_A0001) + EVT_SET(AF_KKJ_15, TRUE) + EVT_CALL(EnablePartnerAI) + EVT_ELSE + EVT_CALL(ShowMessageAtScreenPos, MSG_Peach_017C, 160, 40) + EVT_END_IF + EVT_ELSE + EVT_CALL(ShowMessageAtScreenPos, MSG_Peach_017C, 160, 40) + EVT_END_IF + EVT_CASE_RANGE(STORY_CH2_BEGAN_PEACH_MISSION, STORY_CH7_BEGAN_PEACH_MISSION) + EVT_CALL(ShowMessageAtScreenPos, MSG_Peach_017C, 160, 40) + EVT_CASE_DEFAULT + EVT_CALL(ShowMessageAtScreenPos, MSG_Intro_0044, 160, 40) + EVT_END_SWITCH + EVT_CALL(DisablePlayerInput, FALSE) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Inspect_Vanity) = { + EVT_CALL(DisablePlayerInput, TRUE) + EVT_SWITCH(GB_StoryProgress) + EVT_CASE_RANGE(STORY_CH1_BEGAN_PEACH_MISSION, STORY_CH7_BEGAN_PEACH_MISSION) + EVT_CALL(N(GetPeachDisguise), LVar0) + EVT_IF_EQ(LVar0, 0) + EVT_CALL(InterpPlayerYaw, 45, 10) + EVT_WAIT(10) + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_ADD(LVar0, 5) + EVT_ADD(LVar1, 35) + EVT_ADD(LVar2, -10) + EVT_LOOP(6) + EVT_PLAY_EFFECT(EFFECT_LANDING_DUST, 1, LVar0, LVar1, LVar2, 0) + EVT_WAIT(15) + EVT_END_LOOP + EVT_ELSE + EVT_CALL(DisablePartnerAI, 0) + EVT_CALL(SpeakToPlayer, NPC_PLAYER, ANIM_Peach_C0001, ANIM_Peach_C0026, 5, MSG_Peach_0044) + EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_Twink_Talk, ANIM_Twink_Idle, 0, MSG_Peach_0045) + EVT_CALL(EnablePartnerAI) + EVT_END_IF + EVT_CASE_DEFAULT + EVT_CALL(ShowMessageAtScreenPos, MSG_Intro_0045, 160, 40) + EVT_END_SWITCH + EVT_CALL(DisablePlayerInput, FALSE) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Inspect_Photo) = { + EVT_CALL(DisablePlayerInput, TRUE) + EVT_SWITCH(GB_StoryProgress) + EVT_CASE_EQ(STORY_CH1_BEGAN_PEACH_MISSION) + EVT_IF_EQ(GF_KKJ14_RevealedButton, FALSE) + EVT_IF_EQ(AF_KKJ_17, FALSE) + EVT_CALL(DisablePartnerAI, 0) + EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_Twink_Talk, ANIM_Twink_Idle, 0, MSG_Peach_003E) + EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0000) + EVT_WAIT(10) + EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0026) + EVT_CALL(SpeakToPlayer, NPC_PLAYER, ANIM_Peach_C0001, ANIM_Peach_C0026, 5, MSG_Peach_003F) + EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0002) + EVT_WAIT(10) + EVT_CALL(SetPlayerAnimation, ANIM_Peach_A0001) + EVT_SET(AF_KKJ_17, TRUE) + EVT_CALL(EnablePartnerAI) + EVT_ELSE + EVT_CALL(ShowMessageAtScreenPos, MSG_Peach_017D, 160, 40) + EVT_END_IF + EVT_ELSE + EVT_CALL(ShowMessageAtScreenPos, MSG_Peach_017D, 160, 40) + EVT_END_IF + EVT_CASE_RANGE(STORY_CH2_BEGAN_PEACH_MISSION, STORY_CH7_BEGAN_PEACH_MISSION) + EVT_CALL(ShowMessageAtScreenPos, MSG_Peach_017D, 160, 40) + EVT_CASE_DEFAULT + EVT_CALL(ShowMessageAtScreenPos, MSG_Intro_0046, 160, 40) + EVT_END_SWITCH + EVT_CALL(DisablePlayerInput, FALSE) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Inspect_Bed) = { + EVT_CALL(DisablePlayerInput, TRUE) + EVT_SWITCH(GB_StoryProgress) + EVT_CASE_EQ(STORY_CH1_BEGAN_PEACH_MISSION) + EVT_IF_EQ(GF_KKJ14_RevealedButton, FALSE) + EVT_IF_EQ(AF_KKJ_18, FALSE) + EVT_CALL(DisablePartnerAI, 0) + EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0000) + EVT_WAIT(10) + EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0026) + EVT_CALL(SpeakToPlayer, NPC_PLAYER, ANIM_Peach_C0001, ANIM_Peach_C0026, 5, MSG_Peach_0040) + EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_Twink_Talk, ANIM_Twink_Idle, 0, MSG_Peach_0041) + EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0002) + EVT_WAIT(10) + EVT_CALL(SetPlayerAnimation, ANIM_Peach_A0001) + EVT_SET(AF_KKJ_18, TRUE) + EVT_CALL(EnablePartnerAI) + EVT_ELSE + EVT_CALL(ShowMessageAtScreenPos, MSG_Peach_017E, 160, 40) + EVT_END_IF + EVT_ELSE + EVT_CALL(ShowMessageAtScreenPos, MSG_Peach_017E, 160, 40) + EVT_END_IF + EVT_CASE_RANGE(STORY_CH2_BEGAN_PEACH_MISSION, STORY_CH7_BEGAN_PEACH_MISSION) + EVT_CALL(ShowMessageAtScreenPos, MSG_Peach_017E, 160, 40) + EVT_CASE_DEFAULT + EVT_CALL(ShowMessageAtScreenPos, MSG_Intro_0047, 160, 40) + EVT_END_SWITCH + EVT_CALL(DisablePlayerInput, FALSE) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Inspect_Flowers) = { + EVT_CALL(DisablePlayerInput, TRUE) + EVT_SWITCH(GB_StoryProgress) + EVT_CASE_EQ(STORY_CH1_BEGAN_PEACH_MISSION) + EVT_IF_EQ(GF_KKJ14_RevealedButton, FALSE) + EVT_IF_EQ(AF_KKJ_19, FALSE) + EVT_CALL(DisablePartnerAI, 0) + EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0000) + EVT_WAIT(10) + EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0026) + EVT_CALL(SpeakToPlayer, NPC_PLAYER, ANIM_Peach_C0001, ANIM_Peach_C0026, 5, MSG_Peach_0042) + EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_Twink_Talk, ANIM_Twink_Idle, 0, MSG_Peach_0043) + EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0002) + EVT_WAIT(10) + EVT_CALL(SetPlayerAnimation, ANIM_Peach_A0001) + EVT_SET(AF_KKJ_19, TRUE) + EVT_CALL(EnablePartnerAI) + EVT_ELSE + EVT_CALL(ShowMessageAtScreenPos, MSG_Peach_017F, 160, 40) + EVT_END_IF + EVT_ELSE + EVT_CALL(ShowMessageAtScreenPos, MSG_Peach_017F, 160, 40) + EVT_END_IF + EVT_CASE_RANGE(STORY_CH2_BEGAN_PEACH_MISSION, STORY_CH7_BEGAN_PEACH_MISSION) + EVT_CALL(ShowMessageAtScreenPos, MSG_Peach_017F, 160, 40) + EVT_CASE_DEFAULT + EVT_CALL(ShowMessageAtScreenPos, MSG_Intro_0048, 160, 40) + EVT_END_SWITCH + EVT_CALL(DisablePlayerInput, FALSE) + EVT_RETURN + EVT_END +}; + +s32 N(FireplaceAlpha) = 255; + +API_CALLABLE(N(SetFireplaceAlpha)) { + Bytecode* args = script->ptrReadPos; + + N(FireplaceAlpha) = evt_get_variable(script, *args++); + return ApiStatus_DONE2; +} + +void N(setup_gfx_fireplace)(void) { + gDPSetCycleType(gMasterGfxPos++, G_CYC_2CYCLE); + gDPSetRenderMode(gMasterGfxPos++, G_RM_PASS, G_RM_AA_ZB_XLU_SURF2); + gDPSetCombineLERP(gMasterGfxPos++, TEXEL0, 0, TEXEL1, 0, TEXEL0, 0, TEXEL1, 0, 0, 0, 0, COMBINED, 0, 0, 0, PRIMITIVE); + gDPSetPrimColor(gMasterGfxPos++, 0, 0, 0, 0, 0, N(FireplaceAlpha)); +} + +EvtScript N(EVS_TexPan_Fireplace) = { + EVT_CALL(EnableTexPanning, MODEL_o42, TRUE) + EVT_CALL(EnableTexPanning, MODEL_o157, TRUE) + EVT_SET(LVar0, 0) + EVT_SET(LVar1, 0) + EVT_SET(LVar2, 0) + EVT_SET(LVar3, 0) + EVT_LOOP(0) + EVT_ADD(LVar0, -110) + EVT_ADD(LVar1, 50) + EVT_CALL(SetTexPanOffset, TEX_PANNER_5, TEX_PANNER_MAIN, LVar0, LVar1) + EVT_ADD(LVar2, 40) + EVT_ADD(LVar3, 130) + EVT_CALL(SetTexPanOffset, TEX_PANNER_A, TEX_PANNER_AUX, LVar2, LVar3) + EVT_WAIT(1) + EVT_END_LOOP + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_RevealButton) = { + EVT_CALL(PlaySoundAtCollider, COLLIDER_o128, SOUND_F9, 0) + EVT_CALL(MakeLerp, 0, 180, 15, EASING_LINEAR) + EVT_CALL(UpdateLerp) + EVT_CALL(RotateGroup, MODEL_g39, LVar0, 1, 0, 0) + EVT_WAIT(1) + EVT_CALL(EnableModel, MODEL_o146, TRUE) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_CALL(RotateGroup, MODEL_g39, LVar0, 1, 0, 0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_CALL(EnableModel, MODEL_o141, FALSE) + EVT_CALL(EnableModel, MODEL_o143, FALSE) + EVT_SET(GF_KKJ14_RevealedButton, TRUE) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_OpenHiddenPassage) = { + EVT_CALL(EnableModel, MODEL_o35, FALSE) + EVT_CALL(EnableModel, MODEL_o42, FALSE) + EVT_CALL(EnableGroup, MODEL_g27, TRUE) + EVT_IF_EQ(GB_StoryProgress, STORY_CH1_BEGAN_PEACH_MISSION) + EVT_SET(LVar0, 120) + EVT_ELSE + EVT_SET(LVar0, 60) + EVT_END_IF + EVT_CALL(PlaySoundAtCollider, COLLIDER_o129, SOUND_FC, 0) + EVT_CALL(MakeLerp, 255, 0, LVar0, EASING_LINEAR) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_CALL(N(SetFireplaceAlpha), LVar0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_CALL(EnableModel, MODEL_o157, FALSE) + EVT_CALL(SetModelFlags, MODEL_o157, 16, FALSE) + EVT_WAIT(10) + EVT_THREAD + EVT_WAIT(20) + EVT_CALL(PlaySoundAt, SOUND_FB, 0, -125, 10, -120) + EVT_PLAY_EFFECT(EFFECT_SMOKE_BURST, 0, -125, 10, -120, EVT_FLOAT(2.0), 30) + EVT_END_THREAD + EVT_CALL(MakeLerp, 0, -180, 30, EASING_QUADRATIC_IN) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_CALL(RotateModel, MODEL_o39, LVar0, 1, 0, 0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_WAIT(10) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o129, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o130, COLLIDER_FLAGS_UPPER_MASK) + EVT_SET(GF_KKJ14_OpenedPassage, TRUE) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Inspect_HiddenButton) = { + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(DisablePlayerPhysics, TRUE) + EVT_CALL(DisablePartnerAI, 0) + EVT_IF_EQ(GF_KKJ14_RevealedButton, FALSE) + EVT_EXEC_WAIT(N(EVS_RevealButton)) + EVT_ELSE + EVT_CALL(FacePlayerTowardPoint, -29, -148, 5) + EVT_WAIT(10) + EVT_CALL(SetPlayerAnimation, ANIM_Peach_D0010) + EVT_WAIT(10) + EVT_CALL(SetPlayerAnimation, ANIM_Peach_D0011) + EVT_THREAD + EVT_WAIT(5) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o128, SOUND_FA, 0) + EVT_END_THREAD + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_CALL(SetPlayerJumpscale, EVT_FLOAT(1.0)) + EVT_CALL(PlayerJump1, LVar0, LVar1, LVar2, 10) + EVT_CALL(SetPlayerAnimation, ANIM_Peach_D0012) + EVT_WAIT(20) + EVT_CALL(SetPlayerAnimation, ANIM_Peach_A0001) + EVT_CALL(InterpPlayerYaw, 225, 0) + EVT_CALL(InterpNpcYaw, NPC_PARTNER, 270, 0) + EVT_EXEC_WAIT(N(EVS_OpenHiddenPassage)) + EVT_UNBIND + EVT_END_IF + EVT_CALL(EnablePartnerAI) + EVT_CALL(DisablePlayerPhysics, FALSE) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Inspect_HiddenButton_FirstTime) = { + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(DisablePlayerPhysics, TRUE) + EVT_CALL(DisablePartnerAI, 0) + EVT_IF_EQ(GF_KKJ14_RevealedButton, FALSE) + EVT_IF_EQ(AF_KKJ_04, FALSE) + EVT_CALL(NpcFacePlayer, NPC_PARTNER, 0) + EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_Twink_Shout, ANIM_Twink_Shout, 5, MSG_Peach_0046) + EVT_SET(AF_KKJ_04, TRUE) + EVT_END_IF + EVT_EXEC_WAIT(N(EVS_RevealButton)) + EVT_ELSE + EVT_CALL(FacePlayerTowardPoint, -29, -148, 5) + EVT_WAIT(10) + EVT_CALL(SetPlayerAnimation, ANIM_Peach_D0010) + EVT_WAIT(10) + EVT_CALL(SetPlayerAnimation, ANIM_Peach_D0011) + EVT_THREAD + EVT_WAIT(5) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o128, SOUND_FA, 0) + EVT_END_THREAD + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_CALL(SetPlayerJumpscale, EVT_FLOAT(1.0)) + EVT_CALL(PlayerJump1, LVar0, LVar1, LVar2, 10) + EVT_CALL(SetPlayerAnimation, ANIM_Peach_D0012) + EVT_WAIT(20) + EVT_CALL(SetPlayerAnimation, ANIM_Peach_A0001) + EVT_CALL(InterpPlayerYaw, 225, 0) + EVT_CALL(InterpNpcYaw, NPC_PARTNER, 225, 0) + EVT_IF_EQ(AF_KKJ_05, FALSE) + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_CALL(SetPanTarget, CAM_DEFAULT, -120, 25, 0) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(3.0)) + EVT_CALL(SetCamDistance, CAM_DEFAULT, 300) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_END_IF + EVT_EXEC_WAIT(N(EVS_OpenHiddenPassage)) + EVT_IF_EQ(AF_KKJ_05, FALSE) + EVT_CALL(ResetCam, CAM_DEFAULT, EVT_FLOAT(3.0)) + EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0009) + EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_Twink_ShoutJoy, ANIM_Twink_ShoutJoy, 5, MSG_Peach_0047) + EVT_SET(AF_KKJ_05, TRUE) + EVT_END_IF + EVT_UNBIND + EVT_END_IF + EVT_CALL(EnablePartnerAI) + EVT_CALL(DisablePlayerPhysics, FALSE) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_SetupInteractables) = { + EVT_IF_EQ(GF_KKJ14_RevealedButton, FALSE) + EVT_CALL(EnableModel, MODEL_o146, FALSE) + EVT_ELSE + EVT_CALL(EnableModel, MODEL_o141, FALSE) + EVT_CALL(EnableModel, MODEL_o143, FALSE) + EVT_CALL(RotateGroup, MODEL_g39, 180, 1, 0, 0) + EVT_END_IF + EVT_IF_EQ(GF_KKJ14_OpenedPassage, FALSE) + EVT_CALL(EnableGroup, MODEL_g27, FALSE) + EVT_EXEC(N(EVS_TexPan_Fireplace)) + EVT_CALL(SetModelCustomGfx, MODEL_o157, CUSTOM_GFX_1, FOG_MODE_UNCHANGED) + EVT_CALL(SetCustomGfxBuilders, CUSTOM_GFX_1, EVT_PTR(N(setup_gfx_fireplace)), NULL) + EVT_SWITCH(GB_StoryProgress) + EVT_CASE_LT(STORY_CH0_WAKE_UP) + EVT_CASE_LT(STORY_CH2_BEGAN_PEACH_MISSION) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_Inspect_HiddenButton_FirstTime)), TRIGGER_WALL_PRESS_A, COLLIDER_o128, 1, 0) + EVT_CASE_LT(STORY_CH8_REACHED_PEACHS_CASTLE) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_Inspect_HiddenButton)), TRIGGER_WALL_PRESS_A, COLLIDER_o128, 1, 0) + EVT_CASE_DEFAULT + EVT_END_SWITCH + EVT_ELSE + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o129, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o130, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(RotateModel, MODEL_o39, -180, 1, 0, 0) + EVT_CALL(EnableGroup, MODEL_g45, FALSE) + EVT_END_IF + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_Inspect_Fireplace)), TRIGGER_WALL_PRESS_A, COLLIDER_o129, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_Inspect_Dresses)), TRIGGER_WALL_PRESS_A, COLLIDER_o143, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_Inspect_Vanity)), TRIGGER_WALL_PRESS_A, COLLIDER_o142, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_Inspect_Photo)), TRIGGER_WALL_PRESS_A, COLLIDER_o141, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_Inspect_Bed)), TRIGGER_WALL_PRESS_A, COLLIDER_o25, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_Inspect_Flowers)), TRIGGER_WALL_PRESS_A, COLLIDER_o135, 1, 0) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_kkj/kkj_14/kkj_14_4_npc_guards.c b/src/world/area_kkj/kkj_14/kkj_14_4_npc_guards.c new file mode 100644 index 0000000000..e3a9364a85 --- /dev/null +++ b/src/world/area_kkj/kkj_14/kkj_14_4_npc_guards.c @@ -0,0 +1,231 @@ +#include "kkj_14.h" +#include "effects.h" + +Vec3f N(PeachTossPath)[] = { + { -307.0, 30.0, -30.0 }, + { -290.0, 35.0, -30.0 }, + { -250.0, 0.0, -30.0 }, +}; + +Vec3f N(TwinkFollowPath)[] = { + { -480.0, 30.0, -30.0 }, + { -360.0, 60.0, -30.0 }, + { -340.0, 120.0, -70.0 }, + { -380.0, 40.0, -100.0 }, +}; + +Vec3f N(TwinkApproachPath)[] = { + { -380.0, 40.0, -100.0 }, + { -360.0, 45.0, -82.0 }, + { -340.0, 40.0, -65.0 }, + { -320.0, 32.0, -52.0 }, + { -290.0, 25.0, -30.0 }, +}; + +EvtScript N(EVS_Scene_TossedBackInRoom) = { + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(DisablePlayerPhysics, TRUE) + EVT_CALL(SetMusicTrack, 0, SONG_PEACH_CAUGHT, 0, 8) + EVT_CALL(SetPlayerPos, -480, 30, -30) + EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0018) + EVT_CALL(DisablePartnerAI, 0) + EVT_CALL(SetNpcPos, NPC_PARTNER, -480, 30, -30) + EVT_CALL(SetNpcPos, NPC_Koopatrol_Guard_01, -492, 0, -30) + EVT_CALL(SetNpcPos, NPC_Koopatrol_Guard_02, -460, 0, -30) + EVT_CALL(SetNpcYaw, NPC_Koopatrol_Guard_01, 90) + EVT_CALL(SetNpcYaw, NPC_Koopatrol_Guard_02, 90) + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, -300, 0, -30) + EVT_CALL(SetPanTarget, CAM_DEFAULT, -300, 0, -30) + 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(30) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_ttw, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o112, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(PlaySoundAtCollider, COLLIDER_ttw, SOUND_BASIC_DOOR_OPEN, 0) + EVT_CALL(MakeLerp, 0, 80, 14, EASING_QUADRATIC_OUT) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_CALL(RotateModel, MODEL_o4, LVar0, 0, 1, 0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_THREAD + EVT_WAIT(10) + EVT_CALL(LoadPath, 50, EVT_PTR(N(TwinkFollowPath)), ARRAY_COUNT(N(TwinkFollowPath)), EASING_LINEAR) + EVT_LOOP(0) + EVT_CALL(GetNextPathPos) + EVT_CALL(SetNpcPos, NPC_PARTNER, LVar1, LVar2, LVar3) + EVT_WAIT(1) + EVT_IF_EQ(LVar0, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_CALL(InterpNpcYaw, NPC_PARTNER, 90, 0) + EVT_END_THREAD + EVT_CALL(SetNpcVar, NPC_Koopatrol_Guard_01, 0, 1) + EVT_THREAD + EVT_CALL(SetNpcAnimation, NPC_Koopatrol_Guard_01, ANIM_WorldKoopatrol_Anim14) + EVT_CALL(SetNpcSpeed, NPC_Koopatrol_Guard_01, EVT_FLOAT(5.0)) + EVT_CALL(NpcMoveTo, NPC_Koopatrol_Guard_01, -316, -32, 0) + EVT_CALL(SetNpcVar, NPC_Koopatrol_Guard_01, 0, 0) + EVT_END_THREAD + EVT_THREAD + EVT_CALL(SetNpcAnimation, NPC_Koopatrol_Guard_02, ANIM_WorldKoopatrol_Anim14) + EVT_CALL(SetNpcSpeed, NPC_Koopatrol_Guard_02, EVT_FLOAT(5.0)) + EVT_CALL(NpcMoveTo, NPC_Koopatrol_Guard_02, -284, -28, 0) + EVT_END_THREAD + EVT_LOOP(0) + EVT_CALL(GetNpcPos, NPC_Koopatrol_Guard_01, LVar0, LVar1, LVar2) + EVT_ADD(LVar0, 10) + EVT_ADD(LVar2, 2) + EVT_CALL(SetPlayerPos, LVar0, 30, LVar2) + EVT_WAIT(1) + EVT_CALL(GetNpcVar, NPC_Koopatrol_Guard_01, 0, LVar0) + EVT_IF_EQ(LVar0, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_CALL(SetNpcAnimation, NPC_Koopatrol_Guard_01, ANIM_WorldKoopatrol_Anim12) + EVT_CALL(SetNpcAnimation, NPC_Koopatrol_Guard_02, ANIM_WorldKoopatrol_Anim12) + EVT_WAIT(20) + EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0019) + EVT_CALL(SetNpcAnimation, NPC_Koopatrol_Guard_01, ANIM_WorldKoopatrol_Anim15) + EVT_CALL(SetNpcAnimation, NPC_Koopatrol_Guard_02, ANIM_WorldKoopatrol_Anim15) + EVT_CALL(LoadPath, 15, EVT_PTR(N(PeachTossPath)), ARRAY_COUNT(N(PeachTossPath)), EASING_LINEAR) + EVT_LOOP(0) + EVT_CALL(GetNextPathPos) + EVT_CALL(SetPlayerPos, LVar1, LVar2, LVar3) + EVT_WAIT(1) + EVT_IF_EQ(LVar0, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_CALL(PlaySoundAtPlayer, SOUND_162, 0) + EVT_CALL(SetPlayerAnimation, ANIM_Peach_C001A) + EVT_THREAD + EVT_ADD(LVar1, 10) + EVT_PLAY_EFFECT(EFFECT_LANDING_DUST, 1, LVar1, LVar2, LVar3, 0) + EVT_WAIT(47) + EVT_ADD(LVar1, -5) + EVT_ADD(LVar2, 10) + EVT_ADD(LVar3, 5) + EVT_LOOP(4) + EVT_PLAY_EFFECT(EFFECT_WALKING_DUST, 1, LVar1, LVar2, LVar3, 0, 0) + EVT_WAIT(10) + EVT_END_LOOP + EVT_END_THREAD + EVT_THREAD + EVT_CALL(SetNpcAnimation, NPC_Koopatrol_Guard_01, ANIM_WorldKoopatrol_Anim01) + EVT_WAIT(20) + EVT_CALL(SetNpcAnimation, NPC_Koopatrol_Guard_01, ANIM_WorldKoopatrol_Anim06) + EVT_CALL(NpcMoveTo, NPC_Koopatrol_Guard_01, -462, -30, 0) + EVT_CALL(SetNpcPos, NPC_Koopatrol_Guard_01, NPC_DISPOSE_LOCATION) + EVT_END_THREAD + EVT_THREAD + EVT_CALL(SetNpcAnimation, NPC_Koopatrol_Guard_02, ANIM_WorldKoopatrol_Anim01) + EVT_WAIT(20) + EVT_CALL(SetNpcAnimation, NPC_Koopatrol_Guard_02, ANIM_WorldKoopatrol_Anim06) + EVT_CALL(NpcMoveTo, NPC_Koopatrol_Guard_02, -430, -30, 0) + EVT_CALL(SetNpcPos, NPC_Koopatrol_Guard_02, NPC_DISPOSE_LOCATION) + EVT_CALL(MakeLerp, 120, 0, 8, EASING_LINEAR) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_CALL(RotateModel, MODEL_o4, LVar0, 0, 1, 0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_CLEAR_BITS, COLLIDER_o112, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_CLEAR_BITS, COLLIDER_ttw, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(PlaySoundAtCollider, COLLIDER_ttw, SOUND_BASIC_DOOR_CLOSE, 0) + EVT_END_THREAD + EVT_WAIT(60) + EVT_CALL(LoadPath, 50, EVT_PTR(N(TwinkApproachPath)), ARRAY_COUNT(N(TwinkApproachPath)), EASING_LINEAR) + EVT_LOOP(0) + EVT_CALL(GetNextPathPos) + EVT_CALL(SetNpcPos, NPC_PARTNER, LVar1, LVar2, LVar3) + EVT_WAIT(1) + EVT_IF_EQ(LVar0, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_CALL(InterpNpcYaw, NPC_PARTNER, 90, 0) + EVT_CALL(SetPlayerAnimation, ANIM_Peach_A0001) + EVT_IF_EQ(GB_StoryProgress, STORY_CH6_BEGAN_PEACH_MISSION) + EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_Twink_Talk, ANIM_Twink_Idle, 0, MSG_Peach_0159) + EVT_CALL(SpeakToPlayer, NPC_PLAYER, ANIM_Peach_C0013, ANIM_Peach_C0012, 5, MSG_Peach_015A) + EVT_IF_LT(GB_KKJ_CaughtCount, 3) + EVT_IF_EQ(AF_KKJ_13, FALSE) + EVT_SET(LVar0, MSG_Peach_015B) + EVT_ELSE + EVT_SET(LVar0, MSG_Peach_015D) + EVT_END_IF + EVT_ELSE + EVT_SET(LVar0, MSG_Peach_015C) + EVT_END_IF + EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_Twink_Talk, ANIM_Twink_Idle, 0, LVar0) + EVT_ELSE + EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_Twink_Talk, ANIM_Twink_Idle, 0, MSG_Peach_0176) + EVT_CALL(SpeakToPlayer, NPC_PLAYER, ANIM_Peach_C0013, ANIM_Peach_C0012, 5, MSG_Peach_0177) + EVT_IF_LT(GB_KKJ_CaughtCount, 3) + EVT_IF_EQ(AF_KKJ_13, FALSE) + EVT_SET(LVar0, MSG_Peach_0178) + EVT_ELSE + EVT_SET(LVar0, MSG_Peach_017A) + EVT_END_IF + EVT_ELSE + EVT_SET(LVar0, MSG_Peach_0179) + EVT_END_IF + EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_Twink_Talk, ANIM_Twink_Idle, 0, LVar0) + EVT_END_IF + EVT_EXEC(N(EVS_SetupMusic)) + EVT_CALL(ResetCam, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_CALL(EnablePartnerAI) + EVT_CALL(DisablePlayerPhysics, FALSE) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_RETURN + EVT_END +}; + +#include "world/common/enemy/Koopatrol_Stationary.inc.c" + +AnimID N(ExtraAnims_Koopatrol)[] = { + ANIM_WorldKoopatrol_Anim01, + ANIM_WorldKoopatrol_Anim06, + ANIM_WorldKoopatrol_Anim12, + ANIM_WorldKoopatrol_Anim14, + ANIM_WorldKoopatrol_Anim15, + ANIM_LIST_END +}; + +NpcData N(NpcData_Guards)[] = { + { + .id = NPC_Koopatrol_Guard_01, + .pos = { 0.0f, -500.0f, 0.0f }, + .yaw = 0, + .settings = &N(NpcSettings_Koopatrol_Stationary), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = NO_DROPS, + .animations = KOOPATROL_ANIMS, + .extraAnimations = N(ExtraAnims_Koopatrol), + }, + { + .id = NPC_Koopatrol_Guard_02, + .pos = { 0.0f, -500.0f, 0.0f }, + .yaw = 0, + .settings = &N(NpcSettings_Koopatrol_Stationary), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = NO_DROPS, + .animations = KOOPATROL_ANIMS, + .extraAnimations = N(ExtraAnims_Koopatrol), + }, +}; + +NpcGroupList N(TossBackNPCs) = { + NPC_GROUP(N(NpcData_Guards)), + {} +}; diff --git a/src/world/area_kkj/kkj_14/kkj_14_5_npc_ch0.c b/src/world/area_kkj/kkj_14/kkj_14_5_npc_ch0.c new file mode 100644 index 0000000000..52e8813b13 --- /dev/null +++ b/src/world/area_kkj/kkj_14/kkj_14_5_npc_ch0.c @@ -0,0 +1,55 @@ +#include "kkj_14.h" + +#define NAME_SUFFIX _Ch0 + +#include "world/common/npc/Bowser.inc.c" +#include "world/common/enemy/Kammy.inc.c" + +AnimID N(ExtraAnims_Bowser)[] = { + ANIM_WorldBowser_Still, + ANIM_WorldBowser_Idle, + ANIM_WorldBowser_BrandishIdle, + ANIM_WorldBowser_Walk, + ANIM_WorldBowser_Talk, + ANIM_WorldBowser_TalkEyesClosed, + ANIM_WorldBowser_BrandishTalk, + ANIM_WorldBowser_Brandish, + ANIM_LIST_END +}; + +AnimID N(ExtraAnims_Kammy)[] = { + ANIM_WorldKammy_Anim01, + ANIM_WorldKammy_Anim02, + ANIM_WorldKammy_Anim04, + ANIM_LIST_END +}; + +NpcData N(NpcData_Characters)[] = { + { + .id = NPC_Bowser, + .pos = { 0.0f, -500.0f, 0.0f }, + .yaw = 270, + .settings = &N(NpcSettings_Bowser), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = NO_DROPS, + .animations = BOWSER_ANIMS, + .extraAnimations = N(ExtraAnims_Bowser), + }, + { + .id = NPC_Kammy, + .pos = { 0.0f, -500.0f, 0.0f }, + .yaw = 270, + .settings = &N(NpcSettings_Kammy), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = NO_DROPS, + .animations = KAMMY_ANIMS, + .extraAnimations = N(ExtraAnims_Kammy), + }, +}; + +#define NAME_SUFFIX + +NpcGroupList N(Chapter0NPCs) = { + NPC_GROUP(N(NpcData_Characters_Ch0)), + {} +}; diff --git a/src/world/area_kkj/kkj_14/kkj_14_6_npc_ch2.c b/src/world/area_kkj/kkj_14/kkj_14_6_npc_ch2.c new file mode 100644 index 0000000000..e6b490d409 --- /dev/null +++ b/src/world/area_kkj/kkj_14/kkj_14_6_npc_ch2.c @@ -0,0 +1,56 @@ +#include "kkj_14.h" + +#define NAME_SUFFIX _Ch2 + +#include "world/common/npc/Bowser.inc.c" +#include "world/common/enemy/Kammy.inc.c" + +AnimID N(ExtraAnims_Bowser)[] = { + ANIM_WorldBowser_Still, + ANIM_WorldBowser_Idle, + ANIM_WorldBowser_Walk, + ANIM_WorldBowser_Run, + ANIM_WorldBowser_Talk, + ANIM_WorldBowser_TalkEyesClosed, + ANIM_WorldBowser_ArmsCrossed, + ANIM_WorldBowser_Shock, + ANIM_LIST_END +}; + +AnimID N(ExtraAnims_Kammy)[] = { + ANIM_WorldKammy_Anim01, + ANIM_WorldKammy_Anim02, + ANIM_WorldKammy_Anim03, + ANIM_WorldKammy_Anim04, + ANIM_LIST_END +}; + +NpcData N(NpcData_Characters)[] = { + { + .id = NPC_Bowser, + .pos = { 0.0f, -500.0f, 0.0f }, + .yaw = 270, + .settings = &N(NpcSettings_Bowser), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = NO_DROPS, + .animations = BOWSER_ANIMS, + .extraAnimations = N(ExtraAnims_Bowser), + }, + { + .id = NPC_Kammy, + .pos = { 0.0f, -500.0f, 0.0f }, + .yaw = 270, + .settings = &N(NpcSettings_Kammy), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = NO_DROPS, + .animations = KAMMY_ANIMS, + .extraAnimations = N(ExtraAnims_Kammy), + }, +}; + +#define NAME_SUFFIX + +NpcGroupList N(Chapter2NPCs) = { + NPC_GROUP(N(NpcData_Characters_Ch2)), + {} +}; diff --git a/src/world/area_kkj/kkj_14/kkj_14_7_npc_ch7.c b/src/world/area_kkj/kkj_14/kkj_14_7_npc_ch7.c new file mode 100644 index 0000000000..f9f516c1a5 --- /dev/null +++ b/src/world/area_kkj/kkj_14/kkj_14_7_npc_ch7.c @@ -0,0 +1,90 @@ +#include "kkj_14.h" + +#define NAME_SUFFIX _Ch7 + +#include "world/common/npc/Bowser.inc.c" +#include "world/common/enemy/Kammy.inc.c" +#include "world/common/enemy/Koopatrol_Stationary.inc.c" + +AnimID N(ExtraAnims_Bowser)[] = { + ANIM_WorldBowser_Still, + ANIM_WorldBowser_Idle, + ANIM_WorldBowser_Walk, + ANIM_WorldBowser_Run, + ANIM_WorldBowser_Talk, + ANIM_WorldBowser_TalkEyesClosed, + ANIM_WorldBowser_AngryTalk, + ANIM_WorldBowser_Shock, + ANIM_WorldBowser_Swipe, + ANIM_LIST_END +}; + +AnimID N(ExtraAnims_Kammy)[] = { + ANIM_WorldKammy_Anim00, + ANIM_WorldKammy_Anim01, + ANIM_WorldKammy_Anim02, + ANIM_WorldKammy_Anim03, + ANIM_WorldKammy_Anim04, + ANIM_LIST_END +}; + +AnimID N(ExtraAnims_Koopatrol)[] = { + ANIM_WorldKoopatrol_Anim00, + ANIM_WorldKoopatrol_Anim01, + ANIM_WorldKoopatrol_Anim04, + ANIM_WorldKoopatrol_Anim06, + ANIM_WorldKoopatrol_Anim12, + ANIM_WorldKoopatrol_Anim14, + ANIM_WorldKoopatrol_Anim18, + ANIM_LIST_END +}; + +NpcData N(NpcData_Characters)[] = { + { + .id = NPC_Ch7_Bowser, + .pos = { 0.0f, -500.0f, 0.0f }, + .yaw = 270, + .settings = &N(NpcSettings_Bowser), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400, + .drops = NO_DROPS, + .animations = BOWSER_ANIMS, + .extraAnimations = N(ExtraAnims_Bowser), + }, + { + .id = NPC_Ch7_Koopatrol_01, + .pos = { 0.0f, -500.0f, 0.0f }, + .yaw = 0, + .settings = &N(NpcSettings_Koopatrol_Stationary), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400, + .drops = NO_DROPS, + .animations = KOOPATROL_ANIMS, + .extraAnimations = N(ExtraAnims_Koopatrol), + }, + { + .id = NPC_Ch7_Koopatrol_02, + .pos = { 0.0f, -500.0f, 0.0f }, + .yaw = 0, + .settings = &N(NpcSettings_Koopatrol_Stationary), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400, + .drops = NO_DROPS, + .animations = KOOPATROL_ANIMS, + .extraAnimations = N(ExtraAnims_Koopatrol), + }, + { + .id = NPC_Ch7_Kammy, + .pos = { 0.0f, -500.0f, 0.0f }, + .yaw = 270, + .settings = &N(NpcSettings_Kammy), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400, + .drops = NO_DROPS, + .animations = KAMMY_ANIMS, + .extraAnimations = N(ExtraAnims_Kammy), + }, +}; + +#define NAME_SUFFIX + +NpcGroupList N(Chapter7NPCs) = { + NPC_GROUP(N(NpcData_Characters_Ch7)), + {} +}; diff --git a/src/world/area_kkj/kkj_14/kkj_14_8_chapter0.c b/src/world/area_kkj/kkj_14/kkj_14_8_chapter0.c new file mode 100644 index 0000000000..f313f41640 --- /dev/null +++ b/src/world/area_kkj/kkj_14/kkj_14_8_chapter0.c @@ -0,0 +1,493 @@ +#include "kkj_14.h" + +API_CALLABLE(N(SetPeachDepressed)) { + gGameStatusPtr->peachFlags |= PEACH_STATUS_FLAG_DEPRESSED; + return ApiStatus_DONE2; +} + +API_CALLABLE(N(ClearPeachDepressed)) { + gGameStatusPtr->peachFlags &= ~PEACH_STATUS_FLAG_DEPRESSED; + return ApiStatus_DONE2; +} + +Vec3f N(TwinkEnterPath)[] = { + { 520.0, 70.0, -62.0 }, + { 400.0, 57.0, 47.0 }, + { 300.0, 50.0, 40.0 }, + { 300.0, 50.0, -10.0 }, + { 320.0, 65.0, 0.0 }, +}; + +Vec3f N(TwinkExitPath)[] = { + { 352.0, 50.0, -2.0 }, + { 300.0, 85.0, 0.0 }, + { 350.0, 120.0, 0.0 }, + { 400.0, 105.0, -7.0 }, + { 430.0, 90.0, -15.0 }, +}; + +EvtScript N(EVS_OpenDoor_Ch0) = { + EVT_CALL(PlaySoundAtCollider, COLLIDER_ttw, SOUND_BASIC_DOOR_OPEN, 0) + EVT_CALL(MakeLerp, 0, 120, 14, EASING_COS_FAST_OVERSHOOT) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_CALL(RotateModel, MODEL_o4, LVar0, 0, 1, 0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_CloseDoor_Ch0) = { + EVT_CALL(MakeLerp, 120, 0, 8, EASING_COS_FAST_OVERSHOOT) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_CALL(RotateModel, MODEL_o4, LVar0, 0, 1, 0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_CALL(PlaySoundAtCollider, COLLIDER_ttw, SOUND_BASIC_DOOR_CLOSE, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_TwinkTappingOnGlassDoor) = { + EVT_LOOP(0) + EVT_CALL(NpcFlyTo, NPC_PARTNER, 520, 70, -60, 30, -10, EASING_LINEAR) + EVT_CALL(NpcFlyTo, NPC_PARTNER, 520, 70, -61, 10, -5, EASING_LINEAR) + EVT_CALL(PlaySoundAtNpc, NPC_PARTNER, SOUND_1D8, 0) + EVT_CALL(NpcFlyTo, NPC_PARTNER, 520, 70, -62, 10, -5, EASING_LINEAR) + EVT_CALL(PlaySoundAtNpc, NPC_PARTNER, SOUND_1D8, 0) + EVT_END_LOOP + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Scene_Chapter0) = { + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(N(SetPeachDepressed)) + EVT_CALL(SetPlayerAnimation, ANIM_Peach_C000E) + EVT_CALL(InterpPlayerYaw, 270, 0) + EVT_CALL(DisablePartnerAI, 0) + EVT_CALL(SetNpcPos, NPC_PARTNER, 520, 60, -35) + EVT_CALL(SetNpcPos, NPC_Bowser, -450, 0, -20) + EVT_CALL(SetNpcPos, NPC_Kammy, -510, 0, -20) + EVT_CALL(SetNpcYaw, NPC_Bowser, 90) + EVT_CALL(SetNpcYaw, NPC_Kammy, 90) + EVT_CALL(AdjustCam, CAM_DEFAULT, EVT_FLOAT(90.0), 20, 250, EVT_FLOAT(17.0), EVT_FLOAT(-11.0)) + EVT_WAIT(30) + EVT_CALL(SpeakToPlayer, NPC_PLAYER, ANIM_Peach_C000F, ANIM_Peach_C000E, 5, MSG_Peach_0016) + EVT_WAIT(5) + EVT_CALL(InterpPlayerYaw, 90, 5) + EVT_CALL(PlayerMoveTo, 20, 30, 30) + EVT_CALL(SpeakToPlayer, NPC_PLAYER, ANIM_Peach_C000F, ANIM_Peach_C000E, 5, MSG_Peach_0017) + EVT_WAIT(5) + EVT_CALL(InterpPlayerYaw, 270, 5) + EVT_CALL(PlayerMoveTo, -20, 30, 30) + EVT_CALL(SpeakToPlayer, NPC_PLAYER, ANIM_Peach_C000F, ANIM_Peach_C000E, 5, MSG_Peach_0018) + EVT_WAIT(5) + EVT_CALL(InterpPlayerYaw, 90, 5) + EVT_CALL(PlayerMoveTo, 20, 30, 30) + EVT_CALL(SpeakToPlayer, NPC_PLAYER, ANIM_Peach_C000F, ANIM_Peach_C000E, 5, MSG_Peach_0019) + EVT_WAIT(30) + EVT_CALL(N(ClearPeachDepressed)) + EVT_CALL(SetPlayerAnimation, ANIM_Peach_A0001) + EVT_CALL(PlaySoundAtPlayer, SOUND_262, 0) + EVT_CALL(ShowEmote, NPC_Bowser, EMOTE_EXCLAMATION, -45, 30, FALSE, 0, 0, 0, 0) + EVT_WAIT(10) + EVT_CALL(InterpPlayerYaw, 270, 3) + EVT_WAIT(15) + EVT_CALL(SetMusicTrack, 0, SONG_BOWSER_THEME, 0, 8) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(2.0)) + EVT_CALL(SetPanTarget, CAM_DEFAULT, -330, 0, 0) + EVT_CALL(SetCamPosA, CAM_DEFAULT, -330, 32) + EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_WAIT(3) + EVT_EXEC(N(EVS_OpenDoor_Ch0)) + EVT_WAIT(10) + EVT_CALL(SetNpcVar, NPC_Bowser, 0, 1) + EVT_THREAD + EVT_CALL(SetNpcAnimation, NPC_Bowser, ANIM_WorldBowser_Walk) + EVT_CALL(SetNpcSpeed, NPC_Bowser, EVT_FLOAT(3.0)) + EVT_CALL(NpcMoveTo, NPC_Bowser, -300, -20, 0) + EVT_CALL(NpcMoveTo, NPC_Bowser, -50, 30, 0) + EVT_CALL(SetNpcAnimation, NPC_Bowser, ANIM_WorldBowser_Idle) + EVT_CALL(SetNpcVar, NPC_Bowser, 0, 0) + EVT_END_THREAD + EVT_THREAD + EVT_CALL(SetNpcAnimation, NPC_Kammy, ANIM_WorldKammy_Anim02) + EVT_CALL(SetNpcSpeed, NPC_Kammy, EVT_FLOAT(3.0)) + EVT_CALL(NpcMoveTo, NPC_Kammy, -110, 30, 0) + EVT_CALL(SetNpcAnimation, NPC_Kammy, ANIM_WorldKammy_Anim01) + EVT_END_THREAD + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(90.0)) + EVT_THREAD + EVT_WAIT(40) + EVT_CALL(MakeLerp, 250, 300, 80, EASING_LINEAR) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_CALL(SetCamDistance, CAM_DEFAULT, LVar0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_END_THREAD + EVT_LOOP(0) + EVT_CALL(GetNpcPos, NPC_Bowser, LVar0, LVar1, LVar2) + EVT_ADD(LVar0, 10) + EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_WAIT(1) + EVT_CALL(GetNpcVar, NPC_Bowser, 0, LVar0) + EVT_IF_EQ(LVar0, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_WAIT(20) + EVT_CALL(SpeakToPlayer, NPC_Bowser, ANIM_WorldBowser_TalkEyesClosed, ANIM_WorldBowser_TalkEyesClosed, 0, MSG_Peach_001A) + EVT_CALL(SetNpcAnimation, NPC_Bowser, ANIM_WorldBowser_Idle) + EVT_WAIT(1) + EVT_CALL(EndSpeech, NPC_Bowser, ANIM_WorldBowser_Talk, ANIM_WorldBowser_Idle, 0) + EVT_CALL(SpeakToPlayer, NPC_Kammy, ANIM_WorldKammy_Anim04, ANIM_WorldKammy_Anim01, 0, MSG_Peach_001B) + EVT_CALL(SetNpcAnimation, NPC_Bowser, ANIM_WorldBowser_Brandish) + EVT_WAIT(10) + EVT_CALL(SpeakToPlayer, NPC_Bowser, ANIM_WorldBowser_BrandishTalk, ANIM_WorldBowser_BrandishIdle, 0, MSG_Peach_001C) + EVT_CALL(SetPlayerAnimation, ANIM_Peach_C000D) + EVT_CALL(SetNpcAnimation, NPC_Bowser, ANIM_WorldBowser_Idle) + EVT_CALL(EndSpeech, NPC_Bowser, ANIM_WorldBowser_BrandishTalk, ANIM_WorldBowser_BrandishIdle, 0) + EVT_CALL(SetPlayerAnimation, ANIM_Peach_A0001) + EVT_CALL(SpeakToPlayer, NPC_Kammy, ANIM_WorldKammy_Anim04, ANIM_WorldKammy_Anim01, 0, MSG_Peach_001D) + EVT_CALL(SpeakToPlayer, NPC_Bowser, ANIM_WorldBowser_Talk, ANIM_WorldBowser_Idle, 0, MSG_Peach_001E) + EVT_CALL(SpeakToPlayer, NPC_Kammy, ANIM_WorldKammy_Anim04, ANIM_WorldKammy_Anim01, 0, MSG_Peach_001F) + EVT_WAIT(15) + EVT_THREAD + EVT_CALL(SetNpcAnimation, NPC_Bowser, ANIM_WorldBowser_Walk) + EVT_CALL(NpcMoveTo, NPC_Bowser, -450, 30, 0) + EVT_END_THREAD + EVT_THREAD + EVT_CALL(InterpNpcYaw, NPC_Kammy, 270, 5) + EVT_WAIT(60) + EVT_CALL(SetNpcAnimation, NPC_Kammy, ANIM_WorldKammy_Anim02) + EVT_CALL(NpcMoveTo, NPC_Kammy, -510, 30, 0) + EVT_CALL(SetNpcAnimation, NPC_Kammy, ANIM_WorldKammy_Anim01) + EVT_END_THREAD + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_CALL(SetCamDistance, CAM_DEFAULT, EVT_FLOAT(300.0)) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(0.5)) + EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_CALL(FadeOutMusic, 0, 2000) + EVT_WAIT(60) + EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0000) + EVT_WAIT(10) + EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0026) + EVT_CALL(SpeakToPlayer, NPC_PLAYER, ANIM_Peach_C0001, ANIM_Peach_C0026, 5, MSG_Peach_0020) + EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0002) + EVT_WAIT(10) + EVT_CALL(SetPlayerAnimation, ANIM_Peach_A0001) + EVT_WAIT(20) + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_ADD(LVar0, 150) + EVT_CALL(PlaySoundAt, SOUND_1D8, 0, LVar0, LVar1, LVar2) + EVT_WAIT(10) + EVT_CALL(PlaySoundAt, SOUND_1D8, 0, LVar0, LVar1, LVar2) + EVT_WAIT(10) + EVT_CALL(PlaySoundAtPlayer, SOUND_263, 0) + EVT_CALL(ShowEmote, NPC_Bowser, EMOTE_QUESTION, -45, 20, FALSE, 0, 0, 0, 0) + EVT_WAIT(20) + EVT_CALL(InterpPlayerYaw, 135, 5) + EVT_WAIT(10) + EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0000) + EVT_WAIT(10) + EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0026) + EVT_CALL(SpeakToPlayer, NPC_PLAYER, ANIM_Peach_C0001, ANIM_Peach_C0026, 5, MSG_Peach_0021) + EVT_SET(AF_KKJ_03, FALSE) + EVT_EXEC_GET_TID(N(EVS_TwinkTappingOnGlassDoor), LVarA) + EVT_THREAD + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, 413, 0, -66) + EVT_CALL(SetCamType, CAM_DEFAULT, 4, FALSE) + EVT_CALL(SetCamPosA, CAM_DEFAULT, 338, 44) + EVT_CALL(SetCamPosB, CAM_DEFAULT, 413, -66) + 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_WAIT(10) + EVT_CALL(SetPlayerSpeed, EVT_FLOAT(3.0)) + EVT_CALL(PlayerMoveTo, 179, -4, 0) + EVT_CALL(PlayerMoveTo, 439, -16, 0) + EVT_SET(AF_KKJ_03, TRUE) + EVT_KILL_THREAD(LVarA) + EVT_CALL(InterpNpcYaw, NPC_PARTNER, 270, 0) + EVT_WAIT(15) + EVT_CALL(SetPlayerAnimation, ANIM_Peach_C000B) + EVT_CALL(PlaySoundAtCollider, COLLIDER_tte, SOUND_1CB, 0) + EVT_CALL(MakeLerp, 0, 80, 14, EASING_QUADRATIC_OUT) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_CALL(RotateModel, MODEL_o83, LVar0, 0, 1, 0) + EVT_CALL(RotateModel, MODEL_o85, LVar0, 0, -1, 0) + EVT_CALL(RotateModel, MODEL_o84, LVar0, 0, 1, 0) + EVT_CALL(RotateModel, MODEL_o86, LVar0, 0, -1, 0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_CALL(SetMusicTrack, 0, SONG_TWINK_THEME, 0, 8) + EVT_THREAD + EVT_CALL(LoadPath, 100, EVT_PTR(N(TwinkEnterPath)), ARRAY_COUNT(N(TwinkEnterPath)), EASING_LINEAR) + EVT_LOOP(0) + EVT_CALL(GetNextPathPos) + EVT_CALL(SetNpcPos, NPC_PARTNER, LVar1, LVar2, LVar3) + EVT_WAIT(1) + EVT_IF_EQ(LVar0, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_SET(AF_KKJ_03, FALSE) + EVT_END_THREAD + EVT_THREAD + EVT_LOOP(0) + EVT_CALL(GetNpcPos, NPC_PARTNER, LVar0, LVar1, LVar2) + EVT_IF_LT(LVar0, 310) + EVT_BREAK_LOOP + EVT_END_IF + EVT_WAIT(1) + EVT_END_LOOP + EVT_CALL(InterpNpcYaw, NPC_PARTNER, 90, 0) + EVT_END_THREAD + EVT_LOOP(0) + EVT_WAIT(1) + EVT_CALL(GetNpcPos, NPC_PARTNER, LVar0, LVar1, LVar2) + EVT_IF_LT(LVar0, 430) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_CALL(InterpPlayerYaw, 220, 5) + EVT_CALL(SetPlayerAnimation, ANIM_Peach_A0001) + EVT_THREAD + EVT_WAIT(40) + EVT_CALL(func_802D1270, 420, 0, EVT_FLOAT(2.0)) + EVT_END_THREAD + EVT_WAIT(10) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 0) + EVT_WAIT(30) + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, 370, 30, 0) + EVT_CALL(SetPanTarget, CAM_DEFAULT, 370, 30, 0) + EVT_CALL(SetCamDistance, CAM_DEFAULT, EVT_FLOAT(300.0)) + EVT_CALL(SetCamPosB, CAM_DEFAULT, EVT_FLOAT(370.0), EVT_FLOAT(32.0)) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(4.0)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_LOOP(0) + EVT_WAIT(1) + EVT_IF_EQ(AF_KKJ_03, FALSE) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_CALL(SetPanTarget, CAM_DEFAULT, 320, 30, 17) + EVT_CALL(SetCamDistance, CAM_DEFAULT, EVT_FLOAT(200.0)) + EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(17.0), EVT_FLOAT(-16.0)) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(2.0)) + EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_Twink_Talk, ANIM_Twink_Idle, 0, MSG_Peach_0022) + EVT_CALL(SetPanTarget, CAM_DEFAULT, 370, 30, 17) + EVT_CALL(SetCamDistance, CAM_DEFAULT, EVT_FLOAT(300.0)) + EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(17.0), EVT_FLOAT(-10.0)) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(90.0)) + EVT_WAIT(10) + EVT_CALL(SpeakToPlayer, NPC_PLAYER, ANIM_Peach_D0004, ANIM_Peach_A0001, 5, MSG_Peach_0023) + EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_Twink_Talk, ANIM_Twink_Idle, 0, MSG_Peach_0024) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(0.4)) + EVT_CALL(SetPanTarget, CAM_DEFAULT, 350, 30, 17) + EVT_CALL(PlayerMoveTo, 380, 0, 30) + EVT_CALL(SpeakToPlayer, NPC_PLAYER, ANIM_Peach_D0004, ANIM_Peach_A0001, 5, MSG_Peach_0025) + EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_Twink_Talk, ANIM_Twink_Idle, 0, MSG_Peach_0026) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(4.0)) + EVT_CALL(SetCamDistance, CAM_DEFAULT, 200) + EVT_CALL(SetCamPitch, CAM_DEFAULT, 17, -14) + EVT_CALL(SetPanTarget, CAM_DEFAULT, 380, 30, 17) + EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0000) + EVT_WAIT(10) + EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0026) + EVT_CALL(SpeakToPlayer, NPC_PLAYER, ANIM_Peach_C0001, ANIM_Peach_C0026, 5, MSG_Peach_0027) + EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0002) + EVT_WAIT(10) + EVT_CALL(SetPlayerAnimation, ANIM_Peach_A0001) + EVT_CALL(SetNpcAnimation, NPC_PARTNER, ANIM_Twink_TalkSad) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_CALL(SetCamPitch, CAM_DEFAULT, 17, -16) + EVT_CALL(SetPanTarget, CAM_DEFAULT, 320, 30, 17) + EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_Twink_TalkSad, ANIM_Twink_TalkSad, 0, MSG_Peach_0028) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(90.0)) + EVT_CALL(SetCamDistance, CAM_DEFAULT, 300) + EVT_CALL(SetCamPitch, CAM_DEFAULT, 17, -10) + EVT_CALL(SetPanTarget, CAM_DEFAULT, 350, 30, 17) + EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0000) + EVT_WAIT(10) + EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0026) + EVT_CALL(SpeakToPlayer, NPC_PLAYER, ANIM_Peach_C0001, ANIM_Peach_C0026, 5, MSG_Peach_0029) + EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0002) + EVT_WAIT(10) + EVT_CALL(SetPlayerAnimation, ANIM_Peach_A0001) + EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_Twink_TalkSad, ANIM_Twink_TalkSad, 0, MSG_Peach_002A) + EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0000) + EVT_WAIT(10) + EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0026) + EVT_CALL(SpeakToPlayer, NPC_PLAYER, ANIM_Peach_C0001, ANIM_Peach_C0026, 5, MSG_Peach_002B) + EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0002) + EVT_WAIT(10) + EVT_CALL(SetPlayerAnimation, ANIM_Peach_A0001) + EVT_WAIT(30) + EVT_CALL(SetPlayerAnimation, ANIM_Peach_C000D) + EVT_CALL(PlaySoundAtPlayer, SOUND_262, 0) + EVT_CALL(ShowEmote, NPC_Bowser, EMOTE_EXCLAMATION, -45, 30, FALSE, 0, 0, 0, 0) + EVT_WAIT(30) + EVT_CALL(SetPlayerAnimation, ANIM_Peach_A0001) + EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0000) + EVT_WAIT(10) + EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0026) + EVT_CALL(SpeakToPlayer, NPC_PLAYER, ANIM_Peach_C0001, ANIM_Peach_C0026, 5, MSG_Peach_002C) + EVT_CALL(SetNpcAnimation, NPC_PARTNER, ANIM_Twink_Idle) + EVT_CALL(EndSpeech, NPC_PLAYER, ANIM_Peach_C0001, ANIM_Peach_C0026, 5) + EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0002) + EVT_WAIT(10) + EVT_CALL(SetPlayerAnimation, ANIM_Peach_C000A) + EVT_WAIT(12) + EVT_CALL(GetPlayerPos, LVar2, LVar3, LVar4) + EVT_SUB(LVar2, 10) + EVT_ADD(LVar3, 20) + EVT_ADD(LVar4, 2) + EVT_CALL(MakeItemEntity, ITEM_LUCKY_STAR, LVar2, LVar3, LVar4, ITEM_SPAWN_MODE_DECORATION, 0) + EVT_SET(LVar9, LVar0) + EVT_WAIT(10) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(5.0)) + EVT_CALL(SetCamDistance, CAM_DEFAULT, EVT_FLOAT(200.0)) + EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(17.0), EVT_FLOAT(-12.5)) + EVT_CALL(SetPanTarget, CAM_DEFAULT, 365, 30, 17) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_THREAD + EVT_CALL(NpcFlyTo, NPC_PARTNER, 350, 50, -2, 30, -5, EASING_LINEAR) + EVT_END_THREAD + EVT_WAIT(40) + EVT_CALL(SetNpcAnimation, NPC_PARTNER, ANIM_Twink_Wink) + EVT_CALL(MakeLerp, 50, 70, 10, EASING_QUADRATIC_OUT) + EVT_LOOP(0) + EVT_ADD(LVar2, -2) + EVT_CALL(UpdateLerp) + EVT_CALL(SetItemPos, LVar9, LVar2, LVar0, LVar4) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_WAIT(10) + EVT_CALL(SetNpcAnimation, NPC_PARTNER, ANIM_Twink_TalkWink) + EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_Twink_TalkWink, ANIM_Twink_TalkWink, 0, MSG_Peach_002D) + EVT_SET(LVar3, LVar0) + EVT_LOOP(10) + EVT_ADD(LVar3, -1) + EVT_CALL(SetItemPos, LVar9, LVar2, LVar3, LVar4) + EVT_WAIT(1) + EVT_END_LOOP + EVT_CALL(SetNpcAnimation, NPC_PARTNER, ANIM_Twink_Tense) + EVT_CALL(RemoveItemEntity, LVar9) + EVT_WAIT(10) + EVT_CALL(SetNpcAnimation, NPC_PARTNER, ANIM_Twink_Idle) + EVT_WAIT(20) + EVT_CALL(InterpNpcYaw, NPC_PARTNER, 270, 0) + EVT_CALL(SetNpcAnimation, NPC_PARTNER, ANIM_Twink_Fly) + EVT_WAIT(10) + EVT_CALL(SetCamDistance, CAM_DEFAULT, 400) + EVT_CALL(SetCamPitch, CAM_DEFAULT, 17, -10) + EVT_CALL(SetPanTarget, CAM_DEFAULT, 355, 30, 17) + EVT_THREAD + EVT_LOOP(0) + EVT_WAIT(1) + EVT_CALL(GetNpcPos, NPC_PARTNER, LVar0, LVar1, LVar2) + EVT_IF_GT(LVar0, 380) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_CALL(InterpPlayerYaw, 90, 5) + EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0000) + EVT_WAIT(10) + EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0026) + EVT_CALL(SpeakToPlayer, NPC_PLAYER, ANIM_Peach_C0001, ANIM_Peach_C0026, 5, MSG_Peach_002E) + EVT_SET(AF_KKJ_03, TRUE) + EVT_END_THREAD + EVT_THREAD + EVT_LOOP(0) + EVT_CALL(GetNpcPos, NPC_PARTNER, LVar0, LVar1, LVar2) + EVT_IF_LT(LVar0, 310) + EVT_BREAK_LOOP + EVT_END_IF + EVT_WAIT(1) + EVT_END_LOOP + EVT_CALL(InterpNpcYaw, NPC_PARTNER, 90, 0) + EVT_END_THREAD + EVT_CALL(LoadPath, 60, EVT_PTR(N(TwinkExitPath)), ARRAY_COUNT(N(TwinkExitPath)), EASING_LINEAR) + EVT_LOOP(0) + EVT_CALL(GetNextPathPos) + EVT_CALL(SetNpcPos, NPC_PARTNER, LVar1, LVar2, LVar3) + EVT_WAIT(1) + EVT_IF_EQ(LVar0, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_CALL(SetNpcAnimation, NPC_PARTNER, ANIM_Twink_Idle) + EVT_CALL(InterpNpcYaw, NPC_PARTNER, 270, 0) + EVT_LOOP(0) + EVT_WAIT(1) + EVT_IF_EQ(AF_KKJ_03, TRUE) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_CALL(SetCamDistance, CAM_DEFAULT, 250) + EVT_CALL(SetCamPitch, CAM_DEFAULT, 17, -13) + EVT_CALL(SetPanTarget, CAM_DEFAULT, 405, 30, 17) + EVT_CALL(SetCamPosB, CAM_DEFAULT, EVT_FLOAT(400.0), EVT_FLOAT(32.0)) + EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_CALL(SpeakToPlayer, NPC_PLAYER, ANIM_Peach_C0001, ANIM_Peach_C0026, 5, MSG_Peach_002F) + EVT_CALL(SetNpcAnimation, NPC_PARTNER, ANIM_Twink_Fly) + EVT_CALL(NpcFlyTo, NPC_PARTNER, 420, 60, 0, 20, 0, EASING_LINEAR) + EVT_CALL(SetNpcAnimation, NPC_PARTNER, ANIM_Twink_Idle) + EVT_CALL(SpeakToPlayer, NPC_PLAYER, ANIM_Peach_C0001, ANIM_Peach_C0026, 5, MSG_Peach_0030) + EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0002) + EVT_WAIT(10) + EVT_CALL(SetPlayerAnimation, ANIM_Peach_A0001) + EVT_THREAD + EVT_CALL(MakeLerp, 0, 360, 10, EASING_LINEAR) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_CALL(SetNpcRotation, NPC_PARTNER, 0, LVar0, 0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_END_THREAD + EVT_CALL(GetNpcPos, NPC_PARTNER, LVar0, LVar1, LVar2) + EVT_CALL(NpcJump0, NPC_PARTNER, LVar0, LVar1, LVar2, 10) + EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_Twink_Talk, ANIM_Twink_Idle, 0, MSG_Peach_0031) + EVT_CALL(SetNpcAnimation, NPC_PARTNER, ANIM_Twink_Fly) + EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_IGNORE_WORLD_COLLISION, TRUE) + EVT_CALL(InterpNpcYaw, NPC_PARTNER, 90, 5) + EVT_WAIT(10) + EVT_CALL(FadeOutMusic, 0, 2000) + EVT_CALL(NpcFlyTo, NPC_PARTNER, 600, 100, -80, 40, 0, EASING_LINEAR) + EVT_WAIT(30) + EVT_CALL(GotoMap, EVT_PTR("kkj_26"), kkj_26_ENTRY_2) + EVT_WAIT(100) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_kkj/kkj_14/kkj_14_9_chapter1.c b/src/world/area_kkj/kkj_14/kkj_14_9_chapter1.c new file mode 100644 index 0000000000..b1c2f4654d --- /dev/null +++ b/src/world/area_kkj/kkj_14/kkj_14_9_chapter1.c @@ -0,0 +1,48 @@ +#include "kkj_14.h" + +EvtScript N(EVS_Scene_Chapter1) = { + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(DisablePlayerPhysics, TRUE) + EVT_THREAD + EVT_CALL(AdjustCam, CAM_DEFAULT, EVT_FLOAT(0.5), 20, 300, EVT_FLOAT(17.0), EVT_FLOAT(-11.0)) + EVT_END_THREAD + EVT_CALL(DisablePartnerAI, 0) + EVT_CALL(SetNpcPos, NPC_PARTNER, -200, 93, -17) + EVT_CALL(InterpNpcYaw, NPC_PARTNER, 90, 0) + EVT_THREAD + EVT_WAIT(120) + EVT_CALL(NpcFlyTo, NPC_PARTNER, -100, 40, 0, 60, 40, EASING_LINEAR) + EVT_WAIT(5) + EVT_CALL(InterpNpcYaw, NPC_PARTNER, 270, 5) + EVT_END_THREAD + EVT_LOOP(3) + EVT_CALL(PlayerMoveTo, -110, 0, 30) + EVT_CALL(PlayerMoveTo, -140, 0, 30) + EVT_END_LOOP + EVT_WAIT(5) + EVT_CALL(InterpPlayerYaw, 90, 5) + EVT_WAIT(10) + EVT_CALL(SpeakToPlayer, NPC_PLAYER, ANIM_Peach_D0004, ANIM_Peach_A0001, 5, MSG_Peach_0033) + EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_Twink_Talk, ANIM_Twink_Idle, 0, MSG_Peach_0034) + EVT_CALL(SpeakToPlayer, NPC_PLAYER, ANIM_Peach_D0004, ANIM_Peach_A0001, 5, MSG_Peach_0035) + EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_Twink_Talk, ANIM_Twink_Idle, 0, MSG_Peach_0036) + EVT_CALL(SetPlayerAnimation, ANIM_Peach_C000D) + EVT_CALL(PlaySoundAtPlayer, SOUND_262, 0) + EVT_CALL(ShowEmote, NPC_Bowser, EMOTE_EXCLAMATION, 0, 30, FALSE, 0, 0, 0, 0) + EVT_WAIT(30) + EVT_CALL(SetPlayerAnimation, ANIM_Peach_A0001) + EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0000) + EVT_WAIT(10) + EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0026) + EVT_CALL(SpeakToPlayer, NPC_PLAYER, ANIM_Peach_C0001, ANIM_Peach_C0026, 5, MSG_Peach_0037) + EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0002) + EVT_WAIT(10) + EVT_CALL(SetPlayerAnimation, ANIM_Peach_A0001) + EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_Twink_Talk, ANIM_Twink_Idle, 0, MSG_Peach_0038) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 0) + EVT_CALL(EnablePartnerAI) + EVT_CALL(DisablePlayerPhysics, FALSE) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_kkj/kkj_15/AE5590.c b/src/world/area_kkj/kkj_15/AE5590.c deleted file mode 100644 index edf0f12215..0000000000 --- a/src/world/area_kkj/kkj_15/AE5590.c +++ /dev/null @@ -1,17 +0,0 @@ -#include "kkj_15.h" - -static char* N(exit_str_0) = "kmr_10"; -static char* N(exit_str_1) = "trd_00"; -static char* N(exit_str_2) = "arn_07"; -static char* N(exit_str_3) = "kkj_11"; -static char* N(exit_str_4) = "kkj_11\0"; -static char* N(exit_str_5) = ""; - -#include "world/common/atomic/TexturePan.inc.c" - -ApiStatus func_8024030C_AE589C(Evt* script, s32 isInitialCall) { - gGameStatusPtr->peachFlags &= ~PEACH_STATUS_FLAG_IS_PEACH; - gPlayerData.currentPartner = script->varTable[0]; - - return ApiStatus_DONE2; -} diff --git a/src/world/area_kkj/kkj_15/AE58D0.c b/src/world/area_kkj/kkj_15/AE58D0.c deleted file mode 100644 index 370f88801d..0000000000 --- a/src/world/area_kkj/kkj_15/AE58D0.c +++ /dev/null @@ -1,20 +0,0 @@ -#include "kkj_15.h" - -ApiStatus func_80240340_AE58D0(Evt* script, s32 isInitialCall) { - Npc* npc = get_npc_safe(-4); - f32 var = EVT_FIXED_TO_FLOAT(script->varTable[2]); - f32 angle; - f32 mag; - - mag = dist2D(50.0f, -200.0f, script->varTable[7], script->varTable[8]); - angle = clamp_angle(atan2(50.0f, -200.0f, script->varTable[7], script->varTable[8]) - var); - gPlayerStatus.position.x = 50.0f + mag * sin_deg(angle); - gPlayerStatus.position.z = -200.0f - mag * cos_deg(angle); - - mag = dist2D(50.0f, -200.0f, script->varTable[9], script->varTable[10]); - angle = clamp_angle(atan2(50.0f, -200.0f, script->varTable[9], script->varTable[10]) - var); - npc->pos.x = 50.0f + mag * sin_deg(angle); - npc->pos.z = -200.0f - mag * cos_deg(angle); - - return ApiStatus_DONE2; -} diff --git a/src/world/area_kkj/kkj_15/AE5A90.c b/src/world/area_kkj/kkj_15/AE5A90.c deleted file mode 100644 index 6d394a3046..0000000000 --- a/src/world/area_kkj/kkj_15/AE5A90.c +++ /dev/null @@ -1,13 +0,0 @@ -#include "kkj_15.h" - -void sprite_shading_set_light_source(u32, s8, f32, f32, f32, u8, u8, u8, f32, s8); - -ApiStatus func_80240500_AE5A90(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++); - - sprite_shading_set_light_source(0, 5, x, y, z, 255, 255, 255, 0.0001f, 0); - return ApiStatus_DONE2; -} diff --git a/src/world/area_kkj/kkj_15/AE5B60.c b/src/world/area_kkj/kkj_15/AE5B60.c deleted file mode 100644 index d574172042..0000000000 --- a/src/world/area_kkj/kkj_15/AE5B60.c +++ /dev/null @@ -1,15 +0,0 @@ -#include "kkj_15.h" - -ApiStatus func_802405D0_AE5B60(void) { - GameStatus* gameStatus = gGameStatusPtr; - - gameStatus->peachFlags |= PEACH_STATUS_FLAG_HAS_INGREDIENT; - return ApiStatus_DONE2; -} - -ApiStatus func_802405EC_AE5B7C(Evt* script, s32 isInitialCall) { - GameStatus* gameStatus = gGameStatusPtr; - - gameStatus->peachFlags &= ~PEACH_STATUS_FLAG_HAS_INGREDIENT; - return ApiStatus_DONE2; -} diff --git a/src/world/area_kkj/kkj_15/kkj_15.h b/src/world/area_kkj/kkj_15/kkj_15.h index 990c068997..c376f20318 100644 --- a/src/world/area_kkj/kkj_15/kkj_15.h +++ b/src/world/area_kkj/kkj_15/kkj_15.h @@ -2,8 +2,50 @@ /// @brief Peach's Castle - Passage Outlet (2F) #include "common.h" -#include "../kkj.h" #include "message_ids.h" #include "map.h" +#include "../kkj.h" +#include "mapfs/kkj_15_shape.h" +#include "mapfs/kkj_15_hit.h" + +#include "sprite/npc/Twink.h" +#include "sprite/npc/WorldBowser.h" +#include "sprite/npc/WorldKammy.h" +#include "sprite/npc/KoopaBros.h" +#include "sprite/npc/WorldKoopatrol.h" + +enum { + // shared + NPC_Bowser = 0, + NPC_Kammy = 1, + // chapter 0 npcs + NPC_KoopaBros_01 = 2, + NPC_KoopaBros_02 = 3, + NPC_KoopaBros_03 = 4, + NPC_KoopaBros_04 = 5, + // chapter 1 npcs + NPC_Koopatrol_01 = 1, + NPC_Koopatrol_02 = 2, + // chapter 3 npcs + NPC_Koopatrol_03 = 2, + NPC_Koopatrol_04 = 3, +}; + #define NAMESPACE kkj_15 + +extern EvtScript N(EVS_Main); +extern EvtScript N(EVS_SetupMusic); +extern EvtScript N(EVS_EnterRotatingWall); +extern EvtScript N(EVS_Scene_Chapter0_BowserAndKammy); +extern EvtScript N(EVS_SetupChapter1); +extern EvtScript N(EVS_SetupChapter2); +extern EvtScript N(EVS_Scene_Chapter3); +extern EvtScript N(EVS_AnimateRotatingWall_AlmostCaught); +extern EvtScript N(EVS_EndPeachChapter0); +extern EvtScript N(EVS_EndPeachChapter1); +extern EvtScript N(EVS_EndPeachChapter3); + +extern NpcGroupList N(Chapter0NPCs); +extern NpcGroupList N(Chapter1NPCs); +extern NpcGroupList N(Chapter3NPCs); diff --git a/src/world/area_kkj/kkj_15/kkj_15_0_header.c b/src/world/area_kkj/kkj_15/kkj_15_0_header.c new file mode 100644 index 0000000000..d1c75dbc65 --- /dev/null +++ b/src/world/area_kkj/kkj_15/kkj_15_0_header.c @@ -0,0 +1,14 @@ +#include "kkj_15.h" + +EntryList N(Entrances) = { + [kkj_15_ENTRY_0] { 225.0, 0.0, -80.0, 270.0 }, + [kkj_15_ENTRY_1] { 50.0, 10.0, -150.0, 270.0 }, + [kkj_15_ENTRY_2] { -237.0, 0.0, -5.0, 0.0 }, +}; + +MapSettings N(settings) = { + .main = &N(EVS_Main), + .entryList = &N(Entrances), + .entryCount = ENTRY_COUNT(N(Entrances)), + .tattle = { MSG_MapTattle_kkj_15 }, +}; diff --git a/src/world/area_kkj/kkj_15/kkj_15_10_npc_chapter3.c b/src/world/area_kkj/kkj_15/kkj_15_10_npc_chapter3.c new file mode 100644 index 0000000000..9386f532ce --- /dev/null +++ b/src/world/area_kkj/kkj_15/kkj_15_10_npc_chapter3.c @@ -0,0 +1,86 @@ +#include "kkj_15.h" + +#define NAME_SUFFIX _Ch3 + +#include "world/common/npc/Bowser.inc.c" +#include "world/common/enemy/Kammy.inc.c" +#include "world/common/enemy/Koopatrol_Stationary.inc.c" + +AnimID N(ExtraAnims_Bowser)[] = { + ANIM_WorldBowser_Still, + ANIM_WorldBowser_Idle, + ANIM_WorldBowser_Talk, + ANIM_WorldBowser_TalkEyesClosed, + ANIM_WorldBowser_AngryTalk, + ANIM_WorldBowser_Tantrum, + ANIM_WorldBowser_ArmsCrossed, + ANIM_WorldBowser_Shock, + ANIM_LIST_END +}; + +AnimID N(ExtraAnims_Kammy)[] = { + ANIM_WorldKammy_Anim01, + ANIM_WorldKammy_Anim02, + ANIM_WorldKammy_Anim04, + ANIM_WorldKammy_Anim05, + ANIM_LIST_END +}; + +AnimID N(ExtraAnims_Koopatrol)[] = { + ANIM_WorldKoopatrol_Anim01, + ANIM_WorldKoopatrol_Anim06, + ANIM_WorldKoopatrol_Anim08, + ANIM_WorldKoopatrol_Anim12, + ANIM_WorldKoopatrol_Anim14, + ANIM_LIST_END +}; + +NpcData N(NpcData_Characters)[] = { + { + .id = NPC_Bowser, + .pos = { 0.0f, -500.0f, 0.0f }, + .yaw = 270, + .settings = &N(NpcSettings_Bowser), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = NO_DROPS, + .animations = BOWSER_ANIMS, + .extraAnimations = N(ExtraAnims_Bowser), + }, + { + .id = NPC_Kammy, + .pos = { 0.0f, -500.0f, 0.0f }, + .yaw = 270, + .settings = &N(NpcSettings_Kammy), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = NO_DROPS, + .animations = KAMMY_ANIMS, + .extraAnimations = N(ExtraAnims_Kammy), + }, + { + .id = NPC_Koopatrol_03, + .pos = { 0.0f, -500.0f, 0.0f }, + .yaw = 0, + .settings = &N(NpcSettings_Koopatrol_Stationary), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = NO_DROPS, + .animations = KOOPATROL_ANIMS, + .extraAnimations = N(ExtraAnims_Koopatrol), + }, + { + .id = NPC_Koopatrol_04, + .pos = { 0.0f, -500.0f, 0.0f }, + .yaw = 0, + .settings = &N(NpcSettings_Koopatrol_Stationary), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = NO_DROPS, + .animations = KOOPATROL_ANIMS, + .extraAnimations = N(ExtraAnims_Koopatrol), + }, +}; + +#define NAME_SUFFIX + +NpcGroupList N(Chapter3NPCs) = { + NPC_GROUP(N(NpcData_Characters_Ch3)), + {} +}; diff --git a/src/world/area_kkj/kkj_15/kkj_15_1_music.c b/src/world/area_kkj/kkj_15/kkj_15_1_music.c new file mode 100644 index 0000000000..72b8e777ac --- /dev/null +++ b/src/world/area_kkj/kkj_15/kkj_15_1_music.c @@ -0,0 +1,20 @@ +#include "kkj_15.h" + +EvtScript N(EVS_SetupMusic) = { + EVT_SWITCH(GB_StoryProgress) + EVT_CASE_OR_EQ(STORY_CH0_BEGAN_PEACH_MISSION) + EVT_CASE_OR_EQ(STORY_CH1_BEGAN_PEACH_MISSION) + EVT_CASE_OR_EQ(STORY_CH3_BEGAN_PEACH_MISSION) + EVT_CASE_OR_EQ(STORY_CH7_BEGAN_PEACH_MISSION) + EVT_CALL(SetMusicTrack, 0, SONG_PRISONER_PEACH_THEME, 0, 8) + EVT_END_CASE_GROUP + EVT_CASE_OR_EQ(STORY_CH2_BEGAN_PEACH_MISSION) + EVT_CASE_OR_EQ(STORY_CH4_BEGAN_PEACH_MISSION) + EVT_CASE_OR_EQ(STORY_CH5_BEGAN_PEACH_MISSION) + EVT_CASE_OR_EQ(STORY_CH6_BEGAN_PEACH_MISSION) + EVT_CALL(SetMusicTrack, 0, SONG_PEACH_MISSION, 0, 8) + EVT_END_CASE_GROUP + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_kkj/kkj_15/kkj_15_2_main.c b/src/world/area_kkj/kkj_15/kkj_15_2_main.c new file mode 100644 index 0000000000..2e75a7da65 --- /dev/null +++ b/src/world/area_kkj/kkj_15/kkj_15_2_main.c @@ -0,0 +1,156 @@ +#include "kkj_15.h" + +#include "world/common/atomic/TexturePan.inc.c" +#include "../common/RestoreFromPeachState.inc.c" + +Gfx N(setup_gfx_candle_lights)[] = { + gsDPPipeSync(), + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), + gsDPSetCycleType(G_CYC_2CYCLE), + gsDPSetTexturePersp(G_TP_PERSP), + gsDPSetTextureDetail(G_TD_CLAMP), + gsDPSetTextureLOD(G_TL_TILE), + gsDPSetTextureLUT(G_TT_NONE), + gsDPSetTextureFilter(G_TF_BILERP), + gsDPSetTextureConvert(G_TC_FILT), + gsDPSetPrimColor(0, 0, 75, 31, 19, 255), + gsDPSetEnvColor(255, 118, 77, 0), + gsDPSetCombineLERP(TEXEL0, TEXEL1, TEXEL0, 1, 1, TEXEL0, TEXEL1, 1, 0, PRIMITIVE, COMBINED, ENVIRONMENT, COMBINED, TEXEL1, TEXEL1, TEXEL1), + gsDPSetRenderMode(G_RM_PASS, G_RM_ZB_CLD_SURF2), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_SHADE | G_CULL_BACK | G_SHADING_SMOOTH), + gsSPEndDisplayList(), +}; + +EvtScript N(EVS_EndPeachChapter0) = { + EVT_SET(LVar0, GB_KKJ_LastPartner) + EVT_CALL(N(RestoreFromPeachState)) + EVT_CALL(PlaySound, SOUND_DC) + EVT_CALL(GotoMapSpecial, EVT_PTR("kmr_10"), kmr_10_ENTRY_0, TRANSITION_12) + EVT_WAIT(100) +}; //@bug script not properly terminated + +EvtScript N(EVS_EndPeachChapter1) = { + EVT_SET(LVar0, GB_KKJ_LastPartner) + EVT_CALL(N(RestoreFromPeachState)) + EVT_CALL(PlaySound, SOUND_DC) + EVT_CALL(GotoMapSpecial, EVT_PTR("trd_00"), trd_00_ENTRY_5, TRANSITION_12) + EVT_WAIT(100) +}; //@bug script not properly terminated + +EvtScript N(EVS_EndPeachChapter3) = { + EVT_SET(LVar0, GB_KKJ_LastPartner) + EVT_CALL(N(RestoreFromPeachState)) + EVT_CALL(PlaySound, SOUND_DC) + EVT_CALL(GotoMapSpecial, EVT_PTR("arn_07"), arn_07_ENTRY_3, TRANSITION_12) + EVT_WAIT(100) +}; //@bug script not properly terminated + +EvtScript N(EVS_ExitDoor_kkj_11_3) = { + EVT_SET_GROUP(EVT_GROUP_1B) + EVT_CALL(DisablePlayerInput, TRUE) + EVT_SET(LVar0, kkj_15_ENTRY_0) + EVT_SET(LVar1, COLLIDER_tte) + EVT_SET(LVar2, MODEL_o2) + EVT_SET(LVar3, DOOR_SWING_IN) + EVT_EXEC(ExitSingleDoor) + EVT_WAIT(17) + EVT_CALL(GotoMap, EVT_PTR("kkj_11"), kkj_11_ENTRY_3) + EVT_WAIT(100) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_BindExitTriggers) = { + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitDoor_kkj_11_3)), TRIGGER_WALL_PRESS_A, COLLIDER_tte, 1, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_EnterMap) = { + EVT_CALL(GetEntryID, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_EQ(kkj_15_ENTRY_0) + EVT_SET(LVar2, MODEL_o2) + EVT_SET(LVar3, DOOR_SWING_IN) + EVT_EXEC_WAIT(EnterSingleDoor) + EVT_EXEC(N(EVS_BindExitTriggers)) + EVT_CASE_EQ(kkj_15_ENTRY_1) + EVT_SWITCH(GB_StoryProgress) + EVT_CASE_EQ(STORY_CH1_BEGAN_PEACH_MISSION) + EVT_EXEC(N(EVS_EnterRotatingWall)) + EVT_EXEC(N(EVS_SetupChapter1)) + EVT_CASE_EQ(STORY_CH2_BEGAN_PEACH_MISSION) + EVT_EXEC(N(EVS_EnterRotatingWall)) + EVT_EXEC(N(EVS_SetupChapter2)) + EVT_CASE_EQ(STORY_CH3_BEGAN_PEACH_MISSION) + EVT_EXEC(N(EVS_Scene_Chapter3)) + EVT_CASE_DEFAULT + EVT_EXEC(N(EVS_EnterRotatingWall)) + EVT_EXEC(N(EVS_BindExitTriggers)) + EVT_END_SWITCH + EVT_CASE_EQ(kkj_15_ENTRY_2) + EVT_EXEC(N(EVS_Scene_Chapter0_BowserAndKammy)) + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Main) = { + EVT_SET(GB_WorldLocation, LOCATION_PEACHS_CASTLE) + EVT_CALL(SetSpriteShading, SHADING_NONE) + EVT_SETUP_CAMERA_DEFAULT() + EVT_CALL(GetEntryID, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_EQ(kkj_15_ENTRY_2) + EVT_SET(GB_StoryProgress, STORY_CH0_KAMMY_RETURNED_TO_BOWSER) + EVT_END_SWITCH + EVT_SWITCH(GB_StoryProgress) + EVT_CASE_EQ(STORY_CH0_KAMMY_RETURNED_TO_BOWSER) + EVT_CALL(MakeNpcs, FALSE, EVT_PTR(N(Chapter0NPCs))) + EVT_CASE_EQ(STORY_CH1_BEGAN_PEACH_MISSION) + EVT_CALL(MakeNpcs, FALSE, EVT_PTR(N(Chapter1NPCs))) + EVT_CASE_EQ(STORY_CH3_BEGAN_PEACH_MISSION) + EVT_CALL(MakeNpcs, FALSE, EVT_PTR(N(Chapter3NPCs))) + EVT_END_SWITCH + EVT_IF_NE(GB_StoryProgress, STORY_CH1_BEGAN_PEACH_MISSION) + EVT_CALL(EnableModel, MODEL_o76, FALSE) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o76, COLLIDER_FLAGS_UPPER_MASK) + EVT_END_IF + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_g25, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(SetTexPanner, MODEL_o151, TEX_PANNER_0) + EVT_THREAD + TEX_PAN_PARAMS_ID(TEX_PANNER_0) + TEX_PAN_PARAMS_STEP( 0, 0, 40, 900) + 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_CALL(SetModelCustomGfx, MODEL_o151, CUSTOM_GFX_0, FOG_MODE_UNCHANGED) + EVT_CALL(SetCustomGfx, CUSTOM_GFX_0, EVT_PTR(N(setup_gfx_candle_lights)), NULL) + EVT_CALL(SetTexPanner, MODEL_o152, TEX_PANNER_0) + EVT_THREAD + TEX_PAN_PARAMS_ID(TEX_PANNER_0) + TEX_PAN_PARAMS_STEP( 0, 0, 40, 900) + 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_CALL(SetModelCustomGfx, MODEL_o152, CUSTOM_GFX_0, FOG_MODE_UNCHANGED) + EVT_CALL(SetCustomGfx, CUSTOM_GFX_0, EVT_PTR(N(setup_gfx_candle_lights)), NULL) + EVT_CALL(UseDoorSounds, DOOR_SOUNDS_BASIC) + EVT_EXEC(N(EVS_SetupMusic)) + EVT_CALL(GetEntryID, LVar0) + EVT_IF_EQ(LVar0, kkj_15_ENTRY_1) + EVT_IF_EQ(GB_StoryProgress, STORY_CH3_BEGAN_PEACH_MISSION) + EVT_CALL(StopSound, SOUND_93) + EVT_ELSE + EVT_CALL(PlaySoundAt, SOUND_93, 0, 50, 5, -200) + EVT_END_IF + EVT_WAIT(10) + EVT_END_IF + EVT_EXEC(N(EVS_EnterMap)) + EVT_WAIT(1) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_kkj/kkj_15/kkj_15_3_rotating_wall.c b/src/world/area_kkj/kkj_15/kkj_15_3_rotating_wall.c new file mode 100644 index 0000000000..e81a211ce6 --- /dev/null +++ b/src/world/area_kkj/kkj_15/kkj_15_3_rotating_wall.c @@ -0,0 +1,131 @@ +#include "kkj_15.h" + +API_CALLABLE(N(UpdateRotatingPartyPositions)) { + Npc* partner = get_npc_safe(NPC_PARTNER); + f32 var = EVT_FIXED_TO_FLOAT(script->varTable[2]); + f32 angle; + f32 mag; + + mag = dist2D(50.0f, -200.0f, script->varTable[7], script->varTable[8]); + angle = atan2(50.0f, -200.0f, script->varTable[7], script->varTable[8]); + angle = clamp_angle(angle - var); + gPlayerStatus.position.x = 50.0f + mag * sin_deg(angle); + gPlayerStatus.position.z = -200.0f - mag * cos_deg(angle); + + mag = dist2D(50.0f, -200.0f, script->varTable[9], script->varTable[10]); + angle = atan2(50.0f, -200.0f, script->varTable[9], script->varTable[10]); + angle = clamp_angle(angle - var); + partner->pos.x = 50.0f + mag * sin_deg(angle); + partner->pos.z = -200.0f - mag * cos_deg(angle); + + return ApiStatus_DONE2; +} + +EvtScript N(EVS_AnimateRotatingWall_AlmostCaught) = { + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_g22, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o1, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_CLEAR_BITS, COLLIDER_o96, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(GetPlayerPos, LVar7, LVar0, LVar8) + EVT_CALL(GetNpcPos, NPC_PARTNER, LVar9, LVar0, LVarA) + EVT_THREAD + EVT_WAIT(180) + EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0011) + EVT_END_THREAD + EVT_CALL(PlaySoundAt, SOUND_93, 0, 50, 5, -200) + EVT_CALL(MakeLerp, 0, -1800, 360, EASING_LINEAR) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_SETF(LVar2, LVar0) + EVT_DIVF(LVar2, 10) + EVT_CALL(RotateGroup, MODEL_g28, LVar2, 0, 1, 0) + EVT_CALL(N(UpdateRotatingPartyPositions)) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_CALL(StopSound, SOUND_93) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_CLEAR_BITS, COLLIDER_g25, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_CLEAR_BITS, COLLIDER_o1, COLLIDER_FLAGS_UPPER_MASK) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_AnimateRotatingWall_Default) = { + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_g22, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o1, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_CLEAR_BITS, COLLIDER_o96, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(GetPlayerPos, LVar7, LVar0, LVar8) + EVT_CALL(GetNpcPos, NPC_PARTNER, LVar9, LVar0, LVarA) + EVT_CALL(MakeLerp, -1350, -1800, 90, EASING_LINEAR) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_SETF(LVar2, LVar0) + EVT_DIVF(LVar2, 10) + EVT_CALL(RotateGroup, MODEL_g28, LVar2, 0, 1, 0) + EVT_CALL(N(UpdateRotatingPartyPositions)) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_CALL(StopSound, SOUND_93) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_CLEAR_BITS, COLLIDER_g25, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_CLEAR_BITS, COLLIDER_o1, COLLIDER_FLAGS_UPPER_MASK) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_RotatingWall_Default) = { + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, 50, 10, -35) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(90.0)) + EVT_CALL(SetCamDistance, CAM_DEFAULT, 400) + EVT_CALL(SetPanTarget, CAM_DEFAULT, 50, 10, -35) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_EXEC_WAIT(N(EVS_AnimateRotatingWall_Default)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 0) + EVT_RETURN + EVT_END +}; + +// used during chapter 1, adds an extra camera move and a remark by twink +EvtScript N(EVS_RotatingWall_FirstTime) = { + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, 50, 10, -35) + EVT_CALL(SetPanTarget, CAM_DEFAULT, 50, 35, -35) + EVT_CALL(SetCamDistance, CAM_DEFAULT, 200) + 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_THREAD + EVT_CALL(SetPanTarget, CAM_DEFAULT, 50, 10, -35) + EVT_CALL(SetCamDistance, CAM_DEFAULT, 400) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(0.8)) + EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_END_THREAD + EVT_EXEC_WAIT(N(EVS_AnimateRotatingWall_Default)) + EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_Twink_Talk, ANIM_Twink_Idle, 0, MSG_Peach_0049) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_EnterRotatingWall) = { + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(DisablePlayerPhysics, TRUE) + EVT_CALL(DisablePartnerAI, 0) + EVT_CALL(SetPlayerPos, 50, 10, -250) + EVT_CALL(SetNpcPos, NPC_PARTNER, 10, 30, -250) + EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_GRAVITY, FALSE) + EVT_CALL(InterpPlayerYaw, 270, 0) + EVT_SWITCH(GB_StoryProgress) + EVT_CASE_EQ(STORY_CH1_BEGAN_PEACH_MISSION) + EVT_EXEC_WAIT(N(EVS_RotatingWall_FirstTime)) + EVT_CASE_DEFAULT + EVT_EXEC_WAIT(N(EVS_RotatingWall_Default)) + EVT_END_SWITCH + EVT_CALL(EnablePartnerAI) + EVT_CALL(DisablePlayerPhysics, FALSE) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_kkj/kkj_15/kkj_15_4_chapter0.c b/src/world/area_kkj/kkj_15/kkj_15_4_chapter0.c new file mode 100644 index 0000000000..7a27d35217 --- /dev/null +++ b/src/world/area_kkj/kkj_15/kkj_15_4_chapter0.c @@ -0,0 +1,413 @@ +#include "kkj_15.h" +#include "effects.h" + +void sprite_shading_set_light_source(u32, s8, f32, f32, f32, u8, u8, u8, f32, s8); + +API_CALLABLE(N(SetLightSourcePos)) { + 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++); + + sprite_shading_set_light_source(0, LIGHT_SOURCE_ENABLED | LIGHT_SOURCE_LINEAR_FALLOFF, + x, y, z, 255, 255, 255, 1.0f / 10000, 0); + return ApiStatus_DONE2; +} + +EvtScript N(EVS_PlaySounds_KoopaBrosShowOff) = { + EVT_LOOP(0) + EVT_CALL(PlaySoundAt, SOUND_55, 0, 100, 0, -40) + EVT_WAIT(30) + EVT_CALL(PlaySoundAt, SOUND_356, 0, 100, 0, -40) + EVT_WAIT(60) + EVT_CALL(PlaySoundAt, SOUND_37C, 0, 100, 0, -40) + EVT_WAIT(30) + EVT_END_LOOP + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_FocusCam_WholeRoom) = { + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, 30, 0, 0) + EVT_CALL(SetPanTarget, CAM_DEFAULT, 30, 0, 0) + EVT_CALL(SetCamDistance, CAM_DEFAULT, EVT_FLOAT(400.0)) + EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(17.0), EVT_FLOAT(-11.0)) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(90.0)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_FocusCam_BowserWide) = { + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, -50, 0, 0) + EVT_CALL(SetPanTarget, CAM_DEFAULT, -50, 0, 0) + EVT_CALL(SetCamDistance, CAM_DEFAULT, EVT_FLOAT(300.0)) + EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(17.0), EVT_FLOAT(-13.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_RETURN + EVT_END +}; + +EvtScript N(EVS_FocusCam_KoopaBros) = { + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, 115, 0, 0) + EVT_CALL(SetPanTarget, CAM_DEFAULT, 115, 0, 0) + EVT_CALL(SetCamDistance, CAM_DEFAULT, EVT_FLOAT(240.0)) + EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(17.0), EVT_FLOAT(-11.0)) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(90.0)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_OpenDoor_Ch0) = { + EVT_CALL(PlaySoundAtCollider, COLLIDER_tte, SOUND_BASIC_DOOR_OPEN, 0) + EVT_CALL(MakeLerp, 0, 120, 14, EASING_QUADRATIC_OUT) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_CALL(RotateModel, MODEL_o2, LVar0, 0, 1, 0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_CloseDoor_Ch0) = { + EVT_CALL(MakeLerp, 120, 0, 8, EASING_QUADRATIC_OUT) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_CALL(RotateModel, MODEL_o2, LVar0, 0, 1, 0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_CALL(PlaySoundAtCollider, COLLIDER_tte, SOUND_BASIC_DOOR_CLOSE, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Scene_Chapter0_BowserAndKammy) = { + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(DisablePlayerPhysics, TRUE) + EVT_CALL(SetMusicTrack, 0, SONG_BOWSER_THEME, 0, 8) + EVT_CALL(SetNpcPos, NPC_Bowser, -70, 0, -55) + EVT_CALL(InterpNpcYaw, NPC_Bowser, 90, 0) + EVT_CALL(SetNpcAnimation, NPC_Bowser, ANIM_WorldBowser_Idle) + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, 237, 0, -74) + EVT_CALL(SetPanTarget, CAM_DEFAULT, 237, 0, -74) + 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(30) + EVT_EXEC(N(EVS_OpenDoor_Ch0)) + EVT_WAIT(10) + EVT_CALL(SetNpcPos, NPC_Kammy, 270, 0, -78) + EVT_CALL(SetNpcAnimation, NPC_Kammy, ANIM_WorldKammy_Anim02) + EVT_CALL(SetNpcSpeed, NPC_Kammy, EVT_FLOAT(3.0)) + EVT_CALL(NpcMoveTo, NPC_Kammy, 180, -55, 0) + EVT_CALL(SetNpcAnimation, NPC_Kammy, ANIM_WorldKammy_Anim01) + EVT_EXEC_WAIT(N(EVS_CloseDoor_Ch0)) + EVT_CALL(SpeakToNpc, NPC_Kammy, ANIM_WorldKammy_Anim04, ANIM_WorldKammy_Anim01, 0, NPC_Bowser, MSG_Peach_CH1_KoopaBros_0000) + EVT_THREAD + EVT_CALL(SetNpcAnimation, NPC_Kammy, ANIM_WorldKammy_Anim02) + EVT_CALL(SetNpcSpeed, NPC_Kammy, EVT_FLOAT(3.0)) + EVT_CALL(NpcMoveTo, NPC_Kammy, 0, -55, 0) + EVT_CALL(SetNpcAnimation, NPC_Kammy, ANIM_WorldKammy_Anim01) + EVT_END_THREAD + EVT_WAIT(20) + EVT_EXEC_WAIT(N(EVS_FocusCam_BowserWide)) + EVT_WAIT(20) + EVT_CALL(SpeakToNpc, NPC_Bowser, ANIM_WorldBowser_Talk, ANIM_WorldBowser_Idle, 0, NPC_Kammy, MSG_Peach_CH1_KoopaBros_0001) + EVT_CALL(SetPanTarget, CAM_DEFAULT, -20, 0, 0) + EVT_CALL(SetCamDistance, CAM_DEFAULT, EVT_FLOAT(225.0)) + EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(17.0), EVT_FLOAT(-13.0)) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(5.0)) + EVT_WAIT(10) + EVT_CALL(SpeakToNpc, NPC_Kammy, ANIM_WorldKammy_Anim04, ANIM_WorldKammy_Anim01, 0, NPC_Bowser, MSG_Peach_CH1_KoopaBros_0002) + EVT_CALL(SetPanTarget, CAM_DEFAULT, -50, 0, 0) + EVT_CALL(SetCamDistance, CAM_DEFAULT, EVT_FLOAT(250.0)) + EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(17.0), EVT_FLOAT(-17.0)) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(2.0)) + EVT_WAIT(10) + EVT_CALL(SetNpcAnimation, NPC_Bowser, ANIM_WorldBowser_Brandish) + EVT_WAIT(10) + EVT_CALL(SpeakToNpc, NPC_Bowser, ANIM_WorldBowser_BrandishTalk, ANIM_WorldBowser_BrandishIdle, 0, NPC_Kammy, MSG_Peach_CH1_KoopaBros_0003) + EVT_CALL(SetNpcAnimation, NPC_Bowser, ANIM_WorldBowser_Idle) + EVT_WAIT(15) + EVT_CALL(SpeakToNpc, NPC_Bowser, ANIM_WorldBowser_Talk, ANIM_WorldBowser_Idle, 0, NPC_Kammy, MSG_Peach_CH1_KoopaBros_0004) + EVT_EXEC_WAIT(N(EVS_FocusCam_BowserWide)) + EVT_CALL(SpeakToNpc, NPC_Kammy, ANIM_WorldKammy_Anim04, ANIM_WorldKammy_Anim01, 0, NPC_Bowser, MSG_Peach_CH1_KoopaBros_0005) + EVT_CALL(SpeakToNpc, NPC_Bowser, ANIM_WorldBowser_Talk, ANIM_WorldBowser_Idle, 0, NPC_Kammy, MSG_Peach_CH1_KoopaBros_0006) + EVT_CALL(FadeOutMusic, 0, 2000) + EVT_CALL(ShowMessageAtScreenPos, MSG_Peach_CH1_KoopaBros_0007, 300, 20) + EVT_WAIT(5) + EVT_CALL(PlaySoundAtNpc, NPC_Bowser, SOUND_262, 0) + EVT_CALL(ShowEmote, NPC_Bowser, EMOTE_EXCLAMATION, -45, 20, TRUE, 0, 0, 0, 0) + EVT_CALL(PlaySoundAtNpc, NPC_Kammy, SOUND_262, 0) + EVT_CALL(ShowEmote, NPC_Kammy, EMOTE_EXCLAMATION, -45, 20, TRUE, 0, 0, 0, 0) + EVT_WAIT(20) + EVT_THREAD + EVT_LOOP(2) + EVT_CALL(InterpNpcYaw, NPC_Kammy, 90, 7) + EVT_WAIT(5) + EVT_CALL(InterpNpcYaw, NPC_Kammy, 270, 7) + EVT_WAIT(5) + EVT_END_LOOP + EVT_CALL(InterpNpcYaw, NPC_Kammy, 90, 7) + EVT_END_THREAD + EVT_WAIT(5) + EVT_THREAD + EVT_LOOP(2) + EVT_CALL(InterpNpcYaw, NPC_Bowser, 270, 7) + EVT_WAIT(5) + EVT_CALL(InterpNpcYaw, NPC_Bowser, 90, 7) + EVT_WAIT(5) + EVT_END_LOOP + EVT_END_THREAD + EVT_WAIT(50) + EVT_EXEC_WAIT(N(EVS_FocusCam_WholeRoom)) + EVT_WAIT(20) + EVT_CALL(SetMusicTrack, 0, SONG_KOOPA_BROS_THEME, 0, 8) + EVT_CALL(ShowMessageAtScreenPos, MSG_Peach_CH1_KoopaBros_0008, 300, 20) + EVT_WAIT(20) + EVT_THREAD + EVT_CALL(SetNpcPos, NPC_KoopaBros_02, 300, 180, -60) + EVT_CALL(SetNpcAnimation, NPC_KoopaBros_02, ANIM_KoopaBros_Red_Anim12) + EVT_CALL(EnableNpcBlur, NPC_KoopaBros_02, TRUE) + EVT_CALL(SetNpcJumpscale, NPC_KoopaBros_02, EVT_FLOAT(0.5)) + EVT_CALL(SetNpcFlagBits, NPC_KoopaBros_02, NPC_FLAG_GRAVITY, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_KoopaBros_02, NPC_FLAG_8, FALSE) + EVT_CALL(NpcMoveTo, NPC_KoopaBros_02, 100, -40, 18) + EVT_CALL(PlaySoundAtNpc, NPC_KoopaBros_02, SOUND_3E9, SOUND_PARAM_MUTE) + EVT_PLAY_EFFECT(EFFECT_LANDING_DUST, 1, 100, 0, -40, 0) + EVT_CALL(EnableNpcBlur, NPC_KoopaBros_02, FALSE) + EVT_CALL(SetNpcAnimation, NPC_KoopaBros_02, ANIM_KoopaBros_Red_Anim05) + EVT_END_THREAD + EVT_THREAD + EVT_WAIT(5) + EVT_CALL(SetNpcPos, NPC_KoopaBros_01, 328, 180, -15) + EVT_CALL(SetNpcAnimation, NPC_KoopaBros_01, ANIM_KoopaBros_Black_Anim12) + EVT_CALL(EnableNpcBlur, NPC_KoopaBros_01, TRUE) + EVT_CALL(SetNpcJumpscale, NPC_KoopaBros_01, EVT_FLOAT(0.5)) + EVT_CALL(SetNpcFlagBits, NPC_KoopaBros_01, NPC_FLAG_GRAVITY, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_KoopaBros_01, NPC_FLAG_8, FALSE) + EVT_CALL(NpcMoveTo, NPC_KoopaBros_01, 128, -15, 18) + EVT_CALL(PlaySoundAtNpc, NPC_KoopaBros_01, SOUND_3E9, SOUND_PARAM_MUTE) + EVT_PLAY_EFFECT(EFFECT_LANDING_DUST, 1, 128, 0, -15, 0) + EVT_CALL(EnableNpcBlur, NPC_KoopaBros_01, FALSE) + EVT_CALL(SetNpcAnimation, NPC_KoopaBros_01, ANIM_KoopaBros_Black_Anim05) + EVT_END_THREAD + EVT_THREAD + EVT_WAIT(10) + EVT_CALL(SetNpcPos, NPC_KoopaBros_03, 340, 180, -90) + EVT_CALL(SetNpcAnimation, NPC_KoopaBros_03, ANIM_KoopaBros_Yellow_Anim12) + EVT_CALL(EnableNpcBlur, NPC_KoopaBros_03, TRUE) + EVT_CALL(SetNpcJumpscale, NPC_KoopaBros_03, EVT_FLOAT(0.5)) + EVT_CALL(SetNpcFlagBits, NPC_KoopaBros_03, NPC_FLAG_GRAVITY, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_KoopaBros_03, NPC_FLAG_8, FALSE) + EVT_CALL(NpcMoveTo, NPC_KoopaBros_03, 140, -90, 18) + EVT_CALL(PlaySoundAtNpc, NPC_KoopaBros_03, SOUND_3E9, SOUND_PARAM_MUTE) + EVT_PLAY_EFFECT(EFFECT_LANDING_DUST, 1, 140, 0, -90, 0) + EVT_CALL(EnableNpcBlur, NPC_KoopaBros_03, FALSE) + EVT_CALL(SetNpcAnimation, NPC_KoopaBros_03, ANIM_KoopaBros_Yellow_Anim05) + EVT_END_THREAD + EVT_THREAD + EVT_WAIT(15) + EVT_CALL(SetNpcPos, NPC_KoopaBros_04, 368, 180, -45) + EVT_CALL(SetNpcAnimation, NPC_KoopaBros_04, ANIM_KoopaBros_Green_Anim12) + EVT_CALL(EnableNpcBlur, NPC_KoopaBros_04, TRUE) + EVT_CALL(SetNpcJumpscale, NPC_KoopaBros_04, EVT_FLOAT(0.5)) + EVT_CALL(SetNpcFlagBits, NPC_KoopaBros_04, NPC_FLAG_GRAVITY, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_KoopaBros_04, NPC_FLAG_8, FALSE) + EVT_CALL(NpcMoveTo, NPC_KoopaBros_04, 168, -45, 18) + EVT_CALL(PlaySoundAtNpc, NPC_KoopaBros_04, SOUND_3E9, SOUND_PARAM_MUTE) + EVT_PLAY_EFFECT(EFFECT_LANDING_DUST, 1, 168, 0, -45, 0) + EVT_CALL(EnableNpcBlur, NPC_KoopaBros_04, FALSE) + EVT_CALL(SetNpcAnimation, NPC_KoopaBros_04, ANIM_KoopaBros_Green_Anim05) + EVT_END_THREAD + EVT_WAIT(50) + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, 128, 0, -15) + EVT_CALL(SetPanTarget, CAM_DEFAULT, 128, 0, -15) + EVT_CALL(SetCamDistance, CAM_DEFAULT, EVT_FLOAT(240.0)) + EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(17.0), EVT_FLOAT(-11.0)) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(90.0)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_WAIT(15) + EVT_THREAD + EVT_CALL(PlaySoundAtNpc, NPC_KoopaBros_02, SOUND_20F3, 0) + EVT_CALL(GetNpcPos, NPC_KoopaBros_02, LVar0, LVar1, LVar2) + EVT_ADD(LVar0, 5) + EVT_ADD(LVar1, 30) + EVT_PLAY_EFFECT(EFFECT_LENS_FLARE, 0, LVar0, LVar1, LVar2, 40) + EVT_CALL(SetNpcAnimation, NPC_KoopaBros_02, ANIM_KoopaBros_Red_Anim1A) + EVT_END_THREAD + EVT_THREAD + EVT_WAIT(5) + EVT_CALL(PlaySoundAtNpc, NPC_KoopaBros_01, SOUND_20F3, 0) + EVT_CALL(GetNpcPos, NPC_KoopaBros_01, LVar0, LVar1, LVar2) + EVT_ADD(LVar0, 5) + EVT_ADD(LVar1, 30) + EVT_PLAY_EFFECT(EFFECT_LENS_FLARE, 0, LVar0, LVar1, LVar2, 40) + EVT_CALL(SetNpcAnimation, NPC_KoopaBros_01, ANIM_KoopaBros_Black_Anim1A) + EVT_END_THREAD + EVT_THREAD + EVT_WAIT(10) + EVT_CALL(PlaySoundAtNpc, NPC_KoopaBros_03, SOUND_20F3, 0) + EVT_CALL(GetNpcPos, NPC_KoopaBros_03, LVar0, LVar1, LVar2) + EVT_ADD(LVar0, 5) + EVT_ADD(LVar1, 30) + EVT_PLAY_EFFECT(EFFECT_LENS_FLARE, 0, LVar0, LVar1, LVar2, 40) + EVT_CALL(SetNpcAnimation, NPC_KoopaBros_03, ANIM_KoopaBros_Yellow_Anim1A) + EVT_END_THREAD + EVT_THREAD + EVT_WAIT(15) + EVT_CALL(PlaySoundAtNpc, NPC_KoopaBros_04, SOUND_20F3, 0) + EVT_CALL(GetNpcPos, NPC_KoopaBros_04, LVar0, LVar1, LVar2) + EVT_ADD(LVar0, 5) + EVT_ADD(LVar1, 30) + EVT_PLAY_EFFECT(EFFECT_LENS_FLARE, 0, LVar0, LVar1, LVar2, 40) + EVT_CALL(SetNpcAnimation, NPC_KoopaBros_04, ANIM_KoopaBros_Green_Anim1A) + EVT_END_THREAD + EVT_WAIT(45) + EVT_CALL(SpeakToNpc, NPC_KoopaBros_02, ANIM_KoopaBros_Red_Anim1A, ANIM_KoopaBros_Red_Anim1A, 0, NPC_Bowser, MSG_Peach_CH1_KoopaBros_0009) + EVT_WAIT(10) + EVT_EXEC_WAIT(N(EVS_FocusCam_BowserWide)) + EVT_WAIT(15) + EVT_CALL(InterpNpcYaw, NPC_Kammy, 270, 0) + EVT_CALL(SpeakToNpc, NPC_Bowser, ANIM_WorldBowser_Talk, ANIM_WorldBowser_Idle, 0, NPC_Kammy, MSG_Peach_CH1_KoopaBros_000A) + EVT_CALL(SetNpcAnimation, NPC_KoopaBros_02, ANIM_KoopaBros_Red_Anim04) + EVT_CALL(SetNpcAnimation, NPC_KoopaBros_01, ANIM_KoopaBros_Black_Anim04) + EVT_CALL(SetNpcAnimation, NPC_KoopaBros_03, ANIM_KoopaBros_Yellow_Anim04) + EVT_CALL(SetNpcAnimation, NPC_KoopaBros_04, ANIM_KoopaBros_Green_Anim04) + EVT_EXEC_WAIT(N(EVS_FocusCam_KoopaBros)) + EVT_WAIT(10) + EVT_CALL(SetNpcAnimation, NPC_KoopaBros_02, ANIM_KoopaBros_Red_Anim02) + EVT_CALL(NpcMoveTo, NPC_KoopaBros_02, 80, -40, 10) + EVT_CALL(SetNpcAnimation, NPC_KoopaBros_02, ANIM_KoopaBros_Red_Anim04) + EVT_CALL(SpeakToNpc, NPC_KoopaBros_02, ANIM_KoopaBros_Red_Anim14, ANIM_KoopaBros_Red_Anim04, 0, NPC_Bowser, MSG_Peach_CH1_KoopaBros_000B) + EVT_EXEC_WAIT(N(EVS_FocusCam_WholeRoom)) + EVT_CALL(SetNpcPos, NPC_KoopaBros_02, 80, 0, -40) + EVT_CALL(InterpNpcYaw, NPC_Kammy, 90, 5) + EVT_CALL(SpeakToNpc, NPC_Kammy, ANIM_WorldKammy_Anim04, ANIM_WorldKammy_Anim01, 0, NPC_KoopaBros_01, MSG_Peach_CH1_KoopaBros_000C) + EVT_CALL(SpeakToNpc, NPC_KoopaBros_02, ANIM_KoopaBros_Red_Anim14, ANIM_KoopaBros_Red_Anim04, 0, NPC_Bowser, MSG_Peach_CH1_KoopaBros_000D) + EVT_CALL(InterpNpcYaw, NPC_KoopaBros_02, 90, 5) + EVT_WAIT(10) + EVT_CALL(SpeakToPlayer, NPC_KoopaBros_02, ANIM_KoopaBros_Red_Anim14, ANIM_KoopaBros_Red_Anim04, 5, MSG_Peach_CH1_KoopaBros_000E) + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, -50, 0, 0) + EVT_CALL(SetPanTarget, CAM_DEFAULT, -50, 0, 0) + EVT_CALL(SetCamDistance, CAM_DEFAULT, EVT_FLOAT(200.0)) + EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(17.0), EVT_FLOAT(-18.0)) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(1.2)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_WAIT(40) + EVT_EXEC_GET_TID(N(EVS_PlaySounds_KoopaBrosShowOff), LVarB) + EVT_CALL(N(SetLightSourcePos), 100, 0, -40) + EVT_CALL(EnableSpriteShading, TRUE) + EVT_PLAY_EFFECT(EFFECT_LIGHT_RAYS, 3, 100, 0, -40, 1, LVarA) + EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_CALL(SpeakToNpc, NPC_Bowser, ANIM_WorldBowser_Talk, ANIM_WorldBowser_Idle, 0, NPC_KoopaBros_01, MSG_Peach_CH1_KoopaBros_000F) + EVT_WAIT(20) + EVT_KILL_THREAD(LVarB) + EVT_CALL(func_802D7B10, LVarA) + EVT_CALL(EnableSpriteShading, FALSE) + EVT_WAIT(30) + EVT_EXEC_WAIT(N(EVS_FocusCam_KoopaBros)) + EVT_WAIT(10) + EVT_CALL(SpeakToNpc, NPC_KoopaBros_02, ANIM_KoopaBros_Red_Anim14, ANIM_KoopaBros_Red_Anim04, 0, NPC_Bowser, MSG_Peach_CH1_KoopaBros_0010) + EVT_EXEC_WAIT(N(EVS_FocusCam_WholeRoom)) + EVT_CALL(SpeakToNpc, NPC_Bowser, ANIM_WorldBowser_Talk, ANIM_WorldBowser_Idle, 0, NPC_KoopaBros_01, MSG_Peach_CH1_KoopaBros_0011) + EVT_CALL(SpeakToNpc, NPC_KoopaBros_02, ANIM_KoopaBros_Red_Anim14, ANIM_KoopaBros_Red_Anim04, 0, NPC_Bowser, MSG_Peach_CH1_KoopaBros_0012) + EVT_CALL(SetPanTarget, CAM_DEFAULT, -50, 0, 0) + EVT_CALL(SetCamDistance, CAM_DEFAULT, EVT_FLOAT(250.0)) + EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(17.0), EVT_FLOAT(-17.0)) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(90.0)) + EVT_WAIT(10) + EVT_CALL(SpeakToNpc, NPC_Bowser, ANIM_WorldBowser_Talk, ANIM_WorldBowser_Idle, 0, NPC_KoopaBros_01, MSG_Peach_CH1_KoopaBros_0013) + EVT_EXEC_WAIT(N(EVS_FocusCam_KoopaBros)) + EVT_WAIT(10) + EVT_CALL(FadeOutMusic, 0, 500) + EVT_CALL(PlaySoundAtNpc, NPC_KoopaBros_03, SOUND_262, 0) + EVT_CALL(ShowEmote, NPC_KoopaBros_03, EMOTE_EXCLAMATION, -45, 20, TRUE, 0, 0, 0, 0) + EVT_CALL(PlaySoundAtNpc, NPC_KoopaBros_02, SOUND_262, 0) + EVT_CALL(ShowEmote, NPC_KoopaBros_02, EMOTE_EXCLAMATION, -45, 20, TRUE, 0, 0, 0, 0) + EVT_CALL(PlaySoundAtNpc, NPC_KoopaBros_04, SOUND_262, 0) + EVT_CALL(ShowEmote, NPC_KoopaBros_04, EMOTE_EXCLAMATION, -45, 20, TRUE, 0, 0, 0, 0) + EVT_CALL(PlaySoundAtNpc, NPC_KoopaBros_01, SOUND_262, 0) + EVT_CALL(ShowEmote, NPC_KoopaBros_01, EMOTE_EXCLAMATION, -45, 20, TRUE, 0, 0, 0, 0) + EVT_WAIT(30) + EVT_CALL(SpeakToNpc, NPC_KoopaBros_02, ANIM_KoopaBros_Red_Anim14, ANIM_KoopaBros_Red_Anim04, 0, NPC_Bowser, MSG_Peach_CH1_KoopaBros_0014) + EVT_CALL(SetPanTarget, CAM_DEFAULT, 30, 0, 0) + EVT_CALL(SetCamDistance, CAM_DEFAULT, 400) + EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(17.0), EVT_FLOAT(-11.0)) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(5.0)) + EVT_THREAD + EVT_CALL(SetNpcAnimation, NPC_KoopaBros_02, ANIM_KoopaBros_Red_Anim0A) + EVT_CALL(NpcJump0, NPC_KoopaBros_02, 80, 0, -40, 10) + EVT_CALL(SetNpcAnimation, NPC_KoopaBros_02, ANIM_KoopaBros_Red_Anim04) + EVT_END_THREAD + EVT_THREAD + EVT_CALL(SetNpcAnimation, NPC_KoopaBros_01, ANIM_KoopaBros_Black_Anim0A) + EVT_CALL(NpcJump0, NPC_KoopaBros_01, 128, 0, -15, 10) + EVT_CALL(SetNpcAnimation, NPC_KoopaBros_01, ANIM_KoopaBros_Black_Anim04) + EVT_END_THREAD + EVT_THREAD + EVT_CALL(SetNpcAnimation, NPC_KoopaBros_03, ANIM_KoopaBros_Yellow_Anim0A) + EVT_CALL(NpcJump0, NPC_KoopaBros_03, 140, 0, -90, 10) + EVT_CALL(SetNpcAnimation, NPC_KoopaBros_03, ANIM_KoopaBros_Yellow_Anim04) + EVT_END_THREAD + EVT_THREAD + EVT_CALL(SetNpcAnimation, NPC_KoopaBros_04, ANIM_KoopaBros_Green_Anim0A) + EVT_CALL(NpcJump0, NPC_KoopaBros_04, 168, 0, -45, 10) + EVT_CALL(SetNpcAnimation, NPC_KoopaBros_04, ANIM_KoopaBros_Green_Anim04) + EVT_END_THREAD + EVT_THREAD + EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 30, EVT_FLOAT(1.0)) + EVT_END_THREAD + EVT_CALL(SpeakToNpc, NPC_Bowser, ANIM_WorldBowser_Talk, ANIM_WorldBowser_Idle, 0, NPC_KoopaBros_02, MSG_Peach_CH1_KoopaBros_0015) + EVT_THREAD + EVT_CALL(PlaySoundAtNpc, NPC_KoopaBros_02, SOUND_173, 0) + EVT_CALL(InterpNpcYaw, NPC_KoopaBros_02, 90, 0) + EVT_CALL(EnableNpcBlur, NPC_KoopaBros_02, TRUE) + EVT_CALL(SetNpcAnimation, NPC_KoopaBros_02, ANIM_KoopaBros_Red_Anim03) + EVT_WAIT(30) + EVT_CALL(PlaySoundAtNpc, NPC_KoopaBros_02, SOUND_174, 0) + EVT_CALL(NpcMoveTo, NPC_KoopaBros_02, 200, -60, 10) + EVT_END_THREAD + EVT_THREAD + EVT_CALL(InterpNpcYaw, NPC_KoopaBros_01, 90, 0) + EVT_CALL(EnableNpcBlur, NPC_KoopaBros_01, TRUE) + EVT_CALL(SetNpcAnimation, NPC_KoopaBros_01, ANIM_KoopaBros_Black_Anim03) + EVT_WAIT(30) + EVT_CALL(EnableNpcBlur, NPC_KoopaBros_01, TRUE) + EVT_CALL(NpcMoveTo, NPC_KoopaBros_01, 200, -60, 10) + EVT_END_THREAD + EVT_THREAD + EVT_CALL(InterpNpcYaw, NPC_KoopaBros_03, 90, 0) + EVT_CALL(EnableNpcBlur, NPC_KoopaBros_03, TRUE) + EVT_CALL(SetNpcAnimation, NPC_KoopaBros_03, ANIM_KoopaBros_Yellow_Anim03) + EVT_WAIT(30) + EVT_CALL(EnableNpcBlur, NPC_KoopaBros_03, TRUE) + EVT_CALL(NpcMoveTo, NPC_KoopaBros_03, 200, -60, 10) + EVT_END_THREAD + EVT_THREAD + EVT_CALL(InterpNpcYaw, NPC_KoopaBros_04, 90, 0) + EVT_CALL(EnableNpcBlur, NPC_KoopaBros_04, TRUE) + EVT_CALL(SetNpcAnimation, NPC_KoopaBros_04, ANIM_KoopaBros_Green_Anim03) + EVT_WAIT(30) + EVT_CALL(EnableNpcBlur, NPC_KoopaBros_04, TRUE) + EVT_CALL(NpcMoveTo, NPC_KoopaBros_04, 200, -60, 10) + EVT_END_THREAD + EVT_WAIT(30) + EVT_EXEC_WAIT(N(EVS_EndPeachChapter0)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 0) + EVT_CALL(DisablePlayerPhysics, FALSE) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_kkj/kkj_15/kkj_15_5_chapter1.c b/src/world/area_kkj/kkj_15/kkj_15_5_chapter1.c new file mode 100644 index 0000000000..80e8ca49e2 --- /dev/null +++ b/src/world/area_kkj/kkj_15/kkj_15_5_chapter1.c @@ -0,0 +1,344 @@ +#include "kkj_15.h" + +Vec3f N(TwinkFollowCh1Path1)[] = { + { -70.0, 120.0, -70.0 }, + { -40.0, 110.0, -70.0 }, + { -10.0, 120.0, -70.0 }, + { 20.0, 110.0, -70.0 }, + { 50.0, 120.0, -70.0 }, + { 80.0, 110.0, -70.0 }, + { 110.0, 120.0, -70.0 }, + { 140.0, 110.0, -70.0 }, + { 170.0, 120.0, -70.0 }, + { 200.0, 110.0, -70.0 }, + { 230.0, 120.0, -70.0 }, +}; + +Vec3f N(TwinkFollowCh1Path2)[] = { + { 230.0, 120.0, -70.0 }, + { 220.0, 60.0, -70.0 }, + { 250.0, 40.0, -70.0 }, +}; + +EvtScript N(EVS_ApproachPeach_Ch1) = { + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_SUB(LVar0, 10) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_CALL(SetNpcVar, NPC_Koopatrol_01, 0, 1) + EVT_THREAD + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_SUB(LVar0, 26) + EVT_SUB(LVar2, 2) + EVT_CALL(SetNpcAnimation, NPC_Koopatrol_01, ANIM_WorldKoopatrol_Anim06) + EVT_CALL(SetNpcSpeed, NPC_Koopatrol_01, EVT_FLOAT(5.0)) + EVT_CALL(NpcMoveTo, NPC_Koopatrol_01, LVar0, LVar2, 0) + EVT_CALL(SetNpcAnimation, NPC_Koopatrol_01, ANIM_WorldKoopatrol_Anim01) + EVT_CALL(NpcFacePlayer, NPC_Koopatrol_01, 5) + EVT_CALL(SetNpcVar, NPC_Koopatrol_01, 0, 0) + EVT_END_THREAD + EVT_THREAD + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_ADD(LVar0, 26) + EVT_ADD(LVar2, 2) + EVT_CALL(SetNpcAnimation, NPC_Koopatrol_02, ANIM_WorldKoopatrol_Anim06) + EVT_CALL(SetNpcSpeed, NPC_Koopatrol_02, EVT_FLOAT(5.0)) + EVT_CALL(NpcMoveTo, NPC_Koopatrol_02, LVar0, LVar2, 0) + EVT_CALL(SetNpcAnimation, NPC_Koopatrol_02, ANIM_WorldKoopatrol_Anim01) + EVT_CALL(NpcFacePlayer, NPC_Koopatrol_02, 5) + EVT_END_THREAD + EVT_LOOP(0) + EVT_WAIT(1) + EVT_CALL(GetNpcVar, NPC_Koopatrol_01, 0, LVar0) + EVT_IF_EQ(LVar0, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_WAIT(10) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_PickUpPeach_Ch1) = { + EVT_THREAD + EVT_CALL(GetNpcPos, NPC_Koopatrol_01, LVar0, LVar1, LVar2) + EVT_ADD(LVar0, 5) + EVT_CALL(NpcMoveTo, NPC_Koopatrol_01, LVar0, LVar2, 5) + EVT_CALL(SetNpcAnimation, NPC_Koopatrol_01, ANIM_WorldKoopatrol_Anim12) + EVT_ADD(LVar0, 5) + EVT_CALL(NpcMoveTo, NPC_Koopatrol_01, LVar0, LVar2, 5) + EVT_END_THREAD + EVT_THREAD + EVT_CALL(GetNpcPos, NPC_Koopatrol_02, LVar0, LVar1, LVar2) + EVT_SUB(LVar0, 5) + EVT_CALL(NpcMoveTo, NPC_Koopatrol_02, LVar0, LVar2, 5) + EVT_CALL(SetNpcAnimation, NPC_Koopatrol_02, ANIM_WorldKoopatrol_Anim12) + EVT_SUB(LVar0, 5) + EVT_CALL(NpcMoveTo, NPC_Koopatrol_02, LVar0, LVar2, 5) + EVT_END_THREAD + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0005) + EVT_WAIT(1) + EVT_LOOP(4) + EVT_ADD(LVar1, 2) + EVT_CALL(SetPlayerPos, LVar0, LVar1, LVar2) + EVT_WAIT(1) + EVT_END_LOOP + EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0018) + EVT_SUB(LVar0, 10) + EVT_LOOP(5) + EVT_ADD(LVar1, 4) + EVT_CALL(SetPlayerPos, LVar0, LVar1, LVar2) + EVT_WAIT(1) + EVT_END_LOOP + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_CarryPeachAway_Ch1) = { + EVT_CALL(InterpNpcYaw, NPC_Koopatrol_02, 90, 3) + EVT_WAIT(10) + EVT_THREAD + EVT_LOOP(0) + EVT_CALL(GetNpcPos, NPC_Koopatrol_01, LVar0, LVar1, LVar2) + EVT_ADD(LVar0, 10) + EVT_ADD(LVar2, 2) + EVT_CALL(SetPlayerPos, LVar0, 30, LVar2) + EVT_WAIT(1) + EVT_END_LOOP + EVT_END_THREAD + EVT_CALL(SetNpcVar, NPC_Koopatrol_01, 0, 1) + EVT_THREAD + EVT_CALL(SetNpcAnimation, NPC_Koopatrol_01, ANIM_WorldKoopatrol_Anim14) + EVT_CALL(SetNpcSpeed, NPC_Koopatrol_01, EVT_FLOAT(7.5)) + EVT_CALL(NpcMoveTo, NPC_Koopatrol_01, 249, -72, 0) + EVT_CALL(SetNpcVar, NPC_Koopatrol_01, 0, 0) + EVT_END_THREAD + EVT_THREAD + EVT_CALL(SetNpcAnimation, NPC_Koopatrol_02, ANIM_WorldKoopatrol_Anim14) + EVT_CALL(SetNpcSpeed, NPC_Koopatrol_02, EVT_FLOAT(7.5)) + EVT_CALL(NpcMoveTo, NPC_Koopatrol_02, 281, -68, 0) + EVT_END_THREAD + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(90.0)) + EVT_LOOP(0) + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar0, 0, LVar2) + EVT_CALL(GetNpcVar, NPC_Koopatrol_01, 0, LVar0) + EVT_WAIT(1) + EVT_IF_EQ(LVar0, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Inspect_Door) = { + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(DisablePartnerAI, 0) + EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_Twink_Talk, ANIM_Twink_Idle, 0, MSG_Peach_004A) + EVT_CALL(EnablePartnerAI) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Inspect_BowsersDiary) = { + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(DisablePlayerPhysics, TRUE) + EVT_CALL(SetCamLeadPlayer, CAM_DEFAULT, FALSE) + EVT_THREAD + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, 50, 0, 37) + EVT_CALL(SetPanTarget, CAM_DEFAULT, -237, 0, 37) + EVT_CALL(SetCamDistance, CAM_DEFAULT, 300) + EVT_CALL(SetCamPosA, CAM_DEFAULT, -180, -20) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(90.0)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_END_THREAD + EVT_CALL(SetPlayerFlagBits, PS_FLAG_NO_FLIPPING, TRUE) + EVT_CALL(SetPlayerPos, -164, 0, -53) + EVT_CALL(InterpPlayerYaw, 225, 0) + EVT_CALL(SetPlayerFlagBits, PS_FLAG_NO_FLIPPING, FALSE) + EVT_CALL(DisablePartnerAI, 0) + EVT_CALL(NpcJump0, NPC_PARTNER, -225, 50, -80, 20) + EVT_CALL(NpcFacePlayer, NPC_PARTNER, 0) + EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_Twink_Talk, ANIM_Twink_Idle, 5, MSG_Peach_004B) + EVT_CALL(SetPlayerAnimation, ANIM_Peach_C000C) + EVT_CALL(ShowChoice, MSG_Choice_0022) + EVT_CALL(SetPlayerAnimation, ANIM_Peach_A0001) + EVT_CALL(ContinueSpeech, NPC_PARTNER, ANIM_Twink_Talk, ANIM_Twink_Idle, 5, MSG_Peach_004C) + EVT_CALL(NpcFlyTo, NPC_PARTNER, -210, 40, -70, 20, 0, EASING_LINEAR) + EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_Twink_Talk, ANIM_Twink_Idle, 0, MSG_Peach_004D) + EVT_CALL(SetPlayerAnimation, ANIM_Peach_C000C) + EVT_CALL(ShowChoice, MSG_Choice_0023) + EVT_CALL(SetPlayerAnimation, ANIM_Peach_A0001) + EVT_CALL(ContinueSpeech, NPC_PARTNER, ANIM_Twink_Talk, ANIM_Twink_Idle, 0, MSG_Peach_004E) + EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0005) + EVT_CALL(SetNpcAnimation, NPC_PARTNER, ANIM_Twink_Cringe) + EVT_CALL(NpcJump0, NPC_PARTNER, -210, 40, -70, 10) + EVT_CALL(SetNpcAnimation, NPC_PARTNER, ANIM_Twink_Idle) + EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_Twink_Shout, ANIM_Twink_Shout, 0, MSG_Peach_004F) + EVT_CALL(SetPlayerAnimation, ANIM_Peach_A0001) + EVT_CALL(ShowChoice, MSG_Choice_0024) + EVT_IF_EQ(LVar0, 1) + EVT_CALL(ContinueSpeech, NPC_PARTNER, ANIM_Twink_Talk, ANIM_Twink_Idle, 0, MSG_Peach_0050) + EVT_CALL(ShowChoice, MSG_Choice_0025) + EVT_END_IF + EVT_CALL(ContinueSpeech, NPC_PARTNER, ANIM_Twink_Talk, ANIM_Twink_Idle, 0, MSG_Peach_0051) + EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0005) + EVT_CALL(SetNpcAnimation, NPC_PARTNER, ANIM_Twink_Cringe) + EVT_CALL(NpcJump0, NPC_PARTNER, -210, 40, -70, 10) + EVT_CALL(NpcJump0, NPC_PARTNER, -210, 40, -70, 10) + EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_Twink_Shout, ANIM_Twink_Shout, 0, MSG_Peach_0052) + EVT_CALL(SetPlayerAnimation, ANIM_Peach_A0001) + EVT_CALL(SpeakToPlayer, NPC_PLAYER, ANIM_Peach_C0007, ANIM_Peach_C0008, 5, MSG_Peach_0053) + EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_Twink_Shout, ANIM_Twink_Shout, 0, MSG_Peach_0054) + EVT_CALL(InterpPlayerYaw, 90, 0) + EVT_CALL(SetNpcAnimation, NPC_PARTNER, ANIM_Twink_Fly) + EVT_CALL(NpcFlyTo, NPC_PARTNER, -180, 40, -100, 10, 0, EASING_LINEAR) + EVT_WAIT(10) + EVT_CALL(SetMusicTrack, 0, SONG_BOWSER_THEME, 0, 8) + EVT_CALL(SetPanTarget, CAM_DEFAULT, 237, 0, 37) + EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(17.0), EVT_FLOAT(-12.0)) + EVT_CALL(SetCamPosB, CAM_DEFAULT, 170, -20) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(90.0)) + EVT_WAIT(30) + EVT_THREAD + EVT_CALL(PlaySoundAtCollider, COLLIDER_tte, SOUND_BASIC_DOOR_OPEN, 0) + EVT_CALL(MakeLerp, 0, 120, 20, EASING_COS_FAST_OVERSHOOT) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_CALL(RotateModel, MODEL_o2, LVar0, 0, 1, 0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_END_THREAD + EVT_WAIT(10) + EVT_CALL(SetNpcPos, NPC_Bowser, 280, 0, -70) + EVT_CALL(SetNpcAnimation, NPC_Bowser, ANIM_WorldBowser_Walk) + EVT_CALL(SetNpcSpeed, NPC_Bowser, EVT_FLOAT(3.0)) + EVT_CALL(NpcMoveTo, NPC_Bowser, 170, -40, 0) + EVT_CALL(SetNpcAnimation, NPC_Bowser, ANIM_WorldBowser_Idle) + EVT_CALL(SpeakToPlayer, NPC_Bowser, ANIM_WorldBowser_Talk, ANIM_WorldBowser_Idle, 5, MSG_Peach_0055) + EVT_THREAD + EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0011) + EVT_WAIT(10) + EVT_CALL(SetPanTarget, CAM_DEFAULT, -110, 0, -40) + EVT_CALL(SetCamDistance, CAM_DEFAULT, EVT_FLOAT(300.0)) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(90.0)) + EVT_WAIT(10) + EVT_CALL(SetNpcAnimation, NPC_PARTNER, ANIM_Twink_Cringe) + EVT_CALL(NpcJump0, NPC_PARTNER, -168, 38, -112, 10) + EVT_WAIT(30) + EVT_CALL(SetPlayerAnimation, ANIM_Peach_C000E) + EVT_END_THREAD + EVT_CALL(SetNpcAnimation, NPC_Bowser, ANIM_WorldBowser_Walk) + EVT_CALL(NpcMoveTo, NPC_Bowser, -70, -40, 80) + EVT_CALL(SetNpcAnimation, NPC_Bowser, ANIM_WorldBowser_Idle) + EVT_WAIT(10) + EVT_CALL(SetNpcAnimation, NPC_Bowser, ANIM_WorldBowser_Shock) + EVT_CALL(NpcJump0, NPC_Bowser, -70, 0, -40, 10) + EVT_CALL(SpeakToPlayer, NPC_Bowser, ANIM_WorldBowser_AngryTalk, ANIM_WorldBowser_Idle, 0, MSG_Peach_0056) + EVT_CALL(NpcJump0, NPC_Bowser, -70, 0, -40, 10) + EVT_CALL(SetNpcAnimation, NPC_Bowser, ANIM_WorldBowser_Idle) + EVT_WAIT(10) + EVT_CALL(SpeakToPlayer, NPC_Bowser, ANIM_WorldBowser_AngryTalk, ANIM_WorldBowser_Idle, 0, MSG_Peach_0057) + EVT_WAIT(10) + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, 240, 0, 37) + EVT_CALL(SetPanTarget, CAM_DEFAULT, 240, 0, 37) + EVT_CALL(SetCamDistance, CAM_DEFAULT, EVT_FLOAT(400.0)) + EVT_CALL(SetCamPosB, CAM_DEFAULT, 134, -20) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_WAIT(5) + EVT_CALL(SetNpcPos, NPC_Bowser, -100, 0, -70) + EVT_CALL(SetNpcYaw, NPC_Bowser, 90) + EVT_CALL(SetNpcPos, NPC_Koopatrol_01, 280, 0, -70) + EVT_CALL(SetNpcPos, NPC_Koopatrol_02, 310, 0, -70) + EVT_CALL(SetPlayerPos, -136, 0, -20) + EVT_THREAD + EVT_LOOP(0) + EVT_CALL(NpcFaceNpc, NPC_Bowser, NPC_Koopatrol_02, 0) + EVT_WAIT(1) + EVT_END_LOOP + EVT_END_THREAD + EVT_CALL(SetNpcVar, NPC_Koopatrol_01, 0, 1) + EVT_THREAD + EVT_CALL(SetNpcAnimation, NPC_Koopatrol_01, ANIM_WorldKoopatrol_Anim06) + EVT_CALL(SetNpcSpeed, NPC_Koopatrol_01, EVT_FLOAT(5.0)) + EVT_CALL(NpcMoveTo, NPC_Koopatrol_01, -50, -30, 0) + EVT_CALL(SetNpcAnimation, NPC_Koopatrol_01, ANIM_WorldKoopatrol_Anim01) + EVT_CALL(SetNpcVar, NPC_Koopatrol_01, 0, 0) + EVT_END_THREAD + EVT_THREAD + EVT_CALL(SetNpcAnimation, NPC_Koopatrol_02, ANIM_WorldKoopatrol_Anim06) + EVT_CALL(SetNpcSpeed, NPC_Koopatrol_02, EVT_FLOAT(5.0)) + EVT_CALL(NpcMoveTo, NPC_Koopatrol_02, -20, -30, 0) + EVT_CALL(SetNpcAnimation, NPC_Koopatrol_02, ANIM_WorldKoopatrol_Anim01) + EVT_END_THREAD + EVT_LOOP(0) + EVT_CALL(GetNpcPos, NPC_Koopatrol_01, LVar0, LVar1, LVar2) + EVT_SUB(LVar0, 40) + EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_WAIT(1) + EVT_CALL(GetNpcVar, NPC_Koopatrol_01, 0, LVar0) + EVT_IF_EQ(LVar0, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_CALL(SpeakToNpc, NPC_Koopatrol_01, ANIM_WorldKoopatrol_Anim08, ANIM_WorldKoopatrol_Anim01, 5, NPC_Bowser, MSG_Peach_0058) + EVT_CALL(SpeakToNpc, NPC_Bowser, ANIM_WorldBowser_Talk, ANIM_WorldBowser_Idle, 5, NPC_Koopatrol_01, MSG_Peach_0059) + EVT_CALL(SpeakToNpc, NPC_Koopatrol_01, ANIM_WorldKoopatrol_Anim08, ANIM_WorldKoopatrol_Anim01, 5, NPC_Bowser, MSG_Peach_005A) + EVT_EXEC_WAIT(N(EVS_ApproachPeach_Ch1)) + EVT_EXEC_WAIT(N(EVS_PickUpPeach_Ch1)) + EVT_CALL(SpeakToPlayer, NPC_PLAYER, ANIM_Peach_C0018, ANIM_Peach_C0018, 5, MSG_Peach_005B) + EVT_EXEC_WAIT(N(EVS_CarryPeachAway_Ch1)) + EVT_WAIT(10) + EVT_CALL(SetNpcPos, NPC_PARTNER, -70, 120, -70) + EVT_CALL(LoadPath, 80, EVT_PTR(N(TwinkFollowCh1Path1)), ARRAY_COUNT(N(TwinkFollowCh1Path1)), EASING_LINEAR) + EVT_LOOP(0) + EVT_CALL(GetNextPathPos) + EVT_CALL(SetNpcPos, NPC_PARTNER, LVar1, LVar2, LVar3) + EVT_WAIT(1) + EVT_IF_EQ(LVar0, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_CALL(SetNpcAnimation, NPC_PARTNER, ANIM_Twink_TalkSad) + EVT_LOOP(2) + EVT_CALL(InterpNpcYaw, NPC_PARTNER, 270, 7) + EVT_WAIT(5) + EVT_CALL(InterpNpcYaw, NPC_PARTNER, 90, 7) + EVT_WAIT(5) + EVT_END_LOOP + EVT_CALL(InterpNpcYaw, NPC_PARTNER, 270, 7) + EVT_WAIT(15) + EVT_CALL(SetNpcAnimation, NPC_PARTNER, ANIM_Twink_Fly) + EVT_CALL(InterpNpcYaw, NPC_PARTNER, 90, 7) + EVT_CALL(LoadPath, 15, EVT_PTR(N(TwinkFollowCh1Path2)), ARRAY_COUNT(N(TwinkFollowCh1Path2)), EASING_LINEAR) + EVT_LOOP(0) + EVT_CALL(GetNextPathPos) + EVT_CALL(SetNpcPos, NPC_PARTNER, LVar1, LVar2, LVar3) + EVT_WAIT(1) + EVT_IF_EQ(LVar0, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_WAIT(30) + EVT_CALL(FadeOutMusic, 0, 1000) + EVT_EXEC_WAIT(N(EVS_EndPeachChapter1)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 0) + EVT_CALL(EnablePartnerAI) + EVT_CALL(DisablePlayerPhysics, FALSE) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_SetupChapter1) = { + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_Inspect_BowsersDiary)), TRIGGER_WALL_PRESS_A, COLLIDER_o100, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_Inspect_Door)), TRIGGER_WALL_PRESS_A, COLLIDER_tte, 1, 0) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_kkj/kkj_15/kkj_15_6_chapter2.c b/src/world/area_kkj/kkj_15/kkj_15_6_chapter2.c new file mode 100644 index 0000000000..e2f2201f15 --- /dev/null +++ b/src/world/area_kkj/kkj_15/kkj_15_6_chapter2.c @@ -0,0 +1,31 @@ +#include "kkj_15.h" + +EvtScript N(EVS_ExtiDoor_Chapter2) = { + EVT_IF_EQ(AF_KKJ_06, FALSE) + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(DisablePartnerAI, 1) + EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_Twink_Talk, ANIM_Twink_Idle, 0, MSG_Peach_006B) + EVT_CALL(EnablePartnerAI) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_END_IF + EVT_SET(LVar0, kkj_15_ENTRY_0) + EVT_SET(LVar1, COLLIDER_tte) + EVT_SET(LVar2, MODEL_o2) + EVT_SET(LVar3, DOOR_SWING_IN) + EVT_EXEC(ExitSingleDoor) + EVT_WAIT(17) + EVT_IF_EQ(AF_KKJ_06, FALSE) + EVT_CALL(GotoMap, EVT_PTR("kkj_11"), kkj_11_ENTRY_7) + EVT_ELSE + EVT_CALL(GotoMap, EVT_PTR("kkj_11"), kkj_11_ENTRY_3) + EVT_END_IF + EVT_WAIT(100) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_SetupChapter2) = { + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExtiDoor_Chapter2)), TRIGGER_WALL_PRESS_A, COLLIDER_tte, 1, 0) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_kkj/kkj_15/kkj_15_7_chapter3.c b/src/world/area_kkj/kkj_15/kkj_15_7_chapter3.c new file mode 100644 index 0000000000..4356b1c3f3 --- /dev/null +++ b/src/world/area_kkj/kkj_15/kkj_15_7_chapter3.c @@ -0,0 +1,345 @@ +#include "kkj_15.h" + +API_CALLABLE(N(SetPeachDepressed)) { + gGameStatusPtr->peachFlags |= PEACH_STATUS_FLAG_DEPRESSED; + return ApiStatus_DONE2; +} + +API_CALLABLE(N(ClearPeachDepressed)) { + gGameStatusPtr->peachFlags &= ~PEACH_STATUS_FLAG_DEPRESSED; + return ApiStatus_DONE2; +} + +Vec3f N(TwinkHideCh3Path)[] = { + { 100.0, 50.0, -160.0 }, + { 30.0, 120.0, -120.0 }, + { 50.0, 200.0, -80.0 }, +}; + +Vec3f N(TwinkFollowCh3Path1)[] = { + { 50.0, 200.0, -70.0 }, + { 80.0, 110.0, -70.0 }, + { 110.0, 120.0, -70.0 }, + { 140.0, 110.0, -70.0 }, + { 170.0, 120.0, -70.0 }, + { 200.0, 110.0, -70.0 }, + { 230.0, 120.0, -70.0 }, +}; + +Vec3f N(TwinkFollowCh3Path2)[] = { + { 230.0, 120.0, -70.0 }, + { 220.0, 60.0, -70.0 }, + { 250.0, 40.0, -70.0 }, +}; + +EvtScript N(EVS_ApproachPeach_Ch3) = { + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_SUB(LVar0, 10) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_CALL(SetNpcVar, NPC_Koopatrol_03, 0, 1) + EVT_THREAD + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_SUB(LVar0, 26) + EVT_SUB(LVar2, 2) + EVT_CALL(SetNpcAnimation, NPC_Koopatrol_03, ANIM_WorldKoopatrol_Anim06) + EVT_CALL(SetNpcSpeed, NPC_Koopatrol_03, EVT_FLOAT(5.0)) + EVT_CALL(NpcMoveTo, NPC_Koopatrol_03, LVar0, LVar2, 0) + EVT_CALL(SetNpcAnimation, NPC_Koopatrol_03, ANIM_WorldKoopatrol_Anim01) + EVT_CALL(NpcFacePlayer, NPC_Koopatrol_03, 5) + EVT_CALL(SetNpcVar, NPC_Koopatrol_03, 0, 0) + EVT_END_THREAD + EVT_THREAD + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_ADD(LVar0, 26) + EVT_ADD(LVar2, 2) + EVT_CALL(SetNpcAnimation, NPC_Koopatrol_04, ANIM_WorldKoopatrol_Anim06) + EVT_CALL(SetNpcSpeed, NPC_Koopatrol_04, EVT_FLOAT(5.0)) + EVT_CALL(NpcMoveTo, NPC_Koopatrol_04, LVar0, LVar2, 0) + EVT_CALL(SetNpcAnimation, NPC_Koopatrol_04, ANIM_WorldKoopatrol_Anim01) + EVT_CALL(NpcFacePlayer, NPC_Koopatrol_04, 5) + EVT_END_THREAD + EVT_LOOP(0) + EVT_WAIT(1) + EVT_CALL(GetNpcVar, NPC_Koopatrol_03, 0, LVar0) + EVT_IF_EQ(LVar0, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_WAIT(10) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_PickUpPeach_Ch3) = { + EVT_THREAD + EVT_CALL(GetNpcPos, NPC_Koopatrol_03, LVar0, LVar1, LVar2) + EVT_ADD(LVar0, 5) + EVT_CALL(NpcMoveTo, NPC_Koopatrol_03, LVar0, LVar2, 5) + EVT_CALL(SetNpcAnimation, NPC_Koopatrol_03, ANIM_WorldKoopatrol_Anim12) + EVT_ADD(LVar0, 5) + EVT_CALL(NpcMoveTo, NPC_Koopatrol_03, LVar0, LVar2, 5) + EVT_END_THREAD + EVT_THREAD + EVT_CALL(GetNpcPos, NPC_Koopatrol_04, LVar0, LVar1, LVar2) + EVT_SUB(LVar0, 5) + EVT_CALL(NpcMoveTo, NPC_Koopatrol_04, LVar0, LVar2, 5) + EVT_CALL(SetNpcAnimation, NPC_Koopatrol_04, ANIM_WorldKoopatrol_Anim12) + EVT_SUB(LVar0, 5) + EVT_CALL(NpcMoveTo, NPC_Koopatrol_04, LVar0, LVar2, 5) + EVT_END_THREAD + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0005) + EVT_WAIT(1) + EVT_LOOP(4) + EVT_ADD(LVar1, 2) + EVT_CALL(SetPlayerPos, LVar0, LVar1, LVar2) + EVT_WAIT(1) + EVT_END_LOOP + EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0018) + EVT_SUB(LVar0, 10) + EVT_LOOP(5) + EVT_ADD(LVar1, 4) + EVT_CALL(SetPlayerPos, LVar0, LVar1, LVar2) + EVT_WAIT(1) + EVT_END_LOOP + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_CarryPeachAway_Ch3) = { + EVT_CALL(InterpNpcYaw, NPC_Koopatrol_04, 90, 3) + EVT_WAIT(10) + EVT_THREAD + EVT_LOOP(0) + EVT_CALL(GetNpcPos, NPC_Koopatrol_03, LVar0, LVar1, LVar2) + EVT_ADD(LVar0, 10) + EVT_ADD(LVar2, 2) + EVT_CALL(SetPlayerPos, LVar0, 30, LVar2) + EVT_WAIT(1) + EVT_END_LOOP + EVT_END_THREAD + EVT_CALL(SetNpcVar, NPC_Koopatrol_03, 0, 1) + EVT_THREAD + EVT_CALL(SetNpcAnimation, NPC_Koopatrol_03, ANIM_WorldKoopatrol_Anim14) + EVT_CALL(SetNpcSpeed, NPC_Koopatrol_03, EVT_FLOAT(7.5)) + EVT_CALL(NpcMoveTo, NPC_Koopatrol_03, 249, -72, 0) + EVT_CALL(SetNpcVar, NPC_Koopatrol_03, 0, 0) + EVT_END_THREAD + EVT_THREAD + EVT_CALL(SetNpcAnimation, NPC_Koopatrol_04, ANIM_WorldKoopatrol_Anim14) + EVT_CALL(SetNpcSpeed, NPC_Koopatrol_04, EVT_FLOAT(7.5)) + EVT_CALL(NpcMoveTo, NPC_Koopatrol_04, 281, -68, 0) + EVT_END_THREAD + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(90.0)) + EVT_LOOP(0) + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar0, 0, LVar2) + EVT_CALL(GetNpcVar, NPC_Koopatrol_03, 0, LVar0) + EVT_WAIT(1) + EVT_IF_EQ(LVar0, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Scene_Chapter3) = { + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(DisablePlayerPhysics, TRUE) + EVT_CALL(DisablePartnerAI, 0) + EVT_CALL(SetMusicTrack, 0, SONG_BOWSER_THEME, 0, 8) + EVT_CALL(InterpPlayerYaw, 270, 0) + EVT_CALL(SetPlayerPos, 50, 10, -250) + EVT_CALL(SetNpcPos, NPC_PARTNER, 10, 50, -250) + EVT_CALL(SetNpcPos, NPC_Bowser, -50, 0, -20) + EVT_CALL(SetNpcPos, NPC_Kammy, -130, 0, -20) + EVT_CALL(SetNpcYaw, NPC_Bowser, 270) + EVT_CALL(SetNpcYaw, NPC_Kammy, 90) + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, -50, 0, -20) + EVT_CALL(SetPanTarget, CAM_DEFAULT, -50, 0, -20) + EVT_CALL(SetCamDistance, CAM_DEFAULT, 300) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(90.0)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_WAIT(30) + EVT_CALL(SpeakToNpc, NPC_Bowser, ANIM_WorldBowser_AngryTalk, ANIM_WorldBowser_Idle, 0, NPC_Kammy, MSG_Peach_0082) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(5.0)) + EVT_CALL(SetCamDistance, CAM_DEFAULT, 400) + EVT_CALL(SetPanTarget, CAM_DEFAULT, -50, 0, -20) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_CALL(SpeakToNpc, NPC_Kammy, ANIM_WorldKammy_Anim04, ANIM_WorldKammy_Anim01, 0, NPC_Bowser, MSG_Peach_0083) + EVT_THREAD + EVT_EXEC_WAIT(N(EVS_AnimateRotatingWall_AlmostCaught)) + EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0005) + EVT_CALL(PlaySoundAtPlayer, SOUND_262, 0) + EVT_CALL(ShowEmote, NPC_Bowser, EMOTE_EXCLAMATION, 0, 30, FALSE, 0, 0, 0, 0) + EVT_WAIT(30) + EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0011) + EVT_END_THREAD + EVT_THREAD + EVT_WAIT(360) + EVT_CALL(SetNpcPos, NPC_PARTNER, 100, 50, -160) + EVT_CALL(LoadPath, 30, EVT_PTR(N(TwinkHideCh3Path)), ARRAY_COUNT(N(TwinkHideCh3Path)), EASING_LINEAR) + EVT_LOOP(0) + EVT_CALL(GetNextPathPos) + EVT_CALL(SetNpcPos, NPC_PARTNER, LVar1, LVar2, LVar3) + EVT_WAIT(1) + EVT_IF_EQ(LVar0, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_CALL(EnableNpcShadow, NPC_PARTNER, FALSE) + EVT_END_THREAD + EVT_CALL(SpeakToNpc, NPC_Bowser, ANIM_WorldBowser_AngryTalk, ANIM_WorldBowser_Idle, 0, NPC_Kammy, MSG_Peach_0084) + EVT_CALL(SetNpcAnimation, NPC_Bowser, ANIM_WorldBowser_Tantrum) + EVT_WAIT(60) + EVT_CALL(SetNpcAnimation, NPC_Bowser, ANIM_WorldBowser_ArmsCrossed) + EVT_WAIT(30) + EVT_CALL(SetNpcAnimation, NPC_Bowser, ANIM_WorldBowser_Idle) + EVT_CALL(SpeakToNpc, NPC_Bowser, ANIM_WorldBowser_Talk, ANIM_WorldBowser_Idle, 0, NPC_Kammy, MSG_Peach_0085) + EVT_CALL(SpeakToNpc, NPC_Kammy, ANIM_WorldKammy_Anim04, ANIM_WorldKammy_Anim01, 0, NPC_Bowser, MSG_Peach_0086) + EVT_CALL(SpeakToNpc, NPC_Bowser, ANIM_WorldBowser_Talk, ANIM_WorldBowser_Idle, 0, NPC_Kammy, MSG_Peach_0087) + EVT_CALL(SetNpcAnimation, NPC_Bowser, ANIM_WorldBowser_ArmsCrossed) + EVT_WAIT(30) + EVT_CALL(InterpNpcYaw, NPC_Bowser, 90, 7) + EVT_WAIT(30) + EVT_CALL(InterpNpcYaw, NPC_Bowser, 270, 7) + EVT_WAIT(30) + EVT_CALL(InterpNpcYaw, NPC_Bowser, 90, 7) + EVT_WAIT(30) + EVT_CALL(SetNpcAnimation, NPC_Bowser, ANIM_WorldBowser_Idle) + EVT_CALL(SpeakToNpc, NPC_Bowser, ANIM_WorldBowser_Talk, ANIM_WorldBowser_Idle, 0, NPC_Bowser, MSG_Peach_0088) + EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0009) + EVT_WAIT(1) + EVT_CALL(PlaySoundAtNpc, NPC_Bowser, SOUND_262, 0) + EVT_CALL(ShowEmote, NPC_Bowser, EMOTE_EXCLAMATION, -45, 30, TRUE, 0, 0, 0, 0) + EVT_CALL(PlaySoundAtNpc, NPC_Kammy, SOUND_262, 0) + EVT_CALL(ShowEmote, NPC_Kammy, EMOTE_EXCLAMATION, -45, 30, TRUE, 0, 0, 0, 0) + EVT_WAIT(30) + EVT_CALL(SetNpcVar, NPC_Bowser, 0, 1) + EVT_THREAD + EVT_CALL(SetNpcAnimation, NPC_Bowser, ANIM_WorldBowser_Shock) + EVT_CALL(NpcJump0, NPC_Bowser, -50, 0, -20, 10) + EVT_END_THREAD + EVT_THREAD + EVT_CALL(SetNpcAnimation, NPC_Kammy, ANIM_WorldKammy_Anim05) + EVT_CALL(NpcJump0, NPC_Kammy, -130, 0, -20, 10) + EVT_END_THREAD + EVT_THREAD + EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0005) + EVT_WAIT(30) + EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0011) + EVT_WAIT(60) + EVT_CALL(DisablePlayerPhysics, FALSE) + EVT_CALL(N(SetPeachDepressed)) + EVT_CALL(SetPlayerAnimation, ANIM_Peach_C000E) + EVT_CALL(func_802D1270, 30, -10, EVT_FLOAT(2.0)) + EVT_CALL(DisablePlayerPhysics, TRUE) + EVT_CALL(N(ClearPeachDepressed)) + EVT_CALL(SetNpcVar, NPC_Bowser, 0, 0) + EVT_END_THREAD + EVT_CALL(SpeakToPlayer, NPC_Bowser, ANIM_WorldBowser_Shock, ANIM_WorldBowser_Shock, 0, MSG_Peach_0089) + EVT_WAIT(20) + EVT_CALL(SetNpcAnimation, NPC_Bowser, ANIM_WorldBowser_Idle) + EVT_CALL(SetNpcAnimation, NPC_Kammy, ANIM_WorldKammy_Anim01) + EVT_CALL(ContinueSpeech, NPC_Bowser, ANIM_WorldBowser_AngryTalk, ANIM_WorldBowser_Idle, 0, MSG_Peach_008A) + EVT_LOOP(0) + EVT_WAIT(1) + EVT_CALL(GetNpcVar, NPC_Bowser, 0, LVar0) + EVT_IF_EQ(LVar0, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_CALL(SetNpcAnimation, NPC_Bowser, ANIM_WorldBowser_ArmsCrossed) + EVT_WAIT(30) + EVT_CALL(SetNpcAnimation, NPC_Bowser, ANIM_WorldBowser_Idle) + EVT_CALL(SpeakToPlayer, NPC_Bowser, ANIM_WorldBowser_Talk, ANIM_WorldBowser_Idle, 0, MSG_Peach_008B) + EVT_CALL(ShowChoice, MSG_Choice_0026) + EVT_SET(GB_OMO_PeachChoice1, LVar0) + EVT_IF_NE(LVar0, 2) + EVT_SET(AF_KKJ_08, TRUE) + EVT_END_IF + EVT_CALL(ContinueSpeech, NPC_Bowser, ANIM_WorldBowser_Talk, ANIM_WorldBowser_Idle, 0, MSG_Peach_008C) + EVT_CALL(ShowChoice, MSG_Choice_0027) + EVT_SET(GB_OMO_PeachChoice2, LVar0) + EVT_IF_NE(LVar0, 2) + EVT_SET(AF_KKJ_08, TRUE) + EVT_END_IF + EVT_CALL(ContinueSpeech, NPC_Bowser, ANIM_WorldBowser_Talk, ANIM_WorldBowser_Idle, 0, MSG_Peach_008D) + EVT_CALL(ShowChoice, MSG_Choice_0028) + EVT_SET(GB_OMO_PeachChoice3, LVar0) + EVT_IF_NE(LVar0, 2) + EVT_SET(AF_KKJ_08, TRUE) + EVT_END_IF + EVT_CALL(ContinueSpeech, NPC_Bowser, ANIM_WorldBowser_TalkEyesClosed, ANIM_WorldBowser_Idle, 0, MSG_Peach_008E) + EVT_CALL(InterpNpcYaw, NPC_Bowser, 270, 7) + EVT_WAIT(10) + EVT_CALL(SpeakToPlayer, NPC_Bowser, ANIM_WorldBowser_Talk, ANIM_WorldBowser_Idle, 5, MSG_Peach_008F) + EVT_IF_EQ(AF_KKJ_08, FALSE) + EVT_CALL(SpeakToNpc, NPC_Kammy, ANIM_WorldKammy_Anim04, ANIM_WorldKammy_Anim01, 0, NPC_Bowser, MSG_Peach_0090) + EVT_ELSE + EVT_CALL(SpeakToNpc, NPC_Kammy, ANIM_WorldKammy_Anim04, ANIM_WorldKammy_Anim01, 0, NPC_Bowser, MSG_Peach_0091) + EVT_END_IF + EVT_CALL(SpeakToNpc, NPC_Bowser, ANIM_WorldBowser_TalkEyesClosed, ANIM_WorldBowser_Idle, 0, NPC_Kammy, MSG_Peach_0092) + EVT_CALL(SetNpcAnimation, NPC_Bowser, ANIM_WorldBowser_Idle) + EVT_CALL(InterpNpcYaw, NPC_Bowser, 90, 7) + EVT_WAIT(10) + EVT_CALL(ContinueSpeech, NPC_Bowser, ANIM_WorldBowser_Talk, ANIM_WorldBowser_Idle, 5, MSG_Peach_0093) + EVT_CALL(SetNpcAnimation, NPC_Bowser, ANIM_WorldBowser_Idle) + EVT_CALL(InterpNpcYaw, NPC_Bowser, 90, 7) + EVT_WAIT(10) + EVT_CALL(SpeakToPlayer, NPC_Kammy, ANIM_WorldKammy_Anim04, ANIM_WorldKammy_Anim01, 5, MSG_Peach_0094) + EVT_CALL(RotateModel, MODEL_o2, 120, 0, 1, 0) + EVT_CALL(SetNpcPos, NPC_Koopatrol_03, 249, 0, -70) + EVT_CALL(SetNpcPos, NPC_Koopatrol_04, 281, 0, -70) + EVT_CALL(SpeakToNpc, NPC_Koopatrol_03, ANIM_WorldKoopatrol_Anim08, ANIM_WorldKoopatrol_Anim01, 0, NPC_Bowser, MSG_Peach_0095) + EVT_CALL(InterpPlayerYaw, 90, 0) + EVT_CALL(SetPlayerAnimation, ANIM_Peach_A0001) + EVT_EXEC_WAIT(N(EVS_ApproachPeach_Ch3)) + EVT_EXEC_WAIT(N(EVS_PickUpPeach_Ch3)) + EVT_CALL(SpeakToPlayer, NPC_PLAYER, ANIM_Peach_C0018, ANIM_Peach_C0018, 5, MSG_Peach_0096) + EVT_EXEC_WAIT(N(EVS_CarryPeachAway_Ch3)) + EVT_CALL(InterpNpcYaw, NPC_PARTNER, 90, 0) + EVT_CALL(SetNpcAnimation, NPC_PARTNER, ANIM_Twink_Cringe) + EVT_CALL(EnableNpcShadow, NPC_PARTNER, TRUE) + EVT_CALL(LoadPath, 80, EVT_PTR(N(TwinkFollowCh3Path1)), ARRAY_COUNT(N(TwinkFollowCh3Path1)), EASING_LINEAR) + EVT_LOOP(0) + EVT_CALL(GetNextPathPos) + EVT_CALL(SetNpcPos, NPC_PARTNER, LVar1, LVar2, LVar3) + EVT_WAIT(1) + EVT_IF_EQ(LVar0, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_CALL(SetNpcAnimation, NPC_PARTNER, ANIM_Twink_TalkSad) + EVT_LOOP(2) + EVT_CALL(InterpNpcYaw, NPC_PARTNER, 270, 7) + EVT_WAIT(5) + EVT_CALL(InterpNpcYaw, NPC_PARTNER, 90, 7) + EVT_WAIT(5) + EVT_END_LOOP + EVT_CALL(InterpNpcYaw, NPC_PARTNER, 270, 7) + EVT_WAIT(15) + EVT_CALL(SetNpcAnimation, NPC_PARTNER, ANIM_Twink_Fly) + EVT_CALL(InterpNpcYaw, NPC_PARTNER, 90, 7) + EVT_CALL(LoadPath, 15, EVT_PTR(N(TwinkFollowCh3Path2)), ARRAY_COUNT(N(TwinkFollowCh3Path2)), EASING_LINEAR) + EVT_LOOP(0) + EVT_CALL(GetNextPathPos) + EVT_CALL(SetNpcPos, NPC_PARTNER, LVar1, LVar2, LVar3) + EVT_WAIT(1) + EVT_IF_EQ(LVar0, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_WAIT(30) + EVT_CALL(FadeOutMusic, 0, 1000) + EVT_EXEC_WAIT(N(EVS_EndPeachChapter3)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 0) + EVT_CALL(EnablePartnerAI) + EVT_CALL(DisablePlayerPhysics, FALSE) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_kkj/kkj_15/kkj_15_8_npc_chapter0.c b/src/world/area_kkj/kkj_15/kkj_15_8_npc_chapter0.c new file mode 100644 index 0000000000..281458879f --- /dev/null +++ b/src/world/area_kkj/kkj_15/kkj_15_8_npc_chapter0.c @@ -0,0 +1,116 @@ +#include "kkj_15.h" + +#define NAME_SUFFIX _Ch0 + +#include "world/common/npc/Bowser.inc.c" +#include "world/common/enemy/Kammy.inc.c" + +#include "world/common/npc/KoopaBros.h" + +NpcSettings N(NpcSettings_KoopaBros) = { + .height = 34, + .radius = 24, + .level = 99, + .onHit = &EnemyNpcHit, + .onDefeat = &EnemyNpcDefeat, +}; + +AnimID N(ExtraAnims_Bowser)[] = { + ANIM_WorldBowser_Still, + ANIM_WorldBowser_Idle, + ANIM_WorldBowser_BrandishIdle, + ANIM_WorldBowser_Talk, + ANIM_WorldBowser_BrandishTalk, + ANIM_WorldBowser_Brandish, + ANIM_LIST_END +}; + +AnimID N(ExtraAnims_Kammy)[] = { + ANIM_WorldKammy_Anim01, + ANIM_WorldKammy_Anim02, + ANIM_WorldKammy_Anim04, + ANIM_LIST_END +}; + +AnimID N(ExtraAnims_KoopaBros)[] = { + ANIM_KoopaBros_Black_Anim02, + ANIM_KoopaBros_Black_Anim03, + ANIM_KoopaBros_Black_Anim04, + ANIM_KoopaBros_Black_Anim05, + ANIM_KoopaBros_Black_Anim0A, + ANIM_KoopaBros_Black_Anim11, + ANIM_KoopaBros_Black_Anim12, + ANIM_KoopaBros_Black_Anim14, + ANIM_KoopaBros_Black_Anim1A, + ANIM_LIST_END +}; + +NpcData N(NpcData_Characters)[] = { + { + .id = NPC_Bowser, + .pos = { 0.0f, -500.0f, 0.0f }, + .yaw = 270, + .settings = &N(NpcSettings_Bowser), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = NO_DROPS, + .animations = BOWSER_ANIMS, + .extraAnimations = N(ExtraAnims_Bowser), + }, + { + .id = NPC_Kammy, + .pos = { 0.0f, -500.0f, 0.0f }, + .yaw = 270, + .settings = &N(NpcSettings_Kammy), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = NO_DROPS, + .animations = KAMMY_ANIMS, + .extraAnimations = N(ExtraAnims_Kammy), + }, + { + .id = NPC_KoopaBros_01, + .pos = { 0.0f, -500.0f, 0.0f }, + .yaw = 0, + .settings = &N(NpcSettings_KoopaBros), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = NO_DROPS, + .animations = BLACK_KOOPA_BROS_ANIMS, + .extraAnimations = N(ExtraAnims_KoopaBros), + }, + { + .id = NPC_KoopaBros_02, + .pos = { 0.0f, -500.0f, 0.0f }, + .yaw = 0, + .settings = &N(NpcSettings_KoopaBros), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = NO_DROPS, + .animations = RED_KOOPA_BROS_ANIMS, + .extraAnimations = N(ExtraAnims_KoopaBros), + }, + { + .id = NPC_KoopaBros_03, + .pos = { 0.0f, -500.0f, 0.0f }, + .yaw = 0, + .settings = &N(NpcSettings_KoopaBros), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = NO_DROPS, + .animations = YELLOW_KOOPA_BROS_ANIMS, + .extraAnimations = N(ExtraAnims_KoopaBros), + }, + { + .id = NPC_KoopaBros_04, + .pos = { 0.0f, -500.0f, 0.0f }, + .yaw = 0, + .settings = &N(NpcSettings_KoopaBros), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = NO_DROPS, + .animations = GREEN_KOOPA_BROS_ANIMS, + .extraAnimations = N(ExtraAnims_KoopaBros), + }, +}; + +#define NAME_SUFFIX + +NpcGroupList N(Chapter0NPCs) = { + NPC_GROUP(N(NpcData_Characters_Ch0)), + {} +}; diff --git a/src/world/area_kkj/kkj_15/kkj_15_9_npc_chapter1.c b/src/world/area_kkj/kkj_15/kkj_15_9_npc_chapter1.c new file mode 100644 index 0000000000..ea19914b38 --- /dev/null +++ b/src/world/area_kkj/kkj_15/kkj_15_9_npc_chapter1.c @@ -0,0 +1,65 @@ +#include "kkj_15.h" + +#define NAME_SUFFIX _Ch1 + +#include "world/common/npc/Bowser.inc.c" +#include "world/common/enemy/Koopatrol_Stationary.inc.c" + +AnimID N(ExtraAnims_Bowser)[] = { + ANIM_WorldBowser_Still, + ANIM_WorldBowser_Idle, + ANIM_WorldBowser_Walk, + ANIM_WorldBowser_Talk, + ANIM_WorldBowser_Shock, + ANIM_WorldBowser_AngryTalk, + ANIM_LIST_END +}; + +AnimID N(ExtraAnims_Koopatrol)[] = { + ANIM_WorldKoopatrol_Anim01, + ANIM_WorldKoopatrol_Anim06, + ANIM_WorldKoopatrol_Anim08, + ANIM_WorldKoopatrol_Anim12, + ANIM_WorldKoopatrol_Anim14, + ANIM_LIST_END +}; + +NpcData N(NpcData_Characters)[] = { + { + .id = NPC_Bowser, + .pos = { 0.0f, -500.0f, 0.0f }, + .yaw = 270, + .settings = &N(NpcSettings_Bowser), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = NO_DROPS, + .animations = BOWSER_ANIMS, + .extraAnimations = N(ExtraAnims_Bowser), + }, + { + .id = NPC_Kammy, + .pos = { 0.0f, -500.0f, 0.0f }, + .yaw = 0, + .settings = &N(NpcSettings_Koopatrol_Stationary), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = NO_DROPS, + .animations = KOOPATROL_ANIMS, + .extraAnimations = N(ExtraAnims_Koopatrol), + }, + { + .id = NPC_KoopaBros_01, + .pos = { 0.0f, -500.0f, 0.0f }, + .yaw = 0, + .settings = &N(NpcSettings_Koopatrol_Stationary), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = NO_DROPS, + .animations = KOOPATROL_ANIMS, + .extraAnimations = N(ExtraAnims_Koopatrol), + }, +}; + +#define NAME_SUFFIX + +NpcGroupList N(Chapter1NPCs) = { + NPC_GROUP(N(NpcData_Characters_Ch1)), + {} +}; diff --git a/src/world/area_kkj/kkj_16/AED410.c b/src/world/area_kkj/kkj_16/AED410.c deleted file mode 100644 index 3a0b148c9f..0000000000 --- a/src/world/area_kkj/kkj_16/AED410.c +++ /dev/null @@ -1,23 +0,0 @@ -#include "kkj_16.h" - -static char* N(exit_str_0) = "sbk_02"; -static char* N(exit_str_1) = "kkj_11"; - -ApiStatus func_80240000_AED410(Evt* script, s32 isInitialCall) { - gGameStatusPtr->peachFlags &= ~PEACH_STATUS_FLAG_IS_PEACH; - gPlayerData.currentPartner = script->varTable[0]; - return ApiStatus_DONE2; -} - -ApiStatus func_80240028_AED438(Evt* script, s32 isInitialCall) { - Bytecode* args = script->ptrReadPos; - - gPlayerStatus.availableDisguiseType = evt_get_float_variable(script, *args++); - return ApiStatus_DONE2; -} - -#include "world/common/atomic/UnkPhysicsFuncs.inc.c" - -#include "world/common/todo/UnkGooberFunc50.inc.c" - -const char* kkj_16_str = "kkj_14"; diff --git a/src/world/area_kkj/kkj_16/AEDC60.c b/src/world/area_kkj/kkj_16/AEDC60.c deleted file mode 100644 index 455d24585b..0000000000 --- a/src/world/area_kkj/kkj_16/AEDC60.c +++ /dev/null @@ -1,18 +0,0 @@ -#include "kkj_16.h" - -#define NAMESPACE dup_kkj_16 -#include "world/common/atomic/UnkPhysicsFuncs.inc.c" -#define NAMESPACE kkj_16 - -#include "world/common/todo/GetPeachDisguise.inc.c" - -ApiStatus func_80240EF4_AEE304(Evt* script, s32 isInitialCall) { - gGameStatusPtr->peachFlags |= PEACH_STATUS_FLAG_8; - return ApiStatus_DONE2; -} - -#define NAMESPACE dup_kkj_16 -#include "world/common/todo/UnkGooberFunc50.inc.c" -#define NAMESPACE kkj_16 - -const char* kkj_16_str2 = "kkj_14"; diff --git a/src/world/area_kkj/kkj_16/kkj_16.h b/src/world/area_kkj/kkj_16/kkj_16.h index 54302ebc7a..215487e357 100644 --- a/src/world/area_kkj/kkj_16/kkj_16.h +++ b/src/world/area_kkj/kkj_16/kkj_16.h @@ -2,8 +2,37 @@ /// @brief Peach's Castle - Library (2F) #include "common.h" -#include "../kkj.h" #include "message_ids.h" #include "map.h" +#include "../kkj.h" +#include "mapfs/kkj_16_shape.h" +#include "mapfs/kkj_16_hit.h" + +#include "sprite/npc/WorldKoopatrol.h" +#include "sprite/npc/HammerBros.h" +#include "sprite/npc/Twink.h" +#include "sprite/npc/BattleBow.h" + +enum { + // early + NPC_HammerBros = 0, + NPC_Koopatrol_01 = 1, + NPC_Koopatrol_02 = 2, + NPC_Koopatrol_03 = 3, + NPC_Koopatrol_04 = 4, + // later + NPC_HammerBros_01 = 0, + NPC_HammerBros_02 = 1, + NPC_HammerBros_03 = 2, +}; + #define NAMESPACE kkj_16 + +extern EvtScript N(EVS_Main); +extern EvtScript N(EVS_ManageSneakingScenes); +extern EvtScript N(EVS_EndPeachChapter2); +extern EvtScript N(EVS_MakeEntities); + +extern NpcGroupList N(EarlyNPCs); +extern NpcGroupList N(LaterNPCs); diff --git a/src/world/area_kkj/kkj_16/kkj_16_0_header.c b/src/world/area_kkj/kkj_16/kkj_16_0_header.c new file mode 100644 index 0000000000..118ad7f48c --- /dev/null +++ b/src/world/area_kkj/kkj_16/kkj_16_0_header.c @@ -0,0 +1,12 @@ +#include "kkj_16.h" + +EntryList N(Entrances) = { + [kkj_16_ENTRY_0] { 435.0, 0.0, -25.0, 270.0 }, +}; + +MapSettings N(settings) = { + .main = &N(EVS_Main), + .entryList = &N(Entrances), + .entryCount = ENTRY_COUNT(N(Entrances)), + .tattle = { MSG_MapTattle_kkj_16 }, +}; diff --git a/src/world/area_kkj/kkj_16/kkj_16_1_main.c b/src/world/area_kkj/kkj_16/kkj_16_1_main.c new file mode 100644 index 0000000000..4468f65a87 --- /dev/null +++ b/src/world/area_kkj/kkj_16/kkj_16_1_main.c @@ -0,0 +1,68 @@ +#include "kkj_16.h" + +#include "../common/RestoreFromPeachState.inc.c" +#include "../common/SetAvailableDisguise.inc.c" + +EvtScript N(EVS_EndPeachChapter2) = { + EVT_SET(LVar0, GB_KKJ_LastPartner) + EVT_CALL(N(RestoreFromPeachState)) + EVT_CALL(PlaySound, SOUND_DC) + EVT_CALL(GotoMapSpecial, EVT_PTR("sbk_02"), sbk_02_ENTRY_5, TRANSITION_12) + EVT_WAIT(100) +}; //@bug script not properly terminated + +EvtScript N(EVS_ExitDoor_kkj_11_2) = { + EVT_SET_GROUP(EVT_GROUP_1B) + EVT_CALL(DisablePlayerInput, TRUE) + EVT_SET(LVar0, kkj_16_ENTRY_0) + EVT_SET(LVar1, COLLIDER_tte) + EVT_SET(LVar2, MODEL_o43) + EVT_SET(LVar3, DOOR_SWING_IN) + EVT_EXEC(ExitSingleDoor) + EVT_WAIT(17) + EVT_CALL(GotoMap, EVT_PTR("kkj_11"), kkj_11_ENTRY_2) + EVT_WAIT(100) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_EnterMap) = { + EVT_CALL(GetEntryID, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_EQ(kkj_16_ENTRY_0) + EVT_SET(LVar2, MODEL_o43) + EVT_SET(LVar3, DOOR_SWING_IN) + EVT_EXEC_WAIT(EnterSingleDoor) + EVT_END_SWITCH + EVT_IF_EQ(GB_StoryProgress, STORY_CH2_BEGAN_PEACH_MISSION) + EVT_EXEC(N(EVS_ManageSneakingScenes)) + EVT_END_IF + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Main) = { + EVT_SET(GB_WorldLocation, LOCATION_PEACHS_CASTLE) + EVT_CALL(SetSpriteShading, SHADING_NONE) + EVT_SETUP_CAMERA_DEFAULT() + EVT_SWITCH(GB_StoryProgress) + EVT_CASE_OR_EQ(STORY_CH2_BEGAN_PEACH_MISSION) + EVT_CASE_OR_EQ(STORY_CH4_BEGAN_PEACH_MISSION) + EVT_CASE_OR_EQ(STORY_CH5_BEGAN_PEACH_MISSION) + EVT_CALL(MakeNpcs, FALSE, EVT_PTR(N(EarlyNPCs))) + EVT_END_CASE_GROUP + EVT_CASE_EQ(STORY_CH6_BEGAN_PEACH_MISSION) + EVT_CALL(N(SetAvailableDisguise), PEACH_DISGUISE_HAMMER_BROS) + EVT_CALL(MakeNpcs, FALSE, EVT_PTR(N(LaterNPCs))) + EVT_END_SWITCH + EVT_EXEC_WAIT(N(EVS_MakeEntities)) + EVT_IF_LT(GB_StoryProgress, STORY_CH8_REACHED_PEACHS_CASTLE) + EVT_CALL(SetMusicTrack, 0, SONG_PEACH_SNEAKING, 0, 8) + EVT_END_IF + EVT_CALL(UseDoorSounds, DOOR_SOUNDS_BASIC) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitDoor_kkj_11_2)), TRIGGER_WALL_PRESS_A, COLLIDER_tte, 1, 0) + EVT_EXEC(N(EVS_EnterMap)) + EVT_WAIT(1) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_kkj/kkj_16/kkj_16_2_npcs_early.c b/src/world/area_kkj/kkj_16/kkj_16_2_npcs_early.c new file mode 100644 index 0000000000..cbc03ee5b2 --- /dev/null +++ b/src/world/area_kkj/kkj_16/kkj_16_2_npcs_early.c @@ -0,0 +1,254 @@ +#include "kkj_16.h" + +#define NAME_SUFFIX _Early + +#include "world/common/enemy/HammerBros.inc.c" +#include "world/common/enemy/Koopatrol_Stationary.inc.c" + +#include "../common/Searchlights.inc.c" +#include "../common/ApproachPlayer50Units.inc.c" + +EvtScript N(EVS_CapturePeach) = { + EVT_CALL(DisablePlayerInput, TRUE) + EVT_SET_GROUP(EVT_GROUP_00) + EVT_CALL(SetTimeFreezeMode, TIME_FREEZE_PARTIAL) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_262, 0) + EVT_CALL(ShowEmote, NPC_SELF, EMOTE_EXCLAMATION, 0, 20, TRUE, 0, 0, 0, 0) + EVT_CALL(NpcFacePlayer, NPC_SELF, 0) + EVT_WAIT(20) + EVT_CALL(PlayerFaceNpc, NPC_SELF, FALSE) + EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0005) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_WorldKoopatrol_Anim01) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_WorldKoopatrol_Anim08, ANIM_WorldKoopatrol_Anim01, 0, MSG_Peach_0174) + EVT_CALL(N(ApproachPlayer50Units), -1, LVar3, LVar0, LVar2) + EVT_IF_NE(LVar3, 0) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_WorldKoopatrol_Anim06) + EVT_CALL(SetNpcSpeed, NPC_SELF, EVT_FLOAT(5.0)) + EVT_CALL(NpcMoveTo, NPC_SELF, LVar0, LVar2, 0) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_WorldKoopatrol_Anim01) + EVT_END_IF + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_WorldKoopatrol_Anim08, ANIM_WorldKoopatrol_Anim01, 0, MSG_Peach_0175) + EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0017) + EVT_WAIT(20) + EVT_CALL(GotoMapSpecial, EVT_PTR("kkj_14"), kkj_14_ENTRY_B, TRANSITION_13) + EVT_WAIT(100) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcIdle_Koopatrol_02) = { + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_WorldKoopatrol_Anim04) + EVT_THREAD + EVT_LOOP(0) + EVT_CALL(N(UnkPhysicsFunc), LVar0, 85, 60, 38) + EVT_IF_EQ(LVar0, 1) + EVT_CALL(BindNpcAI, NPC_SELF, EVT_PTR(N(EVS_CapturePeach))) + EVT_RETURN + EVT_END_IF + EVT_WAIT(1) + EVT_END_LOOP + EVT_END_THREAD + EVT_CALL(SetNpcSpeed, NPC_SELF, EVT_FLOAT(1.7)) + EVT_LOOP(0) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_WorldKoopatrol_Anim01) + EVT_WAIT(20) + EVT_CALL(InterpNpcYaw, NPC_SELF, 90, 15) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_WorldKoopatrol_Anim04) + EVT_CALL(NpcMoveTo, NPC_SELF, 280, 50, 0) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_WorldKoopatrol_Anim01) + EVT_WAIT(20) + EVT_CALL(InterpNpcYaw, NPC_SELF, 270, 15) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_WorldKoopatrol_Anim04) + EVT_CALL(NpcMoveTo, NPC_SELF, 80, 50, 0) + EVT_END_LOOP + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcIdle_Koopatrol_03) = { + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_WorldKoopatrol_Anim04) + EVT_THREAD + EVT_LOOP(0) + EVT_CALL(N(UnkPhysicsFunc), LVar0, 85, 60, 38) + EVT_IF_EQ(LVar0, 1) + EVT_CALL(BindNpcAI, NPC_SELF, EVT_PTR(N(EVS_CapturePeach))) + EVT_RETURN + EVT_END_IF + EVT_WAIT(1) + EVT_END_LOOP + EVT_END_THREAD + EVT_CALL(SetNpcSpeed, NPC_SELF, EVT_FLOAT(2.0)) + EVT_LOOP(0) + EVT_CALL(NpcMoveTo, NPC_SELF, -248, -80, 0) + EVT_CALL(NpcMoveTo, NPC_SELF, -84, -80, 0) + EVT_CALL(NpcMoveTo, NPC_SELF, -84, -15, 0) + EVT_CALL(NpcMoveTo, NPC_SELF, -88, -15, 0) + EVT_CALL(NpcMoveTo, NPC_SELF, -88, 50, 0) + EVT_CALL(NpcMoveTo, NPC_SELF, -252, 50, 0) + EVT_CALL(NpcMoveTo, NPC_SELF, -252, -15, 0) + EVT_CALL(NpcMoveTo, NPC_SELF, -248, -15, 0) + EVT_END_LOOP + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcIdle_Koopatrol_04) = { + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_WorldKoopatrol_Anim04) + EVT_THREAD + EVT_LOOP(0) + EVT_CALL(N(UnkPhysicsFunc), LVar0, 85, 60, 38) + EVT_IF_EQ(LVar0, 1) + EVT_CALL(BindNpcAI, NPC_SELF, EVT_PTR(N(EVS_CapturePeach))) + EVT_RETURN + EVT_END_IF + EVT_WAIT(1) + EVT_END_LOOP + EVT_END_THREAD + EVT_CALL(SetNpcSpeed, NPC_SELF, EVT_FLOAT(1.7)) + EVT_LOOP(0) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_WorldKoopatrol_Anim01) + EVT_WAIT(30) + EVT_CALL(InterpNpcYaw, NPC_SELF, 270, 15) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_WorldKoopatrol_Anim04) + EVT_CALL(NpcMoveTo, NPC_SELF, -600, 50, 0) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_WorldKoopatrol_Anim01) + EVT_WAIT(30) + EVT_CALL(InterpNpcYaw, NPC_SELF, 90, 15) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_WorldKoopatrol_Anim04) + EVT_CALL(NpcMoveTo, NPC_SELF, -420, 50, 0) + EVT_END_LOOP + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_HammerBros) = { + EVT_IF_NE(GB_StoryProgress, STORY_CH2_BEGAN_PEACH_MISSION) + EVT_CALL(RemoveNpc, NPC_SELF) + EVT_RETURN + EVT_END_IF + EVT_CALL(SetNpcPos, NPC_SELF, -700, 0, 50) + EVT_CALL(InterpNpcYaw, NPC_SELF, 270, 1) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_Koopatrol_01) = { + EVT_IF_NE(GB_StoryProgress, STORY_CH2_BEGAN_PEACH_MISSION) + EVT_CALL(RemoveNpc, NPC_SELF) + EVT_RETURN + EVT_END_IF + EVT_CALL(SetNpcPos, NPC_SELF, -740, 0, 50) + EVT_CALL(InterpNpcYaw, NPC_SELF, 90, 1) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_Koopatrol_02) = { + EVT_CALL(SetNpcPos, NPC_SELF, 180, 0, 50) + EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(EVS_NpcIdle_Koopatrol_02))) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_Koopatrol_03) = { + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_8, FALSE) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_GRAVITY, TRUE) + EVT_CALL(SetNpcPos, NPC_SELF, -250, 0, -15) + EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(EVS_NpcIdle_Koopatrol_03))) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_Koopatrol_04) = { + EVT_CALL(SetNpcPos, NPC_SELF, -510, 0, 50) + EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(EVS_NpcIdle_Koopatrol_04))) + EVT_RETURN + EVT_END +}; + +AnimID N(ExtraAnims_HammerBros)[] = { + ANIM_HammerBros_Anim00, + ANIM_HammerBros_Anim02, + ANIM_HammerBros_Anim04, + ANIM_HammerBros_Anim08, + ANIM_HammerBros_Anim0A, + ANIM_HammerBros_Anim13, + ANIM_LIST_END +}; + +AnimID N(ExtraAnims_Koopatrol)[] = { + ANIM_WorldKoopatrol_Anim00, + ANIM_WorldKoopatrol_Anim01, + ANIM_WorldKoopatrol_Anim04, + ANIM_WorldKoopatrol_Anim06, + ANIM_WorldKoopatrol_Anim08, + ANIM_WorldKoopatrol_Anim12, + ANIM_WorldKoopatrol_Anim14, + ANIM_LIST_END +}; + +NpcData N(NpcData_Minions)[] = { + { + .id = NPC_HammerBros, + .pos = { 0.0f, -500.0f, 0.0f }, + .yaw = 0, + .init = &N(EVS_NpcInit_HammerBros), + .settings = &N(NpcSettings_HammerBros), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = NO_DROPS, + .animations = HAMMER_BROS_ANIMS, + .extraAnimations = N(ExtraAnims_HammerBros), + }, + { + .id = NPC_Koopatrol_01, + .pos = { 0.0f, -500.0f, 0.0f }, + .yaw = 0, + .init = &N(EVS_NpcInit_Koopatrol_01), + .settings = &N(NpcSettings_Koopatrol_Stationary), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = NO_DROPS, + .animations = KOOPATROL_ANIMS, + .extraAnimations = N(ExtraAnims_Koopatrol), + }, + { + .id = NPC_Koopatrol_02, + .pos = { 0.0f, -500.0f, 0.0f }, + .yaw = 0, + .init = &N(EVS_NpcInit_Koopatrol_02), + .settings = &N(NpcSettings_Koopatrol_Stationary), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = NO_DROPS, + .animations = KOOPATROL_ANIMS, + .extraAnimations = N(ExtraAnims_Koopatrol), + }, + { + .id = NPC_Koopatrol_03, + .pos = { 0.0f, -500.0f, 0.0f }, + .yaw = 0, + .init = &N(EVS_NpcInit_Koopatrol_03), + .settings = &N(NpcSettings_Koopatrol_Stationary), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = NO_DROPS, + .animations = KOOPATROL_ANIMS, + .extraAnimations = N(ExtraAnims_Koopatrol), + }, + { + .id = NPC_Koopatrol_04, + .pos = { 0.0f, -500.0f, 0.0f }, + .yaw = 0, + .init = &N(EVS_NpcInit_Koopatrol_04), + .settings = &N(NpcSettings_Koopatrol_Stationary), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = NO_DROPS, + .animations = KOOPATROL_ANIMS, + .extraAnimations = N(ExtraAnims_Koopatrol), + }, +}; + +#define NAME_SUFFIX + +NpcGroupList N(EarlyNPCs) = { + NPC_GROUP(N(NpcData_Minions_Early)), + {} +}; diff --git a/src/world/area_kkj/kkj_16/kkj_16_3_npcs_later.c b/src/world/area_kkj/kkj_16/kkj_16_3_npcs_later.c new file mode 100644 index 0000000000..0972f08742 --- /dev/null +++ b/src/world/area_kkj/kkj_16/kkj_16_3_npcs_later.c @@ -0,0 +1,229 @@ +#include "kkj_16.h" + +#define NAME_SUFFIX _Later + +#include "world/common/enemy/HammerBros.inc.c" + +AnimID N(ExtraAnims_HammerBros)[] = { + ANIM_HammerBros_Anim00, + ANIM_HammerBros_Anim02, + ANIM_HammerBros_Anim03, + ANIM_HammerBros_Anim04, + ANIM_HammerBros_Anim06, + ANIM_HammerBros_Anim07, + ANIM_HammerBros_Anim09, + ANIM_HammerBros_Anim0A, + ANIM_HammerBros_Anim0B, + ANIM_HammerBros_Anim1A, + ANIM_LIST_END +}; + +#include "../common/Searchlights.inc.c" +#include "world/common/todo/GetPeachDisguise.inc.c" +#include "../common/SetPeachFlag8.inc.c" +#include "../common/ApproachPlayer50Units.inc.c" + +EvtScript N(EVS_NpcInteract_HammerBros_01) = { + EVT_IF_EQ(GF_KKJ16_Gift_ShootingStar, FALSE) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_HammerBros_Anim0A, ANIM_HammerBros_Anim02, 16, MSG_Peach_013A) + EVT_CALL(ShowGotItem, ITEM_SHOOTING_STAR, TRUE, 2) + EVT_SET(GF_KKJ16_Gift_ShootingStar, TRUE) + EVT_ELSE + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_HammerBros_Anim0A, ANIM_HammerBros_Anim02, 16, MSG_Peach_013B) + EVT_END_IF + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInteract_HammerBros_02) = { + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(GetSelfVar, 0, LVar0) + EVT_IF_EQ(LVar0, 0) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_HammerBros_Anim0A, ANIM_HammerBros_Anim02, 0, MSG_Peach_0136) + EVT_CALL(SetSelfVar, 0, 1) + EVT_ELSE + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_HammerBros_Anim0A, ANIM_HammerBros_Anim02, 0, MSG_Peach_0137) + EVT_CALL(SetSelfVar, 0, 0) + EVT_END_IF + EVT_CALL(DisablePlayerInput, FALSE) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInteract_HammerBros_03) = { + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(GetSelfVar, 0, LVar0) + EVT_IF_EQ(LVar0, 0) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_HammerBros_Anim0A, ANIM_HammerBros_Anim02, 0, MSG_Peach_0138) + EVT_CALL(SetSelfVar, 0, 1) + EVT_ELSE + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_HammerBros_Anim0A, ANIM_HammerBros_Anim02, 0, MSG_Peach_0139) + EVT_CALL(SetSelfVar, 0, 0) + EVT_END_IF + EVT_CALL(DisablePlayerInput, FALSE) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_CapturePeach) = { + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(N(SetPeachFlag8)) + EVT_SET_GROUP(EVT_GROUP_00) + EVT_CALL(SetTimeFreezeMode, TIME_FREEZE_PARTIAL) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_262, 0) + EVT_CALL(ShowEmote, NPC_SELF, EMOTE_EXCLAMATION, 0, 20, TRUE, 0, 0, 0, 0) + EVT_CALL(NpcFacePlayer, NPC_SELF, 0) + EVT_WAIT(20) + EVT_CALL(PlayerFaceNpc, NPC_SELF, FALSE) + EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0005) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_HammerBros_Anim02) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_HammerBros_Anim0A, ANIM_HammerBros_Anim02, 0, MSG_Peach_0174) + EVT_CALL(N(ApproachPlayer50Units), -1, LVar3, LVar0, LVar2) + EVT_IF_NE(LVar3, 0) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_HammerBros_Anim07) + EVT_CALL(SetNpcSpeed, NPC_SELF, EVT_FLOAT(5.0)) + EVT_CALL(NpcMoveTo, NPC_SELF, LVar0, LVar2, 0) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_HammerBros_Anim02) + EVT_END_IF + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_HammerBros_Anim0A, ANIM_HammerBros_Anim02, 0, MSG_Peach_0175) + EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0017) + EVT_WAIT(20) + EVT_CALL(GotoMapSpecial, EVT_PTR("kkj_14"), kkj_14_ENTRY_B, TRANSITION_13) + EVT_WAIT(100) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_WatchForPlayer) = { + EVT_LOOP(0) + EVT_CALL(N(GetPeachDisguise), LVar1) + EVT_IF_EQ(LVar1, PEACH_DISGUISE_NONE) + EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_8000000, 1) + EVT_CALL(N(UnkPhysicsFunc), LVar0, 85, 60, 38) + EVT_IF_NE(LVar0, 0) + EVT_CALL(BindNpcAI, NPC_SELF, EVT_PTR(N(EVS_CapturePeach))) + EVT_RETURN + EVT_END_IF + EVT_ELSE + EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_8000000, 0) + EVT_END_IF + EVT_WAIT(1) + EVT_END_LOOP + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcIdle_HammerBros_01) = { + EVT_EXEC(N(EVS_WatchForPlayer)) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcIdle_HammerBros_02) = { + EVT_EXEC(N(EVS_WatchForPlayer)) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_HammerBros_Anim04) + EVT_CALL(SetNpcSpeed, NPC_SELF, EVT_FLOAT(1.7)) + EVT_LOOP(0) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_HammerBros_Anim02) + EVT_WAIT(20) + EVT_CALL(InterpNpcYaw, NPC_SELF, 90, 15) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_HammerBros_Anim04) + EVT_CALL(NpcMoveTo, NPC_SELF, 280, 50, 0) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_HammerBros_Anim02) + EVT_WAIT(20) + EVT_CALL(InterpNpcYaw, NPC_SELF, 270, 15) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_HammerBros_Anim04) + EVT_CALL(NpcMoveTo, NPC_SELF, 80, 50, 0) + EVT_END_LOOP + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcIdle_HammerBros_03) = { + EVT_EXEC(N(EVS_WatchForPlayer)) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_HammerBros_Anim04) + EVT_CALL(SetNpcSpeed, NPC_SELF, EVT_FLOAT(1.7)) + EVT_LOOP(0) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_HammerBros_Anim02) + EVT_WAIT(30) + EVT_CALL(InterpNpcYaw, NPC_SELF, 270, 15) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_HammerBros_Anim04) + EVT_CALL(NpcMoveTo, NPC_SELF, -600, 50, 0) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_HammerBros_Anim02) + EVT_WAIT(30) + EVT_CALL(InterpNpcYaw, NPC_SELF, 90, 15) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_HammerBros_Anim04) + EVT_CALL(NpcMoveTo, NPC_SELF, -420, 50, 0) + EVT_END_LOOP + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_HammerBros_01) = { + EVT_CALL(SetNpcPos, NPC_SELF, -700, 0, 50) + EVT_CALL(SetNpcYaw, NPC_SELF, 90) + EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(EVS_NpcIdle_HammerBros_01))) + EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(EVS_NpcInteract_HammerBros_01))) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_HammerBros_02) = { + EVT_CALL(SetNpcPos, NPC_SELF, 180, 0, 50) + EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(EVS_NpcIdle_HammerBros_02))) + EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(EVS_NpcInteract_HammerBros_02))) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_HammerBros_03) = { + EVT_CALL(SetNpcPos, NPC_SELF, -510, 0, 50) + EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(EVS_NpcIdle_HammerBros_03))) + EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(EVS_NpcInteract_HammerBros_03))) + EVT_RETURN + EVT_END +}; + +NpcData N(NpcData_Minions)[] = { + { + .id = NPC_HammerBros_01, + .pos = { 0.0f, -500.0f, 0.0f }, + .yaw = 0, + .init = &N(EVS_NpcInit_HammerBros_01), + .settings = &N(NpcSettings_HammerBros), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_400000, + .drops = NO_DROPS, + .animations = HAMMER_BROS_ANIMS, + .extraAnimations = N(ExtraAnims_HammerBros), + }, + { + .id = NPC_HammerBros_02, + .pos = { 0.0f, -500.0f, 0.0f }, + .yaw = 0, + .init = &N(EVS_NpcInit_HammerBros_02), + .settings = &N(NpcSettings_HammerBros), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = NO_DROPS, + .animations = HAMMER_BROS_ANIMS, + .extraAnimations = N(ExtraAnims_HammerBros), + }, + { + .id = NPC_HammerBros_03, + .pos = { 0.0f, -500.0f, 0.0f }, + .yaw = 0, + .init = &N(EVS_NpcInit_HammerBros_03), + .settings = &N(NpcSettings_HammerBros), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = NO_DROPS, + .animations = HAMMER_BROS_ANIMS, + .extraAnimations = N(ExtraAnims_HammerBros), + }, +}; + +#define NAME_SUFFIX + +NpcGroupList N(LaterNPCs) = { + NPC_GROUP(N(NpcData_Minions_Later)), + {} +}; diff --git a/src/world/area_kkj/kkj_16/kkj_16_4_stealth.c b/src/world/area_kkj/kkj_16/kkj_16_4_stealth.c new file mode 100644 index 0000000000..59e5ade750 --- /dev/null +++ b/src/world/area_kkj/kkj_16/kkj_16_4_stealth.c @@ -0,0 +1,276 @@ +#include "kkj_16.h" + +Vec3f N(TwinkHide1)[] = { + { -752.0, 60.0, -55.0 }, + { -755.0, 120.0, -60.0 }, + { -770.0, 140.0, -130.0 }, +}; + +Vec3f N(TwinkFollowPath1)[] = { + { -770.0, 140.0, -130.0 }, + { -755.0, 135.0, -90.0 }, + { -670.0, 110.0, -80.0 }, +}; + +Vec3f N(TwinkFollowPath2)[] = { + { -670.0, 110.0, -80.0 }, + { -630.0, 100.0, -80.0 }, + { -470.0, 90.0, -80.0 }, +}; + +EvtScript N(EVS_ApproachPeach) = { + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_SUB(LVar0, 10) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_CALL(SetNpcVar, NPC_HammerBros, 0, 1) + EVT_THREAD + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_SUB(LVar0, 26) + EVT_SUB(LVar2, 2) + EVT_CALL(SetNpcAnimation, NPC_HammerBros, ANIM_HammerBros_Anim07) + EVT_CALL(SetNpcSpeed, NPC_HammerBros, EVT_FLOAT(5.0)) + EVT_CALL(NpcMoveTo, NPC_HammerBros, LVar0, LVar2, 0) + EVT_CALL(SetNpcAnimation, NPC_HammerBros, ANIM_HammerBros_Anim02) + EVT_CALL(NpcFacePlayer, NPC_HammerBros, 5) + EVT_CALL(SetNpcVar, NPC_HammerBros, 0, 0) + EVT_END_THREAD + EVT_THREAD + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_ADD(LVar0, 26) + EVT_ADD(LVar2, 2) + EVT_CALL(SetNpcAnimation, NPC_Koopatrol_01, ANIM_WorldKoopatrol_Anim06) + EVT_CALL(SetNpcSpeed, NPC_Koopatrol_01, EVT_FLOAT(5.0)) + EVT_CALL(NpcMoveTo, NPC_Koopatrol_01, LVar0, LVar2, 0) + EVT_CALL(SetNpcAnimation, NPC_Koopatrol_01, ANIM_WorldKoopatrol_Anim01) + EVT_CALL(NpcFacePlayer, NPC_Koopatrol_01, 5) + EVT_END_THREAD + EVT_LOOP(0) + EVT_WAIT(1) + EVT_CALL(GetNpcVar, NPC_HammerBros, 0, LVar0) + EVT_IF_EQ(LVar0, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_WAIT(10) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_PickUpPeach) = { + EVT_THREAD + EVT_CALL(GetNpcPos, NPC_HammerBros, LVar0, LVar1, LVar2) + EVT_ADD(LVar0, 5) + EVT_CALL(NpcMoveTo, NPC_HammerBros, LVar0, LVar2, 5) + EVT_CALL(SetNpcAnimation, NPC_HammerBros, ANIM_HammerBros_Anim13) + EVT_ADD(LVar0, 5) + EVT_CALL(NpcMoveTo, NPC_HammerBros, LVar0, LVar2, 5) + EVT_END_THREAD + EVT_THREAD + EVT_CALL(GetNpcPos, NPC_Koopatrol_01, LVar0, LVar1, LVar2) + EVT_SUB(LVar0, 5) + EVT_CALL(NpcMoveTo, NPC_Koopatrol_01, LVar0, LVar2, 5) + EVT_CALL(SetNpcAnimation, NPC_Koopatrol_01, ANIM_WorldKoopatrol_Anim12) + EVT_SUB(LVar0, 5) + EVT_CALL(NpcMoveTo, NPC_Koopatrol_01, LVar0, LVar2, 5) + EVT_END_THREAD + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0005) + EVT_WAIT(1) + EVT_LOOP(4) + EVT_ADD(LVar1, 2) + EVT_CALL(SetPlayerPos, LVar0, LVar1, LVar2) + EVT_WAIT(1) + EVT_END_LOOP + EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0018) + EVT_ADD(LVar0, 10) + EVT_LOOP(5) + EVT_ADD(LVar1, 4) + EVT_CALL(SetPlayerPos, LVar0, LVar1, LVar2) + EVT_WAIT(1) + EVT_END_LOOP + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_CarryPeachAway) = { + EVT_CALL(InterpNpcYaw, NPC_Koopatrol_01, 90, 3) + EVT_WAIT(10) + EVT_THREAD + EVT_LOOP(0) + EVT_CALL(GetNpcPos, NPC_HammerBros, LVar0, LVar1, LVar2) + EVT_ADD(LVar0, 32) + EVT_ADD(LVar2, 2) + EVT_CALL(SetPlayerPos, LVar0, 30, LVar2) + EVT_WAIT(1) + EVT_END_LOOP + EVT_END_THREAD + EVT_CALL(SetNpcVar, NPC_HammerBros, 0, 1) + EVT_THREAD + EVT_CALL(SetNpcAnimation, NPC_HammerBros, ANIM_HammerBros_Anim08) + EVT_CALL(SetNpcSpeed, NPC_HammerBros, EVT_FLOAT(5.0)) + EVT_CALL(NpcMoveTo, NPC_HammerBros, -606, -57, 0) + EVT_CALL(SetNpcPos, NPC_HammerBros, 354, 0, 0) + EVT_CALL(SetNpcVar, NPC_HammerBros, 0, 0) + EVT_END_THREAD + EVT_THREAD + EVT_CALL(SetNpcAnimation, NPC_Koopatrol_01, ANIM_WorldKoopatrol_Anim14) + EVT_CALL(SetNpcSpeed, NPC_Koopatrol_01, EVT_FLOAT(5.0)) + EVT_CALL(NpcMoveTo, NPC_Koopatrol_01, -574, -53, 0) + EVT_CALL(SetNpcPos, NPC_Koopatrol_01, 386, 0, 0) + EVT_END_THREAD + EVT_LOOP(0) + EVT_WAIT(1) + EVT_CALL(GetNpcVar, NPC_HammerBros, 0, LVar0) + EVT_IF_EQ(LVar0, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_ManageSneakingScenes) = { + EVT_IF_EQ(AF_KKJ_07, FALSE) + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(DisablePartnerAI, 1) + EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_Twink_Talk, ANIM_Twink_Idle, 0, MSG_Peach_006C) + EVT_SET(AF_KKJ_07, TRUE) + EVT_CALL(EnablePartnerAI) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_END_IF + EVT_LOOP(0) + EVT_WAIT(1) + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_IF_LE(LVar0, -770) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(DisablePlayerPhysics, TRUE) + EVT_CALL(DisablePartnerAI, 0) + EVT_THREAD + EVT_CALL(SetMusicTrack, 0, SONG_PEACH_SNEAKING, 0, 8) + EVT_WAIT(3) + EVT_CALL(SetMusicTrack, 0, SONG_PEACH_SNEAKING, 0, 7) + EVT_WAIT(3) + EVT_CALL(SetMusicTrack, 0, SONG_PEACH_SNEAKING, 0, 6) + EVT_WAIT(3) + EVT_CALL(SetMusicTrack, 0, SONG_PEACH_SNEAKING, 0, 5) + EVT_WAIT(3) + EVT_CALL(SetMusicTrack, 0, SONG_PEACH_SNEAKING, 0, 4) + EVT_END_THREAD + EVT_CALL(SetPlayerAnimation, ANIM_Peach_C000D) + EVT_CALL(PlaySoundAtPlayer, SOUND_262, 0) + EVT_CALL(ShowEmote, NPC_HammerBros, EMOTE_EXCLAMATION, 0, 30, FALSE, 0, 0, 0, 0) + EVT_WAIT(30) + EVT_CALL(SetPlayerAnimation, ANIM_Peach_A0001) + EVT_THREAD + EVT_CALL(NpcFlyTo, NPC_PARTNER, -776, 50, -65, 10, 0, EASING_LINEAR) + EVT_END_THREAD + EVT_THREAD + EVT_CALL(PlayerMoveTo, -778, -55, 10) + EVT_CALL(InterpPlayerYaw, 185, 0) + EVT_END_THREAD + EVT_CALL(SpeakToNpc, NPC_HammerBros, ANIM_HammerBros_Anim0A, ANIM_HammerBros_Anim02, 0, NPC_Koopatrol_01, MSG_Peach_006E) + EVT_CALL(SpeakToNpc, NPC_Koopatrol_01, ANIM_WorldKoopatrol_Anim08, ANIM_WorldKoopatrol_Anim01, 0, NPC_HammerBros, MSG_Peach_006F) + EVT_CALL(SpeakToNpc, NPC_HammerBros, ANIM_HammerBros_Anim0A, ANIM_HammerBros_Anim02, 0, NPC_Koopatrol_01, MSG_Peach_0070) + EVT_CALL(SpeakToNpc, NPC_Koopatrol_01, ANIM_WorldKoopatrol_Anim08, ANIM_WorldKoopatrol_Anim01, 0, NPC_HammerBros, MSG_Peach_0071) + EVT_CALL(SpeakToNpc, NPC_HammerBros, ANIM_HammerBros_Anim0A, ANIM_HammerBros_Anim02, 0, NPC_Koopatrol_01, MSG_Peach_0072) + EVT_CALL(SpeakToNpc, NPC_Koopatrol_01, ANIM_WorldKoopatrol_Anim08, ANIM_WorldKoopatrol_Anim01, 0, NPC_HammerBros, MSG_Peach_0073) + EVT_CALL(SpeakToNpc, NPC_HammerBros, ANIM_HammerBros_Anim0A, ANIM_HammerBros_Anim02, 0, NPC_Koopatrol_01, MSG_Peach_0074) + EVT_CALL(SpeakToNpc, NPC_Koopatrol_01, ANIM_WorldKoopatrol_Anim08, ANIM_WorldKoopatrol_Anim01, 0, NPC_HammerBros, MSG_Peach_0075) + EVT_CALL(SpeakToNpc, NPC_HammerBros, ANIM_HammerBros_Anim0A, ANIM_HammerBros_Anim02, 0, NPC_Koopatrol_01, MSG_Peach_0076) + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_CALL(SetCamDistance, CAM_DEFAULT, 300) + EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(15.0), EVT_FLOAT(-10.5)) + EVT_CALL(SetCamPosA, CAM_DEFAULT, -775, -50) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(3.0)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_CALL(SpeakToPlayer, NPC_PLAYER, ANIM_BattleBow_Talk, ANIM_Peach_A0001, 5, MSG_Peach_0077) + EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_Twink_Talk, ANIM_Twink_Idle, 5, MSG_Peach_0078) + EVT_CALL(ResetCam, CAM_DEFAULT, EVT_FLOAT(90.0)) + EVT_CALL(SpeakToNpc, NPC_HammerBros, ANIM_HammerBros_Anim0A, ANIM_HammerBros_Anim02, 0, NPC_Koopatrol_01, MSG_Peach_0079) + EVT_CALL(SpeakToNpc, NPC_Koopatrol_01, ANIM_WorldKoopatrol_Anim08, ANIM_WorldKoopatrol_Anim01, 0, NPC_HammerBros, MSG_Peach_007A) + EVT_THREAD + EVT_CALL(SetNpcAnimation, NPC_HammerBros, ANIM_HammerBros_Anim07) + EVT_CALL(NpcMoveTo, NPC_HammerBros, -820, 50, 30) + EVT_CALL(SetNpcAnimation, NPC_HammerBros, ANIM_HammerBros_Anim02) + EVT_CALL(NpcFacePlayer, NPC_HammerBros, 0) + EVT_END_THREAD + EVT_THREAD + EVT_CALL(SetNpcAnimation, NPC_Koopatrol_01, ANIM_WorldKoopatrol_Anim06) + EVT_CALL(NpcMoveTo, NPC_Koopatrol_01, -840, 10, 30) + EVT_CALL(SetNpcAnimation, NPC_Koopatrol_01, ANIM_WorldKoopatrol_Anim01) + EVT_CALL(NpcFacePlayer, NPC_Koopatrol_01, 0) + EVT_END_THREAD + EVT_THREAD + EVT_WAIT(10) + EVT_CALL(SetNpcAnimation, NPC_PARTNER, ANIM_Twink_Cringe) + EVT_CALL(LoadPath, 20, EVT_PTR(N(TwinkHide1)), ARRAY_COUNT(N(TwinkHide1)), EASING_LINEAR) + EVT_LOOP(0) + EVT_CALL(GetNextPathPos) + EVT_CALL(SetNpcPos, NPC_PARTNER, LVar1, LVar2, LVar3) + EVT_WAIT(1) + EVT_IF_EQ(LVar0, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_CALL(NpcFacePlayer, NPC_PARTNER, 0) + EVT_END_THREAD + EVT_THREAD + EVT_WAIT(10) + EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0005) + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_CALL(SetPlayerJumpscale, EVT_FLOAT(1.0)) + EVT_CALL(PlayerJump1, LVar0, LVar1, LVar2, 10) + EVT_END_THREAD + EVT_WAIT(30) + EVT_CALL(SpeakToPlayer, NPC_HammerBros, ANIM_HammerBros_Anim0A, ANIM_HammerBros_Anim02, 0, MSG_Peach_007B) + EVT_CALL(SpeakToPlayer, NPC_Koopatrol_01, ANIM_WorldKoopatrol_Anim08, ANIM_WorldKoopatrol_Anim01, 0, MSG_Peach_007C) + EVT_EXEC_WAIT(N(EVS_ApproachPeach)) + EVT_EXEC_WAIT(N(EVS_PickUpPeach)) + EVT_EXEC_WAIT(N(EVS_CarryPeachAway)) + EVT_CALL(SpeakToPlayer, NPC_PLAYER, ANIM_Peach_C0018, ANIM_Peach_C0018, 5, MSG_Peach_007D) + EVT_WAIT(10) + EVT_CALL(LoadPath, 40, EVT_PTR(N(TwinkFollowPath1)), ARRAY_COUNT(N(TwinkFollowPath1)), EASING_LINEAR) + EVT_LOOP(0) + EVT_CALL(GetNextPathPos) + EVT_CALL(SetNpcPos, NPC_PARTNER, LVar1, LVar2, LVar3) + EVT_WAIT(1) + EVT_IF_EQ(LVar0, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_CALL(SetNpcAnimation, NPC_PARTNER, ANIM_Twink_TalkSad) + EVT_LOOP(2) + EVT_CALL(InterpNpcYaw, NPC_PARTNER, 270, 7) + EVT_WAIT(5) + EVT_CALL(InterpNpcYaw, NPC_PARTNER, 90, 7) + EVT_WAIT(5) + EVT_END_LOOP + EVT_WAIT(10) + EVT_CALL(SetNpcAnimation, NPC_PARTNER, ANIM_Twink_Idle) + EVT_THREAD + EVT_CALL(LoadPath, 30, EVT_PTR(N(TwinkFollowPath2)), ARRAY_COUNT(N(TwinkFollowPath2)), EASING_LINEAR) + EVT_LOOP(0) + EVT_CALL(GetNextPathPos) + EVT_CALL(SetNpcPos, NPC_PARTNER, LVar1, LVar2, LVar3) + EVT_WAIT(1) + EVT_IF_EQ(LVar0, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_END_THREAD + EVT_WAIT(15) + EVT_CALL(FadeOutMusic, 0, 1000) + EVT_EXEC_WAIT(N(EVS_EndPeachChapter2)) + EVT_CALL(EnablePartnerAI) + EVT_CALL(DisablePlayerPhysics, FALSE) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_kkj/kkj_16/kkj_16_5_entity.c b/src/world/area_kkj/kkj_16/kkj_16_5_entity.c new file mode 100644 index 0000000000..5ee20896fa --- /dev/null +++ b/src/world/area_kkj/kkj_16/kkj_16_5_entity.c @@ -0,0 +1,28 @@ +#include "kkj_16.h" +#include "entity.h" + +// immediately remove the item from Peach's inventory, keeping only the flag +EvtScript N(EVS_AutoRemovePowerRush) = { + EVT_LOOP(0) + EVT_IF_EQ(GF_KKJ16_Item_PowerRush, TRUE) + EVT_BREAK_LOOP + EVT_END_IF + EVT_WAIT(1) + EVT_END_LOOP + EVT_WAIT(10) + EVT_CALL(RemoveBadge, ITEM_POWER_RUSH) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_MakeEntities) = { + EVT_CALL(MakeItemEntity, ITEM_LIFE_SHROOM, -840, 110, 10, ITEM_SPAWN_MODE_FIXED_NEVER_VANISH, GF_KKJ16_Item_LifeShroom) + EVT_CALL(MakeItemEntity, ITEM_POWER_RUSH, -550, 0, -120, ITEM_SPAWN_MODE_FIXED_NEVER_VANISH, GF_KKJ16_Item_PowerRush) + EVT_IF_LT(GB_StoryProgress, STORY_CH8_REACHED_PEACHS_CASTLE) + EVT_IF_EQ(GF_KKJ16_Item_PowerRush, FALSE) + EVT_EXEC(N(EVS_AutoRemovePowerRush)) + EVT_END_IF + EVT_END_IF + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_kkj/kkj_17/AF1C60.c b/src/world/area_kkj/kkj_17/AF1C60.c deleted file mode 100644 index 351d985044..0000000000 --- a/src/world/area_kkj/kkj_17/AF1C60.c +++ /dev/null @@ -1,119 +0,0 @@ -#include "kkj_17.h" -#include "hud_element.h" - -extern s32 D_8024092C_AF258C[5]; -extern IconHudScriptPair gItemHudScripts[]; - -static char* N(exit_str_0) = "kkj_11"; -static char* N(exit_str_1) = ""; - -#include "world/common/todo/StashVars.inc.c" - -#include "world/common/todo/GetItemName.inc.c" - -#include "world/common/todo/SomeItemEntityFunc.inc.c" - -#include "world/common/todo/IsItemBadge.inc.c" - -ApiStatus func_802402BC_AF1F1C(Evt* script, s32 isInitialCall) { - PopupMenu *menu; - s32 menuIdx; - s32 index; - s32 var1; - s32 var2; - s32 i; - - if (isInitialCall) { - menu = heap_malloc(sizeof(*menu)); - script->functionTempPtr[2] = menu; - script->varTable[10] = script->varTable[0]; - - if (script->varTable[0] == 0) { - script->varTable[1] = GF_KKJ16_Item_PowerRush; - script->varTable[2] = GF_KKJ_Stored_PowerRush; - menu->popupType = POPUP_MENU_USEKEY; - } else { - script->varTable[1] = GF_KKJ_Stored_PowerRush; - script->varTable[2] = GF_KKJ_Retrieved_PowerRush; - menu->popupType = POPUP_MENU_TAKE_FROM_CHEST; - } - - menuIdx = 0; - for (i = 0; i < ARRAY_COUNT(D_8024092C_AF258C); i++) { - var1 = evt_get_variable(NULL, script->varTable[1] + i); - var2 = evt_get_variable(NULL, script->varTable[2] + i); - if ((var1 != 0) && (var2 == 0)) { - ItemData* item = &gItemTable[D_8024092C_AF258C[i]]; - IconHudScriptPair* itemHudScripts = &gItemHudScripts[item->hudElemID]; - menu->ptrIcon[menuIdx] = itemHudScripts->enabled; - menu->userIndex[menuIdx] = i; - menu->enabled[menuIdx] = TRUE; - menu->nameMsg[menuIdx] = item->nameMsg; - menu->descMsg[menuIdx] = item->shortDescMsg; - menuIdx++; - } - } - - if (menuIdx == 0) { - script->varTable[0] = 0; - return ApiStatus_DONE1; - } - - menu->numEntries = menuIdx; - menu->initialPos = 0; - create_popup_menu(menu); - script->functionTemp[0] = 0; - } - - menu = script->functionTempPtr[2]; - if (script->functionTemp[0] == 0) { - script->functionTemp[1] = menu->result; - if (script->functionTemp[1] == 0) { - return ApiStatus_BLOCK; - } - hide_popup_menu(); - } - - script->functionTemp[0]++; - if (script->functionTemp[0] < 15) { - return ApiStatus_BLOCK; - } - - destroy_popup_menu(); - - if (script->functionTemp[1] == 255) { - script->varTable[0] = -1; - } else { - index = menu->userIndex[script->functionTemp[1] - 1]; - script->varTable[0] = D_8024092C_AF258C[index]; - if (script->varTable[10] == 0) { - evt_set_variable(NULL, script->varTable[2] + index, 1); - } - heap_free(script->functionTempPtr[2]); - } - - return ApiStatus_DONE2; -} - -ApiStatus func_80240500_AF2160(Evt* script, s32 isInitialCall) { - s32* ptr = D_8024092C_AF258C; - s32 found = FALSE; - s32 i; - - for (i = 0; i < ARRAY_COUNT(D_8024092C_AF258C); i++) { - s32 var = ptr[i]; - - if (script->varTable[0] == var) { - found = TRUE; - break; - } - } - - if (found) { - evt_set_variable(NULL, GF_KKJ_Retrieved_PowerRush + i, TRUE); - } - - return ApiStatus_DONE2; -} - -#include "world/common/todo/GetItemEmptyCount.inc.c" diff --git a/src/world/area_kkj/kkj_17/kkj_17.h b/src/world/area_kkj/kkj_17/kkj_17.h index a6dda9bd9d..2e41808036 100644 --- a/src/world/area_kkj/kkj_17/kkj_17.h +++ b/src/world/area_kkj/kkj_17/kkj_17.h @@ -2,8 +2,17 @@ /// @brief Peach's Castle - Storeroom (2F) #include "common.h" -#include "../kkj.h" #include "message_ids.h" #include "map.h" +#include "../kkj.h" +#include "mapfs/kkj_17_shape.h" +#include "mapfs/kkj_17_hit.h" + +#include "sprite/npc/Twink.h" + #define NAMESPACE kkj_17 + +extern EvtScript N(EVS_Main); +extern EvtScript N(EVS_MakeEntities); +extern EvtScript N(EVS_SetupMagicChest); diff --git a/src/world/area_kkj/kkj_17/kkj_17_0_header.c b/src/world/area_kkj/kkj_17/kkj_17_0_header.c new file mode 100644 index 0000000000..a2d857f1ed --- /dev/null +++ b/src/world/area_kkj/kkj_17/kkj_17_0_header.c @@ -0,0 +1,12 @@ +#include "kkj_17.h" + +EntryList N(Entrances) = { + [kkj_17_ENTRY_0] { -187.0, 0.0, -35.0, 90.0 }, +}; + +MapSettings N(settings) = { + .main = &N(EVS_Main), + .entryList = &N(Entrances), + .entryCount = ENTRY_COUNT(N(Entrances)), + .tattle = { MSG_MapTattle_kkj_17 }, +}; diff --git a/src/world/area_kkj/kkj_17/kkj_17_1_main.c b/src/world/area_kkj/kkj_17/kkj_17_1_main.c new file mode 100644 index 0000000000..eed569e735 --- /dev/null +++ b/src/world/area_kkj/kkj_17/kkj_17_1_main.c @@ -0,0 +1,42 @@ +#include "kkj_17.h" + +EvtScript N(EVS_ExitDoors_kkj_11_5) = { + EVT_SET_GROUP(EVT_GROUP_1B) + EVT_CALL(DisablePlayerInput, TRUE) + EVT_SET(LVar0, kkj_17_ENTRY_0) + EVT_SET(LVar1, COLLIDER_ttw) + EVT_SET(LVar2, MODEL_o2) + EVT_SET(LVar3, DOOR_SWING_OUT) + EVT_EXEC(ExitSingleDoor) + EVT_WAIT(17) + EVT_CALL(GotoMap, EVT_PTR("kkj_11"), kkj_11_ENTRY_5) + EVT_WAIT(100) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_EnterMap) = { + EVT_CALL(GetEntryID, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_EQ(kkj_17_ENTRY_0) + EVT_SET(LVar2, MODEL_o2) + EVT_SET(LVar3, DOOR_SWING_OUT) + EVT_EXEC_WAIT(EnterSingleDoor) + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Main) = { + EVT_SET(GB_WorldLocation, LOCATION_PEACHS_CASTLE) + EVT_CALL(SetSpriteShading, SHADING_KKJ_17) + EVT_SETUP_CAMERA_DEFAULT() + EVT_EXEC_WAIT(N(EVS_MakeEntities)) + EVT_EXEC(N(EVS_SetupMagicChest)) + EVT_CALL(UseDoorSounds, DOOR_SOUNDS_BASIC) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitDoors_kkj_11_5)), TRIGGER_WALL_PRESS_A, COLLIDER_ttw, 1, 0) + EVT_EXEC(N(EVS_EnterMap)) + EVT_WAIT(1) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_kkj/kkj_17/kkj_17_2_entity.c b/src/world/area_kkj/kkj_17/kkj_17_2_entity.c new file mode 100644 index 0000000000..ff862ade23 --- /dev/null +++ b/src/world/area_kkj/kkj_17/kkj_17_2_entity.c @@ -0,0 +1,26 @@ +#include "kkj_17.h" + +// immediately remove the item from Peach's inventory, keeping only the flag +EvtScript N(EVS_AutoRemoveDeepFocus) = { + EVT_LOOP(0) + EVT_IF_EQ(GF_KKJ17_Item_DeepFocus, TRUE) + EVT_BREAK_LOOP + EVT_END_IF + EVT_WAIT(1) + EVT_END_LOOP + EVT_WAIT(10) + EVT_CALL(RemoveBadge, ITEM_DEEP_FOCUS1) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_MakeEntities) = { + EVT_CALL(MakeItemEntity, ITEM_DEEP_FOCUS1, 100, 0, -30, ITEM_SPAWN_MODE_FIXED_NEVER_VANISH, GF_KKJ17_Item_DeepFocus) + EVT_IF_LT(GB_StoryProgress, STORY_CH8_REACHED_PEACHS_CASTLE) + EVT_IF_EQ(GF_KKJ17_Item_DeepFocus, FALSE) + EVT_EXEC(N(EVS_AutoRemoveDeepFocus)) + EVT_END_IF + EVT_END_IF + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_kkj/kkj_17/kkj_17_3_chest.c b/src/world/area_kkj/kkj_17/kkj_17_3_chest.c new file mode 100644 index 0000000000..4757888c18 --- /dev/null +++ b/src/world/area_kkj/kkj_17/kkj_17_3_chest.c @@ -0,0 +1,283 @@ +#include "kkj_17.h" +#include "hud_element.h" + +extern IconHudScriptPair gItemHudScripts[]; + +// ------------------------------------------------------ +// begin modified Chest.inc.c +// differences are: +// - inclusion of N(ChestItems) +// - removal of N(EVS_Chest_GetItem) + +#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" + +s32** N(varStash) = NULL; + +EvtScript N(EVS_Chest_ShowGotItem) = { + EVT_SET_GROUP(EVT_GROUP_00) + EVT_CALL(SetTimeFreezeMode, TIME_FREEZE_FULL) + EVT_WAIT(40) + EVT_CALL(ShowGotItem, LVar0, FALSE, 0) + EVT_CALL(SetTimeFreezeMode, TIME_FREEZE_NORMAL) + EVT_RETURN + EVT_RETURN + EVT_END +}; + +s32 N(ChestItems)[] = { + ITEM_POWER_RUSH, + ITEM_SHOOTING_STAR, + ITEM_DEEP_FOCUS1, + ITEM_LAST_STAND, + ITEM_JAMMIN_JELLY, +}; + +// end modified Chest.inc.c +// ------------------------------------------------------ + +//TODO this whole file is probably an include shared with kkj_17, but the temp required in this function prevents deduplication +API_CALLABLE(N(ChestItemPrompt)) { + PopupMenu *menu; + s32 menuIdx; + s32 selectIdx; + s32 canUseItem; + s32 itemUsedBefore; + s32 i; + + if (isInitialCall) { + menu = heap_malloc(sizeof(*menu)); + script->functionTempPtr[2] = menu; + script->varTable[10] = script->varTable[0]; + + // NOTE: identical to ChestItemPrompt in hos_06 EXCEPT here, where varTable[0] is required instead of varTable[10] + if (script->varTable[0] == 0) { + // storing items + script->varTable[1] = GF_KKJ16_Item_PowerRush; + script->varTable[2] = GF_KKJ_Stored_PowerRush; + menu->popupType = POPUP_MENU_USEKEY; + } else { + // retrieving items + script->varTable[1] = GF_KKJ_Stored_PowerRush; + script->varTable[2] = GF_KKJ_Retrieved_PowerRush; + menu->popupType = POPUP_MENU_TAKE_FROM_CHEST; + } + + menuIdx = 0; + for (i = 0; i < ARRAY_COUNT(N(ChestItems)); i++) { + // meaning of 'can use' and 'used before' depends on type of chest interaction + canUseItem = evt_get_variable(NULL, script->varTable[1] + i); + itemUsedBefore = evt_get_variable(NULL, script->varTable[2] + i); + if (canUseItem && !itemUsedBefore) { + ItemData* item = &gItemTable[N(ChestItems)[i]]; + IconHudScriptPair* itemHudScripts = &gItemHudScripts[item->hudElemID]; + menu->ptrIcon[menuIdx] = itemHudScripts->enabled; + menu->userIndex[menuIdx] = i; + menu->enabled[menuIdx] = TRUE; + menu->nameMsg[menuIdx] = item->nameMsg; + menu->descMsg[menuIdx] = item->shortDescMsg; + menuIdx++; + } + } + + if (menuIdx == 0) { + script->varTable[0] = 0; + return ApiStatus_DONE1; + } + + menu->numEntries = menuIdx; + menu->initialPos = 0; + create_popup_menu(menu); + script->functionTemp[0] = 0; + } + + menu = script->functionTempPtr[2]; + if (script->functionTemp[0] == 0) { + script->functionTemp[1] = menu->result; + if (script->functionTemp[1] == 0) { + return ApiStatus_BLOCK; + } + hide_popup_menu(); + } + + script->functionTemp[0]++; + if (script->functionTemp[0] < 15) { + return ApiStatus_BLOCK; + } + + destroy_popup_menu(); + + if (script->functionTemp[1] == 255) { + script->varTable[0] = -1; + } else { + selectIdx = menu->userIndex[script->functionTemp[1] - 1]; + script->varTable[0] = N(ChestItems)[selectIdx]; + if (script->varTable[10] == 0) { + evt_set_variable(NULL, script->varTable[2] + selectIdx, 1); + } + heap_free(script->functionTempPtr[2]); + } + + return ApiStatus_DONE2; +} + +// assumes itemID on LVar0, sets GF_KKJ_Retrieved_* based on item list position +API_CALLABLE(N(SetItemRetrieved)) { + s32 found = FALSE; + s32 i; + + for (i = 0; i < ARRAY_COUNT(N(ChestItems)); i++) { + s32 listItemID = N(ChestItems)[i]; + + if (script->varTable[0] == listItemID) { + found = TRUE; + break; + } + } + + if (found) { + evt_set_variable(NULL, GF_KKJ_Retrieved_PowerRush + i, TRUE); + } + + return ApiStatus_DONE2; +} + +#include "world/common/todo/GetItemEmptyCount.inc.c" + +EvtScript N(EVS_OpenChest) = { + EVT_CALL(PlaySoundAtCollider, COLLIDER_o89, SOUND_204A, 0) + EVT_CALL(MakeLerp, 0, 80, 20, EASING_QUADRATIC_OUT) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_CALL(RotateGroup, MODEL_g21, LVar0, -1, 0, 0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_CloseChest) = { + EVT_CALL(MakeLerp, 80, 0, 20, EASING_QUADRATIC_OUT) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_CALL(RotateGroup, MODEL_g21, 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_o89, SOUND_204B, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_FindMagicChest) = { + EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_Twink_Talk, ANIM_Twink_Idle, 0, MSG_Peach_018E) + EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0000) + EVT_WAIT(10) + EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0026) + EVT_CALL(SpeakToNpc, NPC_PLAYER, ANIM_Peach_C0001, ANIM_Peach_C0026, 0, NPC_PARTNER, MSG_Peach_018F) + EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_Twink_Talk, ANIM_Twink_Idle, 0, MSG_Peach_0190) + EVT_CALL(SpeakToNpc, NPC_PLAYER, ANIM_Peach_C0001, ANIM_Peach_C0026, 0, NPC_PARTNER, MSG_Peach_0191) + EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_Twink_Talk, ANIM_Twink_Idle, 0, MSG_Peach_0192) + EVT_CALL(SpeakToNpc, NPC_PLAYER, ANIM_Peach_C0001, ANIM_Peach_C0026, 0, NPC_PARTNER, MSG_Peach_0193) + EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0002) + EVT_WAIT(10) + EVT_CALL(SetPlayerAnimation, ANIM_Peach_A0001) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_UseMagicChest_Peach) = { + EVT_SET(LVar0, 0) + EVT_CALL(N(ChestItemPrompt)) + EVT_SWITCH(LVar0) + EVT_CASE_EQ(-1) + EVT_CASE_EQ(0) + EVT_WAIT(10) + EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_Twink_Talk, ANIM_Twink_Idle, 0, MSG_Peach_0194) + EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0000) + EVT_WAIT(10) + EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0026) + EVT_CALL(SpeakToNpc, NPC_PLAYER, ANIM_Peach_C0001, ANIM_Peach_C0026, 0, NPC_PARTNER, MSG_Peach_0195) + EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_Twink_Talk, ANIM_Twink_Idle, 0, MSG_Peach_0196) + EVT_CALL(SpeakToNpc, NPC_PLAYER, ANIM_Peach_C0001, ANIM_Peach_C0026, 0, NPC_PARTNER, MSG_Peach_0197) + EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0002) + EVT_WAIT(10) + EVT_CALL(SetPlayerAnimation, ANIM_Peach_A0001) + EVT_CASE_DEFAULT + EVT_WAIT(10) + EVT_SET(LVar9, LVar0) + EVT_EXEC_WAIT(N(EVS_OpenChest)) + EVT_CALL(N(GetItemName), LVar9) + EVT_CALL(SetMessageText, LVar9, 0) + EVT_CALL(ShowMessageAtScreenPos, MSG_Peach_0198, 160, 40) + EVT_WAIT(10) + EVT_EXEC_WAIT(N(EVS_CloseChest)) + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_UseMagicChest_Mario) = { + EVT_EXEC_WAIT(N(EVS_OpenChest)) + EVT_SET(LVar0, 1) + EVT_CALL(N(ChestItemPrompt)) + EVT_SWITCH(LVar0) + EVT_CASE_EQ(-1) + EVT_CASE_EQ(0) + EVT_CALL(ShowMessageAtScreenPos, MSG_Menus_00D4, 160, 40) + EVT_CASE_OR_EQ(269) + EVT_CASE_OR_EQ(297) + EVT_CASE_OR_EQ(273) + EVT_SET_GROUP(EVT_GROUP_00) + EVT_CALL(SetTimeFreezeMode, TIME_FREEZE_FULL) + EVT_CALL(ShowGotItem, LVar0, FALSE, 0) + EVT_CALL(SetTimeFreezeMode, TIME_FREEZE_NORMAL) + EVT_CALL(AddBadge, LVar0, LVar1) + EVT_CALL(N(SetItemRetrieved)) + EVT_END_CASE_GROUP + EVT_CASE_DEFAULT + EVT_CALL(N(GetItemEmptyCount)) + EVT_IF_LE(LVar1, 0) + EVT_CALL(ShowMessageAtScreenPos, MSG_Menus_00D5, 160, 40) + EVT_ELSE + EVT_CALL(ShowGotItem, LVar0, FALSE, 2) + EVT_CALL(AddItem, LVar0, LVar1) + EVT_CALL(N(SetItemRetrieved)) + EVT_END_IF + EVT_END_SWITCH + EVT_EXEC_WAIT(N(EVS_CloseChest)) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Interact_MagicChest) = { + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(DisablePartnerAI, 1) + EVT_IF_LT(GB_StoryProgress, STORY_CH8_REACHED_PEACHS_CASTLE) + EVT_IF_EQ(GF_KKJ17_FoundMagicChest, FALSE) + EVT_EXEC_WAIT(N(EVS_FindMagicChest)) + EVT_SET(GF_KKJ17_FoundMagicChest, TRUE) + EVT_ELSE + EVT_EXEC_WAIT(N(EVS_UseMagicChest_Peach)) + EVT_END_IF + EVT_ELSE + EVT_EXEC_WAIT(N(EVS_UseMagicChest_Mario)) + EVT_END_IF + EVT_CALL(EnablePartnerAI) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_SetupMagicChest) = { + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_Interact_MagicChest)), TRIGGER_WALL_PRESS_A, COLLIDER_o89, 1, 0) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_kkj/kkj_18/AF2CA0.c b/src/world/area_kkj/kkj_18/AF2CA0.c deleted file mode 100644 index dcbc43efcc..0000000000 --- a/src/world/area_kkj/kkj_18/AF2CA0.c +++ /dev/null @@ -1,15 +0,0 @@ -#include "kkj_18.h" - -static char* N(exit_str_0) = "mac_04"; -static char* N(exit_str_1) = "kkj_19"; -static char* N(exit_str_2) = "kkj_11"; -static char* N(exit_str_3) = ""; - -#include "world/common/atomic/TexturePan.inc.c" - -ApiStatus func_8024030C_AF2FAC(Evt* script, s32 isInitialCall) { - gGameStatusPtr->peachFlags &= ~PEACH_STATUS_FLAG_IS_PEACH; - gPlayerData.currentPartner = script->varTable[0]; - - return ApiStatus_DONE2; -} diff --git a/src/world/area_kkj/kkj_18/AF2FE0.c b/src/world/area_kkj/kkj_18/AF2FE0.c deleted file mode 100644 index 1ac722d4bf..0000000000 --- a/src/world/area_kkj/kkj_18/AF2FE0.c +++ /dev/null @@ -1,88 +0,0 @@ -#include "kkj_18.h" -#include "camera.h" - -#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 kkj_18_D_80244CB0[114]; -BSS s32 kkj_18_D_80244E78[92]; - -ApiStatus func_802405F8_AF3298(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++) { - kkj_18_D_80244CB0[i] = ptr[i]; - } - kkj_18_D_80244CB0[i] = 0; - } else { - for (i = 0; i < 112; i++) { - kkj_18_D_80244CB0[i] = i + 16; - kkj_18_D_80244CB0[112] = 0; - } - } - - return ApiStatus_DONE2; -} - -ApiStatus func_80240694_AF3334(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++) { - kkj_18_D_80244E78[i] = ptr[i]; - } - kkj_18_D_80244E78[i] = 0; - } else { - for (i = 0; i < 91; i++) { - kkj_18_D_80244E78[i] = i + 128; - kkj_18_D_80244E78[91] = 0; - } - } - - return ApiStatus_DONE2; -} - -ApiStatus func_80240730_AF33D0(Evt* script, s32 isInitialCall) { - Bytecode* args = script->ptrReadPos; - - gPlayerStatus.peachItemHeld = evt_get_float_variable(script, *args++); - gGameStatusPtr->peachCookingIngredient = gPlayerStatus.peachItemHeld; - - return ApiStatus_DONE2; -} - -ApiStatus func_80240774_AF3414(Evt* script, s32 isInitialCall) { - Camera* camera = &gCameras[CAM_DEFAULT]; - - if (isInitialCall) { - camera->flags |= CAMERA_FLAG_SHAKING; - script->functionTempF[0] = 0.0f; - } - - script->functionTempF[0] += 10.0f; - guRotateF(camera->viewMtxShaking, script->functionTempF[0], 0.0f, 0.0f, -1.0f); - - if (script->functionTempF[0] >= 360.0) { - return ApiStatus_DONE2; - } - - return ApiStatus_BLOCK; -} diff --git a/src/world/area_kkj/kkj_18/kkj_18.h b/src/world/area_kkj/kkj_18/kkj_18.h index 2d35286007..20151eb99e 100644 --- a/src/world/area_kkj/kkj_18/kkj_18.h +++ b/src/world/area_kkj/kkj_18/kkj_18.h @@ -2,8 +2,36 @@ /// @brief Peach's Castle - Dining Room (2F) #include "common.h" -#include "../kkj.h" #include "message_ids.h" #include "map.h" +#include "../kkj.h" +#include "mapfs/kkj_18_shape.h" +#include "mapfs/kkj_18_hit.h" + +#include "sprite/npc/GourmetGuy.h" +#include "sprite/npc/WorldKammy.h" +#include "sprite/npc/WorldKoopatrol.h" +#include "sprite/npc/Twink.h" + +enum { + NPC_Kammy = 0, + NPC_Koopatrol_01 = 1, + NPC_Koopatrol_02 = 2, + NPC_GourmetGuy = 3, + NPC_GourmetGuy_Knife = 4, + NPC_GourmetGuy_Fork = 5, +}; + +enum { + MV_CakeItemIdx = MapVar(0), +}; + #define NAMESPACE kkj_18 + +extern EvtScript N(EVS_Main); +extern EvtScript N(EVS_SetupMusic); +extern EvtScript N(EVS_EndPeachChapter4); +extern EvtScript N(EVS_ManageGourmetGuyScenes); + +extern NpcGroupList N(DefaultNPCs); diff --git a/src/world/area_kkj/kkj_18/kkj_18_0_header.c b/src/world/area_kkj/kkj_18/kkj_18_0_header.c new file mode 100644 index 0000000000..9205063c76 --- /dev/null +++ b/src/world/area_kkj/kkj_18/kkj_18_0_header.c @@ -0,0 +1,13 @@ +#include "kkj_18.h" + +EntryList N(Entrances) = { + [kkj_18_ENTRY_0] { -187.0, 0.0, -35.0, 90.0 }, +}; + +MapSettings N(settings) = { + .main = &N(EVS_Main), + .entryList = &N(Entrances), + .entryCount = ENTRY_COUNT(N(Entrances)), + .background = &gBackgroundImage, + .tattle = { MSG_MapTattle_kkj_18 }, +}; diff --git a/src/world/area_kkj/kkj_18/kkj_18_1_music.c b/src/world/area_kkj/kkj_18/kkj_18_1_music.c new file mode 100644 index 0000000000..f66aa09f75 --- /dev/null +++ b/src/world/area_kkj/kkj_18/kkj_18_1_music.c @@ -0,0 +1,9 @@ +#include "kkj_18.h" + +EvtScript N(EVS_SetupMusic) = { + EVT_IF_EQ(GB_StoryProgress, STORY_CH4_BEGAN_PEACH_MISSION) + EVT_CALL(SetMusicTrack, 0, SONG_PEACH_MISSION, 0, 8) + EVT_END_IF + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_kkj/kkj_18/kkj_18_2_main.c b/src/world/area_kkj/kkj_18/kkj_18_2_main.c new file mode 100644 index 0000000000..39a6ecdd71 --- /dev/null +++ b/src/world/area_kkj/kkj_18/kkj_18_2_main.c @@ -0,0 +1,132 @@ +#include "kkj_18.h" + +#include "world/common/atomic/TexturePan.inc.c" +#include "../common/RestoreFromPeachState.inc.c" + +Gfx N(setup_gfx_candle_lights)[] = { + gsDPPipeSync(), + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), + gsDPSetCycleType(G_CYC_2CYCLE), + gsDPSetTexturePersp(G_TP_PERSP), + gsDPSetTextureDetail(G_TD_CLAMP), + gsDPSetTextureLOD(G_TL_TILE), + gsDPSetTextureLUT(G_TT_NONE), + gsDPSetTextureFilter(G_TF_BILERP), + gsDPSetTextureConvert(G_TC_FILT), + gsDPSetPrimColor(0, 0, 75, 31, 19, 255), + gsDPSetEnvColor(255, 118, 77, 0), + gsDPSetCombineLERP(TEXEL0, TEXEL1, TEXEL0, 1, 1, TEXEL0, TEXEL1, 1, 0, PRIMITIVE, COMBINED, ENVIRONMENT, COMBINED, TEXEL1, TEXEL1, TEXEL1), + gsDPSetRenderMode(G_RM_PASS, G_RM_ZB_CLD_SURF2), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_SHADE | G_CULL_BACK | G_SHADING_SMOOTH), + gsSPEndDisplayList(), +}; + +EvtScript N(EVS_EndPeachChapter4) = { + EVT_SET(LVar0, GB_KKJ_LastPartner) + EVT_CALL(N(RestoreFromPeachState)) + EVT_CALL(PlaySound, SOUND_DC) + EVT_CALL(GotoMapSpecial, EVT_PTR("mac_04"), mac_04_ENTRY_5, TRANSITION_12) + EVT_WAIT(100) +}; + +EvtScript N(EVS_UpdateClockPendulum) = { + EVT_LOOP(0) + EVT_CALL(MakeLerp, -8, 8, 30, EASING_LINEAR) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_CALL(RotateGroup, MODEL_g13, LVar0, 0, 0, 1) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_CALL(MakeLerp, 8, -8, 30, EASING_LINEAR) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_CALL(RotateGroup, MODEL_g13, LVar0, 0, 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_ExitDoor_0) = { + EVT_SET_GROUP(EVT_GROUP_1B) + EVT_CALL(DisablePlayerInput, TRUE) + EVT_SET(LVar0, kkj_18_ENTRY_0) + EVT_SET(LVar1, COLLIDER_ttw) + EVT_SET(LVar2, MODEL_o9) + EVT_SET(LVar3, DOOR_SWING_OUT) + EVT_EXEC(ExitSingleDoor) + EVT_WAIT(17) + EVT_IF_EQ(AB_KKJ_CompletedBakeStep, CAKE_TYPE_NONE) + EVT_CALL(GotoMap, EVT_PTR("kkj_11"), kkj_11_ENTRY_6) + EVT_ELSE + EVT_CALL(GotoMap, EVT_PTR("kkj_19"), kkj_19_ENTRY_0) + EVT_END_IF + EVT_WAIT(100) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_EnterMap) = { + EVT_CALL(DisablePlayerInput, TRUE) + EVT_IF_NE(AF_KKJ_FinishedBakingCake, FALSE) + EVT_CALL(SetPlayerPos, -227, 0, -35) + EVT_CALL(SetNpcPos, NPC_PARTNER, -227, 0, -35) + EVT_WAIT(30) + EVT_CALL(PlaySoundAtCollider, COLLIDER_ttw, SOUND_BASIC_DOOR_OPEN, 0) + EVT_CALL(MakeLerp, 0, 80, 10, EASING_LINEAR) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_CALL(RotateModel, MODEL_o9, LVar0, 0, -1, 0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_CALL(SetPlayerPos, -187, 0, -35) + EVT_CALL(SetNpcPos, NPC_PARTNER, -187, 0, -35) + EVT_END_IF + EVT_SET(LVar0, 0) + EVT_SET(LVar2, MODEL_o9) + EVT_SET(LVar3, DOOR_SWING_OUT) + EVT_EXEC_WAIT(EnterSingleDoor) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitDoor_0)), TRIGGER_WALL_PRESS_A, COLLIDER_ttw, 1, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Main) = { + EVT_SET(GB_WorldLocation, LOCATION_PEACHS_CASTLE) + EVT_CALL(SetSpriteShading, SHADING_NONE) + EVT_SETUP_CAMERA_DEFAULT() + EVT_IF_EQ(GB_StoryProgress, STORY_CH4_BEGAN_PEACH_MISSION) + EVT_CALL(MakeNpcs, FALSE, EVT_PTR(N(DefaultNPCs))) + EVT_END_IF + EVT_EXEC(N(EVS_UpdateClockPendulum)) + EVT_CALL(SetTexPanner, MODEL_o56, TEX_PANNER_0) + EVT_THREAD + TEX_PAN_PARAMS_ID(TEX_PANNER_0) + TEX_PAN_PARAMS_STEP( 0, 0, 40, 900) + 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_CALL(SetModelCustomGfx, MODEL_o56, CUSTOM_GFX_0, FOG_MODE_UNCHANGED) + EVT_CALL(SetCustomGfx, CUSTOM_GFX_0, EVT_PTR(N(setup_gfx_candle_lights)), NULL) + EVT_EXEC(N(EVS_SetupMusic)) + EVT_CALL(UseDoorSounds, DOOR_SOUNDS_BASIC) + EVT_EXEC(N(EVS_EnterMap)) + EVT_WAIT(1) + EVT_RETURN + EVT_END +}; + +MAP_RODATA_PAD(1, exits); diff --git a/src/world/area_kkj/kkj_18/kkj_18_3_npc.c b/src/world/area_kkj/kkj_18/kkj_18_3_npc.c new file mode 100644 index 0000000000..ad11b8b793 --- /dev/null +++ b/src/world/area_kkj/kkj_18/kkj_18_3_npc.c @@ -0,0 +1,153 @@ +#include "kkj_18.h" + +#include "world/common/npc/GourmetGuy.inc.c" +#include "world/common/npc/Dummy.inc.c" + +#include "world/common/enemy/Kammy.inc.c" +#include "world/common/enemy/Koopatrol_Stationary.inc.c" + +EvtScript N(EVS_NpcIdle_GourmetGuy) = { + EVT_CALL(WaitForPlayerInputEnabled) + EVT_EXEC(N(EVS_ManageGourmetGuyScenes)) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInteract_GourmetGuy_Excited) = { + EVT_CALL(SpeakToPlayer, NPC_GourmetGuy, ANIM_GourmetGuy_Talk, ANIM_GourmetGuy_Idle, 0, MSG_Peach_00A1) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInteract_GourmetGuy_Scold) = { + EVT_CALL(SpeakToPlayer, NPC_GourmetGuy, ANIM_GourmetGuy_Talk, ANIM_GourmetGuy_Idle, 0, MSG_Peach_00A6) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_GourmetGuy) = { + EVT_CALL(EnableGroup, MODEL_g12, FALSE) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_g15, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(SetNpcPos, NPC_SELF, 120, 0, -20) + EVT_CALL(SetNpcYaw, NPC_SELF, 270) + EVT_IF_EQ(AF_KKJ_FinishedBakingCake, FALSE) + EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(EVS_NpcInteract_GourmetGuy_Excited))) + EVT_ELSE + EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(EVS_NpcInteract_GourmetGuy_Scold))) + EVT_END_IF + EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(EVS_NpcIdle_GourmetGuy))) + EVT_CALL(SetNpcAnimation, NPC_GourmetGuy_Knife, ANIM_GourmetGuy_Knife) + EVT_CALL(SetNpcFlagBits, NPC_GourmetGuy_Knife, NPC_FLAG_2, TRUE) + EVT_CALL(EnableNpcShadow, NPC_GourmetGuy_Knife, FALSE) + EVT_CALL(SetNpcPos, NPC_GourmetGuy_Knife, 60, 40, -15) + EVT_CALL(SetNpcYaw, NPC_GourmetGuy_Knife, 270) + EVT_CALL(SetNpcAnimation, NPC_GourmetGuy_Fork, ANIM_GourmetGuy_Fork) + EVT_CALL(SetNpcFlagBits, NPC_GourmetGuy_Fork, NPC_FLAG_2, TRUE) + EVT_CALL(EnableNpcShadow, NPC_GourmetGuy_Fork, FALSE) + EVT_CALL(SetNpcPos, NPC_GourmetGuy_Fork, 125, 40, -15) + EVT_CALL(SetNpcYaw, NPC_GourmetGuy_Fork, 270) + EVT_RETURN + EVT_END +}; + +AnimID N(ExtraAnims_GourmetGuy)[] = { + ANIM_GourmetGuy_Idle, + ANIM_GourmetGuy_Walk, + ANIM_GourmetGuy_Panic, + ANIM_GourmetGuy_Talk, + ANIM_GourmetGuy_Eat, + ANIM_GourmetGuy_SpitOut, + ANIM_GourmetGuy_Surprise, + ANIM_GourmetGuy_TalkSurprise, + ANIM_GourmetGuy_Leap, + ANIM_GourmetGuy_Inspect, + ANIM_GourmetGuy_Knife, + ANIM_GourmetGuy_Fork, + ANIM_LIST_END +}; + +AnimID N(ExtraAnims_Kammy)[] = { + ANIM_WorldKammy_Anim01, + ANIM_WorldKammy_Anim02, + ANIM_WorldKammy_Anim04, + ANIM_WorldKammy_Anim05, + ANIM_LIST_END +}; + +AnimID N(ExtraAnims_Koopatrol)[] = { + ANIM_WorldKoopatrol_Anim01, + ANIM_WorldKoopatrol_Anim06, + ANIM_WorldKoopatrol_Anim08, + ANIM_WorldKoopatrol_Anim12, + ANIM_WorldKoopatrol_Anim14, + ANIM_LIST_END +}; + +NpcData N(NpcData_Characters)[] = { + { + .id = NPC_Kammy, + .pos = { 0.0f, -500.0f, 0.0f }, + .yaw = 270, + .settings = &N(NpcSettings_Kammy), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = NO_DROPS, + .animations = KAMMY_ANIMS, + .extraAnimations = N(ExtraAnims_Kammy), + }, + { + .id = NPC_Koopatrol_01, + .pos = { 0.0f, -500.0f, 0.0f }, + .yaw = 0, + .settings = &N(NpcSettings_Koopatrol_Stationary), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = NO_DROPS, + .animations = KOOPATROL_ANIMS, + .extraAnimations = N(ExtraAnims_Koopatrol), + }, + { + .id = NPC_Koopatrol_02, + .pos = { 0.0f, -500.0f, 0.0f }, + .yaw = 0, + .settings = &N(NpcSettings_Koopatrol_Stationary), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = NO_DROPS, + .animations = KOOPATROL_ANIMS, + .extraAnimations = N(ExtraAnims_Koopatrol), + }, + { + .id = NPC_GourmetGuy, + .pos = { -250.0f, 10.0f, 85.0f }, + .yaw = 90, + .init = &N(EVS_NpcInit_GourmetGuy), + .settings = &N(NpcSettings_GourmetGuy), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = NO_DROPS, + .animations = GOURMET_GUY_ANIMS, + .extraAnimations = N(ExtraAnims_GourmetGuy), + }, + { + .id = NPC_GourmetGuy_Knife, + .pos = { -250.0f, 10.0f, 85.0f }, + .yaw = 90, + .settings = &N(NpcSettings_Dummy), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = NO_DROPS, + .animations = GOURMET_GUY_ANIMS, + .extraAnimations = N(ExtraAnims_GourmetGuy), + }, + { + .id = NPC_GourmetGuy_Fork, + .pos = { -250.0f, 10.0f, 85.0f }, + .yaw = 90, + .settings = &N(NpcSettings_Dummy), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = NO_DROPS, + .animations = GOURMET_GUY_ANIMS, + .extraAnimations = N(ExtraAnims_GourmetGuy), + }, +}; + +NpcGroupList N(DefaultNPCs) = { + NPC_GROUP(N(NpcData_Characters)), + {} +}; diff --git a/src/world/area_kkj/kkj_18/kkj_18_4_gourmet.c b/src/world/area_kkj/kkj_18/kkj_18_4_gourmet.c new file mode 100644 index 0000000000..151b21513d --- /dev/null +++ b/src/world/area_kkj/kkj_18/kkj_18_4_gourmet.c @@ -0,0 +1,661 @@ +#include "kkj_18.h" + +#include "world/common/complete/KeyItemChoice.inc.c" +MAP_STATIC_PAD(1,item_choice); +#include "world/common/complete/NormalItemChoice.inc.c" + +API_CALLABLE(N(SetHeldBakingItem)) { + Bytecode* args = script->ptrReadPos; + + // bizarre use of evt_get_float_variable here + gPlayerStatus.peachItemHeld = evt_get_float_variable(script, *args++); + gGameStatusPtr->peachBakingIngredient = gPlayerStatus.peachItemHeld; + + return ApiStatus_DONE2; +} + +API_CALLABLE(N(SpinCameraAround)) { + Camera* camera = &gCameras[CAM_DEFAULT]; + + if (isInitialCall) { + camera->flags |= CAMERA_FLAG_SHAKING; + script->functionTempF[0] = 0.0f; + } + + script->functionTempF[0] += 10.0f; + guRotateF(camera->viewMtxShaking, script->functionTempF[0], 0.0f, 0.0f, -1.0f); + + if (script->functionTempF[0] >= 360.0) { + return ApiStatus_DONE2; + } else { + return ApiStatus_BLOCK; + } +} + +Vec3f N(TwinkDepartPath)[] = { + { -23.0, 30.0, 36.0 }, + { 16.0, 62.0, -10.0 }, + { 64.0, 55.0, 5.0 }, + { 112.0, 46.0, 20.0 }, + { 160.0, 60.0, -25.0 }, +}; + +EvtScript N(EVS_ApproachPeach) = { + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_ADD(LVar0, 16) + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_CALL(SetNpcVar, NPC_Koopatrol_01, 0, 1) + EVT_THREAD + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_SUB(LVar0, 26) + EVT_ADD(LVar2, 2) + EVT_CALL(SetNpcAnimation, NPC_Koopatrol_01, ANIM_WorldKoopatrol_Anim06) + EVT_CALL(SetNpcSpeed, NPC_Koopatrol_01, EVT_FLOAT(5.0)) + EVT_WAIT(10) + EVT_CALL(NpcMoveTo, NPC_Koopatrol_01, -130, -30, 0) + EVT_CALL(NpcMoveTo, NPC_Koopatrol_01, -130, 30, 0) + EVT_CALL(NpcMoveTo, NPC_Koopatrol_01, LVar0, LVar2, 0) + EVT_CALL(SetNpcAnimation, NPC_Koopatrol_01, ANIM_WorldKoopatrol_Anim01) + EVT_CALL(NpcFacePlayer, NPC_Koopatrol_01, 5) + EVT_CALL(SetNpcVar, NPC_Koopatrol_01, 0, 0) + EVT_END_THREAD + EVT_THREAD + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_ADD(LVar0, 26) + EVT_SUB(LVar2, 2) + EVT_CALL(SetNpcAnimation, NPC_Koopatrol_02, ANIM_WorldKoopatrol_Anim06) + EVT_CALL(SetNpcSpeed, NPC_Koopatrol_02, EVT_FLOAT(5.0)) + EVT_CALL(NpcMoveTo, NPC_Koopatrol_02, -130, -30, 0) + EVT_CALL(NpcMoveTo, NPC_Koopatrol_02, -130, 30, 0) + EVT_CALL(NpcMoveTo, NPC_Koopatrol_02, -100, 30, 0) + EVT_CALL(NpcMoveTo, NPC_Koopatrol_02, LVar0, LVar2, 0) + EVT_CALL(SetNpcAnimation, NPC_Koopatrol_02, ANIM_WorldKoopatrol_Anim01) + EVT_CALL(NpcFacePlayer, NPC_Koopatrol_02, 5) + EVT_END_THREAD + EVT_CALL(InterpPlayerYaw, 270, 0) + EVT_LOOP(0) + EVT_WAIT(1) + EVT_CALL(GetNpcVar, NPC_Koopatrol_01, 0, LVar0) + EVT_IF_EQ(LVar0, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_WAIT(10) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_PickUpPeach) = { + EVT_THREAD + EVT_CALL(GetNpcPos, NPC_Koopatrol_01, LVar0, LVar1, LVar2) + EVT_ADD(LVar0, 5) + EVT_CALL(NpcMoveTo, NPC_Koopatrol_01, LVar0, LVar2, 5) + EVT_CALL(SetNpcAnimation, NPC_Koopatrol_01, ANIM_WorldKoopatrol_Anim12) + EVT_ADD(LVar0, 5) + EVT_CALL(NpcMoveTo, NPC_Koopatrol_01, LVar0, LVar2, 5) + EVT_END_THREAD + EVT_THREAD + EVT_CALL(GetNpcPos, NPC_Koopatrol_02, LVar0, LVar1, LVar2) + EVT_SUB(LVar0, 5) + EVT_CALL(NpcMoveTo, NPC_Koopatrol_02, LVar0, LVar2, 5) + EVT_CALL(SetNpcAnimation, NPC_Koopatrol_02, ANIM_WorldKoopatrol_Anim12) + EVT_SUB(LVar0, 5) + EVT_CALL(NpcMoveTo, NPC_Koopatrol_02, LVar0, LVar2, 5) + EVT_END_THREAD + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0005) + EVT_WAIT(1) + EVT_LOOP(4) + EVT_ADD(LVar1, 2) + EVT_CALL(SetPlayerPos, LVar0, LVar1, LVar2) + EVT_WAIT(1) + EVT_END_LOOP + EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0018) + EVT_ADD(LVar0, 10) + EVT_LOOP(5) + EVT_ADD(LVar1, 4) + EVT_CALL(SetPlayerPos, LVar0, LVar1, LVar2) + EVT_WAIT(1) + EVT_END_LOOP + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_CarryPeachAway) = { + EVT_CALL(InterpNpcYaw, NPC_Koopatrol_01, 270, 3) + EVT_WAIT(10) + EVT_THREAD + EVT_LOOP(0) + EVT_CALL(GetNpcPos, NPC_Koopatrol_01, LVar0, LVar1, LVar2) + EVT_ADD(LVar0, 22) + EVT_SUB(LVar2, 2) + EVT_CALL(SetPlayerPos, LVar0, 30, LVar2) + EVT_WAIT(1) + EVT_END_LOOP + EVT_END_THREAD + EVT_CALL(SetNpcVar, NPC_Koopatrol_01, 0, 1) + EVT_THREAD + EVT_CALL(SetNpcAnimation, NPC_Koopatrol_01, ANIM_WorldKoopatrol_Anim14) + EVT_CALL(SetNpcSpeed, NPC_Koopatrol_01, EVT_FLOAT(5.0)) + EVT_CALL(NpcMoveTo, NPC_Koopatrol_01, -136, 32, 0) + EVT_CALL(NpcMoveTo, NPC_Koopatrol_01, -136, -28, 0) + EVT_CALL(NpcMoveTo, NPC_Koopatrol_01, -266, -28, 0) + EVT_CALL(SetNpcVar, NPC_Koopatrol_01, 0, 0) + EVT_END_THREAD + EVT_THREAD + EVT_CALL(SetNpcAnimation, NPC_Koopatrol_02, ANIM_WorldKoopatrol_Anim14) + EVT_CALL(SetNpcSpeed, NPC_Koopatrol_02, EVT_FLOAT(5.0)) + EVT_CALL(NpcMoveTo, NPC_Koopatrol_02, -104, 28, 0) + EVT_CALL(NpcMoveTo, NPC_Koopatrol_02, -104, -32, 0) + EVT_CALL(NpcMoveTo, NPC_Koopatrol_02, -234, -32, 0) + EVT_END_THREAD + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(90.0)) + EVT_LOOP(0) + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar0, 0, LVar2) + EVT_CALL(GetNpcVar, NPC_Koopatrol_01, 0, LVar0) + EVT_WAIT(1) + EVT_IF_EQ(LVar0, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_OpenAndCloseWindow) = { + EVT_CALL(PlaySoundAt, SOUND_1CB, 0, 190, 78, -20) + EVT_CALL(MakeLerp, 0, 80, 14, EASING_QUADRATIC_OUT) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_CALL(RotateGroup, MODEL_g15, LVar0, 0, -1, 0) + EVT_CALL(RotateGroup, MODEL_g16, LVar0, 0, 1, 0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_WAIT(20) + EVT_CALL(MakeLerp, 80, 0, 14, EASING_QUADRATIC_OUT) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_CALL(RotateGroup, MODEL_g15, LVar0, 0, -1, 0) + EVT_CALL(RotateGroup, MODEL_g16, LVar0, 0, 1, 0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_CALL(PlaySoundAt, SOUND_1CC, 0, 190, 78, -20) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_DropFork) = { + 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, -8, 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_Fork, 0, 0, LVar3) + EVT_WAIT(1) + EVT_END_LOOP + EVT_ADD(LVar2, 20) + EVT_CALL(SetNpcJumpscale, NPC_GourmetGuy_Fork, EVT_FLOAT(0.2)) + EVT_CALL(NpcJump0, NPC_GourmetGuy_Fork, LVar0, -20, LVar2, 8) + EVT_WAIT(10) + EVT_CALL(RemoveNpc, NPC_GourmetGuy_Fork) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_DropKnife) = { + EVT_CALL(SetNpcFlagBits, NPC_GourmetGuy_Knife, NPC_FLAG_2, FALSE) + EVT_CALL(GetNpcPos, NPC_GourmetGuy_Knife, LVar0, LVar1, LVar2) + EVT_CALL(SetNpcRotation, NPC_GourmetGuy_Knife, 0, 0, -25) + EVT_CALL(SetNpcJumpscale, NPC_GourmetGuy_Knife, EVT_FLOAT(0.05)) + EVT_CALL(NpcJump0, NPC_GourmetGuy_Knife, LVar0, -8, 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_Knife, 0, 0, LVar3) + EVT_WAIT(1) + EVT_END_LOOP + EVT_ADD(LVar2, 20) + EVT_CALL(SetNpcJumpscale, NPC_GourmetGuy_Knife, EVT_FLOAT(0.2)) + EVT_CALL(NpcJump0, NPC_GourmetGuy_Knife, LVar0, -20, LVar2, -100) + EVT_WAIT(10) + EVT_CALL(RemoveNpc, NPC_GourmetGuy_Knife) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_GourmetGuy_LovesCake) = { + EVT_THREAD + EVT_CALL(ShowMessageAtScreenPos, MSG_Peach_00AB, 160, 40) + EVT_END_THREAD + EVT_EXEC(N(EVS_DropFork)) + EVT_EXEC(N(EVS_DropKnife)) + EVT_CALL(SetNpcAnimation, NPC_GourmetGuy, ANIM_GourmetGuy_Surprise) + EVT_WAIT(1) + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, 90, 65, 10) + EVT_CALL(SetPanTarget, CAM_DEFAULT, 90, 65, 10) + EVT_CALL(SetCamDistance, CAM_DEFAULT, 170) + EVT_CALL(SetCamPitch, CAM_DEFAULT, 12, EVT_FLOAT(-2.5)) + EVT_CALL(SetCamPosB, CAM_DEFAULT, EVT_FLOAT(110.0), EVT_FLOAT(45.5)) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(20.0)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_CALL(PlaySoundAtNpc, NPC_GourmetGuy, SOUND_381, 0) + EVT_WAIT(33) + EVT_CALL(SetCamDistance, CAM_DEFAULT, EVT_FLOAT(65.0)) + EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(7.5), EVT_FLOAT(-1.3)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_CALL(PlaySoundAtNpc, NPC_GourmetGuy, SOUND_382, 0) + EVT_WAIT(33) + EVT_CALL(SetCamDistance, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(3.5), 0) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_CALL(PlaySoundAtNpc, NPC_GourmetGuy, SOUND_383, 0) + EVT_WAIT(18) + EVT_CALL(SetMusicTrack, 0, SONG_GOURMET_GUY_FREAKOUT, 0, 8) + EVT_WAIT(30) + EVT_CALL(SetMotionBlurParams, 0, 0, 0, 320, 240, 128, 10) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(12.0)) + EVT_LOOP(7) + EVT_CALL(SetCamDistance, CAM_DEFAULT, 65) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_CALL(SetCamDistance, CAM_DEFAULT, 1) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_END_LOOP + EVT_CALL(N(SpinCameraAround)) + EVT_CALL(N(SpinCameraAround)) + EVT_CALL(N(SpinCameraAround)) + EVT_CALL(SetMotionBlurParams, 0, 0, 0, 320, 240, 0, 10) + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, 120, 0, 10) + EVT_CALL(SetPanTarget, CAM_DEFAULT, 120, 0, 10) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(90.0)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_GourmetGuy_RunAround) = { + EVT_CALL(PlaySoundAtNpc, NPC_GourmetGuy, SOUND_384, 0) + EVT_CALL(SetNpcAnimation, NPC_GourmetGuy, ANIM_GourmetGuy_Leap) + EVT_CALL(SetNpcJumpscale, NPC_GourmetGuy, EVT_FLOAT(0.001953125)) + EVT_CALL(GetNpcPos, NPC_GourmetGuy, LVar0, LVar1, LVar2) + EVT_CALL(NpcJump0, NPC_GourmetGuy, LVar0, 200, LVar2, 15) + EVT_CALL(SetNpcAnimation, NPC_GourmetGuy, ANIM_GourmetGuy_Panic) + EVT_CALL(SetNpcFlagBits, NPC_GourmetGuy, NPC_FLAG_100, TRUE) + EVT_CALL(SetNpcSpeed, NPC_GourmetGuy, EVT_FLOAT(20.0)) + EVT_CALL(PlaySoundAtNpc, NPC_GourmetGuy, SOUND_384, 0) + EVT_CALL(SetNpcRotation, NPC_GourmetGuy, 0, 0, -45) + EVT_CALL(SetNpcYaw, NPC_GourmetGuy, 90) + EVT_CALL(MakeLerp, 0, 100, 30, EASING_LINEAR) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_SETF(LVar2, EVT_FLOAT(3.3)) + EVT_SETF(LVar3, EVT_FLOAT(-2.3)) + EVT_MULF(LVar2, LVar0) + EVT_MULF(LVar3, LVar0) + EVT_ADDF(LVar2, EVT_FLOAT(-100.0)) + EVT_ADDF(LVar3, EVT_FLOAT(150.0)) + EVT_SETF(LVar4, EVT_FLOAT(100.0)) + EVT_CALL(SetNpcPos, NPC_GourmetGuy, LVar2, LVar3, LVar4) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_WAIT(20) + EVT_CALL(SetNpcRotation, NPC_GourmetGuy, 0, 0, 0) + EVT_CALL(PlaySoundAtNpc, NPC_GourmetGuy, SOUND_384, 0) + EVT_CALL(SetNpcFlagBits, NPC_GourmetGuy, NPC_FLAG_UPSIDE_DOWN, TRUE) + EVT_CALL(SetNpcYaw, NPC_GourmetGuy, 270) + EVT_CALL(SetNpcPos, NPC_GourmetGuy, 250, 160, 50) + EVT_CALL(NpcMoveTo, NPC_GourmetGuy, -100, 50, 0) + EVT_CALL(SetNpcFlagBits, NPC_GourmetGuy, NPC_FLAG_UPSIDE_DOWN, FALSE) + EVT_WAIT(20) + EVT_CALL(PlaySoundAtNpc, NPC_GourmetGuy, SOUND_384, 0) + EVT_CALL(SetNpcYaw, NPC_GourmetGuy, 90) + EVT_CALL(SetNpcPos, NPC_GourmetGuy, -100, 0, 70) + EVT_CALL(NpcMoveTo, NPC_GourmetGuy, 140, 70, 0) + EVT_WAIT(20) + EVT_CALL(SetNpcVar, NPC_GourmetGuy, 0, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_RejectCake) = { + EVT_CALL(PlaySoundAtNpc, NPC_GourmetGuy, SOUND_2096, 0) + EVT_CALL(SetNpcAnimation, NPC_GourmetGuy, ANIM_GourmetGuy_SpitOut) + EVT_CALL(MakeItemEntity, MV_CakeItemIdx, 105, 30, 20, ITEM_SPAWN_MODE_DECORATION, 0) + EVT_CALL(MakeLerp, 0, 100, 4, EASING_LINEAR) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_SETF(LVar2, EVT_FLOAT(0.2)) + EVT_SETF(LVar3, EVT_FLOAT(-0.3)) + EVT_SETF(LVar4, EVT_FLOAT(0.5)) + EVT_MULF(LVar2, LVar0) + EVT_MULF(LVar3, LVar0) + EVT_MULF(LVar4, LVar0) + EVT_ADDF(LVar2, EVT_FLOAT(105.0)) + EVT_ADDF(LVar3, EVT_FLOAT(30.0)) + EVT_ADDF(LVar4, EVT_FLOAT(20.0)) + EVT_CALL(SetItemPos, LVarA, LVar2, LVar3, LVar4) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_CALL(MakeLerp, 0, 100, 4, EASING_LINEAR) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_SETF(LVar2, EVT_FLOAT(0.2)) + EVT_SETF(LVar3, EVT_FLOAT(0.3)) + EVT_SETF(LVar4, EVT_FLOAT(0.5)) + EVT_MULF(LVar2, LVar0) + EVT_MULF(LVar3, LVar0) + EVT_MULF(LVar4, LVar0) + EVT_ADDF(LVar2, EVT_FLOAT(125.0)) + EVT_ADDF(LVar3, EVT_FLOAT(0.0)) + EVT_ADDF(LVar4, EVT_FLOAT(70.0)) + EVT_CALL(SetItemPos, LVarA, LVar2, LVar3, LVar4) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_CALL(RemoveItemEntity, LVarA) + EVT_CALL(SetNpcAnimation, NPC_GourmetGuy, ANIM_GourmetGuy_Idle) + EVT_CALL(SpeakToPlayer, NPC_GourmetGuy, ANIM_GourmetGuy_Talk, ANIM_GourmetGuy_Idle, 5, MSG_Peach_00A5) + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, 120, 0, 10) + EVT_CALL(SetPanTarget, CAM_DEFAULT, 120, 0, 10) + 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_SWITCH(AB_KKJ_CompletedBakeStep) + EVT_CASE_EQ(CAKE_TYPE_BAKED) + EVT_CALL(SpeakToPlayer, NPC_GourmetGuy, ANIM_GourmetGuy_Talk, ANIM_GourmetGuy_Idle, 5, MSG_Peach_00AA) + EVT_CASE_EQ(CAKE_TYPE_READY_TO_BAKE) + EVT_CALL(SpeakToPlayer, NPC_GourmetGuy, ANIM_GourmetGuy_Talk, ANIM_GourmetGuy_Idle, 5, MSG_Peach_00A9) + EVT_CASE_EQ(CAKE_TYPE_READY_TO_MIX) + EVT_CALL(SpeakToPlayer, NPC_GourmetGuy, ANIM_GourmetGuy_Talk, ANIM_GourmetGuy_Idle, 5, MSG_Peach_00A8) + EVT_CASE_OR_EQ(CAKE_TYPE_BEGUN) + EVT_CASE_OR_EQ(CAKE_TYPE_MIXED) + EVT_CALL(SpeakToPlayer, NPC_GourmetGuy, ANIM_GourmetGuy_Talk, ANIM_GourmetGuy_Idle, 5, MSG_Peach_00A7) + EVT_END_CASE_GROUP + EVT_END_SWITCH + EVT_CALL(SetNpcAnimation, NPC_GourmetGuy, ANIM_GourmetGuy_Walk) + EVT_CALL(SetNpcJumpscale, NPC_GourmetGuy, 0) + EVT_CALL(NpcJump1, NPC_GourmetGuy, 120, 0, -20, 15) + EVT_CALL(SetNpcAnimation, NPC_GourmetGuy, ANIM_GourmetGuy_Idle) + EVT_CALL(ResetCam, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_SweatyPeach) = { + EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0005) + EVT_WAIT(10) + EVT_CALL(InterpPlayerYaw, 90, 5) + EVT_CALL(SetPlayerAnimation, ANIM_Peach_A0001) + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_ADD(LVar1, 35) + EVT_LOOP(0) + EVT_CALL(ShowSweat, 0, 1, -45, EMOTER_POS, LVar0, LVar1, LVar2, 13, 20) + EVT_WAIT(20) + EVT_END_LOOP + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Scene_GiveKitchenKey) = { + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(SpeakToPlayer, NPC_GourmetGuy, ANIM_GourmetGuy_Talk, ANIM_GourmetGuy_Idle, 0, MSG_Peach_009A) + EVT_WAIT(10) + EVT_CALL(SetPlayerSpeed, EVT_FLOAT(4.0)) + EVT_CALL(PlayerMoveTo, -125, 40, 0) + EVT_CALL(PlayerMoveTo, 50, 40, 0) + EVT_WAIT(10) + EVT_CALL(SpeakToPlayer, NPC_PLAYER, ANIM_Peach_D0004, ANIM_Peach_A0001, 5, MSG_Peach_009B) + EVT_CALL(AdjustCam, CAM_DEFAULT, EVT_FLOAT(4.0), 35, 300, EVT_FLOAT(17.0), EVT_FLOAT(-11.0)) + EVT_CALL(SpeakToPlayer, NPC_GourmetGuy, ANIM_GourmetGuy_Talk, ANIM_GourmetGuy_Idle, 5, MSG_Peach_009C) + EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0000) + EVT_WAIT(10) + EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0026) + EVT_CALL(SpeakToPlayer, NPC_PLAYER, ANIM_Peach_C0001, ANIM_Peach_C0026, 5, MSG_Peach_009D) + EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0002) + EVT_WAIT(10) + EVT_CALL(SetPlayerAnimation, ANIM_Peach_A0001) + EVT_CALL(SpeakToPlayer, NPC_GourmetGuy, ANIM_GourmetGuy_Talk, ANIM_GourmetGuy_Idle, 5, MSG_Peach_009E) + EVT_CALL(SetNpcAnimation, NPC_GourmetGuy, ANIM_GourmetGuy_Walk) + EVT_CALL(NpcMoveTo, NPC_GourmetGuy, 100, -20, 10) + EVT_CALL(SetNpcAnimation, NPC_GourmetGuy, ANIM_GourmetGuy_Idle) + EVT_CALL(SpeakToPlayer, NPC_GourmetGuy, ANIM_GourmetGuy_Talk, ANIM_GourmetGuy_Idle, 5, MSG_Peach_009F) + EVT_CALL(SetNpcAnimation, NPC_GourmetGuy, ANIM_GourmetGuy_Inspect) + EVT_WAIT(30) + EVT_SET(LVar0, ITEM_PEACH_KEY1) + EVT_CALL(ShowGotItem, LVar0, TRUE, 0) + EVT_CALL(AddKeyItem, LVar0) + EVT_SET(GF_KKJ18_GourmetGuy_GaveKey, TRUE) + EVT_CALL(SetNpcAnimation, NPC_GourmetGuy, ANIM_GourmetGuy_Walk) + EVT_CALL(SetNpcJumpscale, NPC_GourmetGuy, 0) + EVT_CALL(NpcJump1, NPC_GourmetGuy, 120, 0, -20, 10) + EVT_CALL(SetNpcAnimation, NPC_GourmetGuy, ANIM_GourmetGuy_Idle) + EVT_CALL(SpeakToPlayer, NPC_GourmetGuy, ANIM_GourmetGuy_Talk, ANIM_GourmetGuy_Idle, 5, MSG_Peach_00A0) + EVT_CALL(ResetCam, CAM_DEFAULT, EVT_FLOAT(4.0)) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Scene_JudgeCake) = { + EVT_CALL(DisablePlayerInput, TRUE) + EVT_IF_EQ(AB_KKJ19_AddedBerries, FALSE) + EVT_SET(MV_CakeItemIdx, ITEM_CAKE_WITH_ICING) + EVT_SET(LVar0, ANIM_Peach_D0002) + EVT_SET(LVar1, ANIM_Peach_A0027) + EVT_ELSE + EVT_IF_EQ(AB_KKJ19_AddedIcing, FALSE) + EVT_SET(MV_CakeItemIdx, ITEM_CAKE_WITH_BERRIES) + EVT_SET(LVar0, ANIM_Peach_D0003) + EVT_SET(LVar1, ANIM_Peach_A0029) + EVT_ELSE + EVT_SET(MV_CakeItemIdx, ITEM_CAKE_DONE) + EVT_SET(LVar0, ANIM_Peach_D0000) + EVT_SET(LVar1, ANIM_Peach_A0017) + EVT_END_IF + EVT_END_IF + EVT_CALL(SpeakToPlayer, NPC_PLAYER, LVar0, LVar1, 5, MSG_Peach_00A2) + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, 120, 0, 10) + EVT_CALL(SetPanTarget, CAM_DEFAULT, 120, 0, 10) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_CALL(SpeakToPlayer, NPC_GourmetGuy, ANIM_GourmetGuy_Talk, ANIM_GourmetGuy_Idle, 5, MSG_Peach_00A3) + EVT_CALL(ResetCam, CAM_DEFAULT, EVT_FLOAT(90.0)) + EVT_CALL(SetPlayerSpeed, EVT_FLOAT(2.0)) + EVT_CALL(PlayerMoveTo, -125, 40, 0) + EVT_CALL(PlayerMoveTo, 15, 40, 0) + EVT_WAIT(10) + EVT_CALL(MakeItemEntity, MV_CakeItemIdx, 25, 25, -20, ITEM_SPAWN_MODE_DECORATION, 0) + EVT_CALL(SetNpcVar, NPC_GourmetGuy, 7, LVar0) + EVT_SET(AF_KKJ_FinishedBakingCake, FALSE) + EVT_CALL(N(SetHeldBakingItem), PEACH_BAKING_NONE) + EVT_THREAD + EVT_CALL(DisablePartnerAI, 0) + EVT_CALL(NpcFlyTo, NPC_PARTNER, -23, 30, 36, 5, 0, EASING_LINEAR) + EVT_CALL(InterpNpcYaw, NPC_PARTNER, 90, 5) + EVT_END_THREAD + EVT_CALL(PlayerMoveTo, 17, 36, 5) + EVT_CALL(InterpPlayerYaw, 90, 5) + EVT_CALL(SpeakToPlayer, NPC_GourmetGuy, ANIM_GourmetGuy_Talk, ANIM_GourmetGuy_Idle, 5, MSG_Peach_00A4) + EVT_CALL(SetNpcAnimation, NPC_GourmetGuy, ANIM_GourmetGuy_Walk) + EVT_CALL(NpcMoveTo, NPC_GourmetGuy, 90, -20, 20) + EVT_CALL(SetNpcAnimation, NPC_GourmetGuy, ANIM_GourmetGuy_Idle) + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, 90, 0, 10) + EVT_CALL(SetPanTarget, CAM_DEFAULT, 90, 0, 10) + EVT_CALL(SetCamDistance, CAM_DEFAULT, 250) + EVT_CALL(SetCamPitch, CAM_DEFAULT, 17, -14) + EVT_CALL(SetCamPosB, CAM_DEFAULT, EVT_FLOAT(110.0), EVT_FLOAT(45.5)) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(3.0)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_CALL(GetNpcVar, NPC_GourmetGuy, 7, LVarA) + EVT_CALL(RemoveItemEntity, LVarA) + EVT_CALL(SetNpcAnimation, NPC_GourmetGuy, ANIM_GourmetGuy_Eat) + EVT_LOOP(6) + EVT_WAIT(10) + EVT_CALL(PlaySoundAtNpc, NPC_GourmetGuy, SOUND_2095, 0) + EVT_END_LOOP + EVT_IF_NE(AB_KKJ_CompletedBakeStep, CAKE_TYPE_DONE) + EVT_EXEC_WAIT(N(EVS_RejectCake)) + EVT_CALL(EnablePartnerAI) + EVT_CALL(DisablePlayerPhysics, FALSE) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_RETURN + EVT_END_IF + EVT_CALL(SetEnemyFlagBits, NPC_GourmetGuy, ENEMY_FLAG_8000000, 1) + EVT_EXEC_WAIT(N(EVS_GourmetGuy_LovesCake)) + EVT_CALL(SetNpcVar, NPC_GourmetGuy, 0, 1) + EVT_EXEC(N(EVS_GourmetGuy_RunAround)) + EVT_LOOP(0) + EVT_CALL(PlayerFaceNpc, NPC_GourmetGuy, FALSE) + EVT_CALL(NpcFaceNpc, NPC_PARTNER, NPC_GourmetGuy, 0) + EVT_WAIT(1) + EVT_CALL(GetNpcVar, NPC_GourmetGuy, 0, LVar0) + EVT_IF_EQ(LVar0, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_EXEC(N(EVS_SetupMusic)) + EVT_CALL(SetNpcAnimation, NPC_GourmetGuy, ANIM_GourmetGuy_Idle) + EVT_CALL(InterpNpcYaw, NPC_GourmetGuy, 270, 5) + EVT_CALL(SpeakToPlayer, NPC_GourmetGuy, ANIM_GourmetGuy_Talk, ANIM_GourmetGuy_Idle, 0, MSG_Peach_00AC) + EVT_CALL(SetNpcAnimation, NPC_GourmetGuy, ANIM_GourmetGuy_Walk) + EVT_CALL(SetNpcSpeed, NPC_GourmetGuy, EVT_FLOAT(2.0)) + EVT_CALL(NpcMoveTo, NPC_GourmetGuy, 80, 70, 0) + EVT_CALL(SetNpcAnimation, NPC_GourmetGuy, ANIM_GourmetGuy_Idle) + EVT_CALL(SpeakToPlayer, NPC_GourmetGuy, ANIM_GourmetGuy_Talk, ANIM_GourmetGuy_Idle, 0, MSG_Peach_00AD) + EVT_THREAD + EVT_LOOP(100) + EVT_CALL(PlayerFaceNpc, NPC_GourmetGuy, FALSE) + EVT_CALL(NpcFaceNpc, NPC_PARTNER, NPC_GourmetGuy, 0) + EVT_WAIT(1) + EVT_END_LOOP + EVT_END_THREAD + EVT_CALL(SetNpcAnimation, NPC_GourmetGuy, ANIM_GourmetGuy_Walk) + EVT_CALL(NpcMoveTo, NPC_GourmetGuy, -250, 70, 0) + EVT_CALL(AdjustCam, CAM_DEFAULT, EVT_FLOAT(2.0), -20, 300, EVT_FLOAT(17.0), EVT_FLOAT(-10.0)) + EVT_CALL(InterpPlayerYaw, 270, 5) + EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0000) + EVT_WAIT(10) + EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0026) + EVT_CALL(SpeakToPlayer, NPC_PLAYER, ANIM_Peach_C0001, ANIM_Peach_C0026, 5, MSG_Peach_00AE) + EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_Twink_Talk, ANIM_Twink_Idle, 0, MSG_Peach_00AF) + EVT_CALL(SpeakToPlayer, NPC_PLAYER, ANIM_Peach_C0001, ANIM_Peach_C0026, 5, MSG_Peach_00B0) + EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0002) + EVT_WAIT(10) + EVT_CALL(SetPlayerAnimation, ANIM_Peach_A0001) + EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_Twink_Talk, ANIM_Twink_Idle, 0, MSG_Peach_00B1) + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, 120, 0, 10) + EVT_CALL(SetPanTarget, CAM_DEFAULT, 150, 0, 10) + EVT_CALL(SetCamDistance, CAM_DEFAULT, 400) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(1.2)) + EVT_CALL(LoadPath, 60, EVT_PTR(N(TwinkDepartPath)), ARRAY_COUNT(N(TwinkDepartPath)), EASING_LINEAR) + EVT_LOOP(0) + EVT_CALL(GetNextPathPos) + EVT_CALL(SetNpcPos, NPC_PARTNER, LVar1, LVar2, LVar3) + EVT_WAIT(1) + EVT_IF_EQ(LVar0, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_IGNORE_WORLD_COLLISION, TRUE) + EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_Twink_Talk, ANIM_Twink_Idle, 16, MSG_Peach_00B2) + EVT_EXEC(N(EVS_OpenAndCloseWindow)) + EVT_WAIT(14) + EVT_CALL(NpcFlyTo, NPC_PARTNER, 250, 70, -25, 30, 0, EASING_LINEAR) + EVT_WAIT(30) + EVT_CALL(SetNpcPos, NPC_Koopatrol_01, -250, 0, -30) + EVT_CALL(SetNpcPos, NPC_Koopatrol_02, -250, 0, -30) + EVT_CALL(SetNpcPos, NPC_Kammy, -250, 0, -30) + EVT_CALL(SpeakToPlayer, NPC_Kammy, ANIM_WorldKammy_Anim04, ANIM_WorldKammy_Anim01, 0, MSG_Peach_00B3) + EVT_CALL(SetMusicTrack, 0, SONG_KAMMY_KOOPA_THEME, 0, 8) + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, -180, 0, -30) + EVT_CALL(SetPanTarget, CAM_DEFAULT, -180, 0, -30) + EVT_CALL(SetCamDistance, CAM_DEFAULT, EVT_FLOAT(300.0)) + EVT_CALL(SetCamPosA, CAM_DEFAULT, EVT_FLOAT(-110.0), EVT_FLOAT(45.5)) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(5.0)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_CALL(PlaySoundAtCollider, COLLIDER_ttw, SOUND_BASIC_DOOR_OPEN, 0) + EVT_CALL(MakeLerp, 0, -120, 14, EASING_QUADRATIC_OUT) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_CALL(RotateModel, MODEL_o9, LVar0, 0, 1, 0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_THREAD + EVT_WAIT(60) + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_ADD(LVar0, -30) + EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_CALL(SetCamDistance, CAM_DEFAULT, 400) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_END_THREAD + EVT_CALL(SetNpcAnimation, NPC_Kammy, ANIM_WorldKammy_Anim02) + EVT_CALL(SetNpcSpeed, NPC_Kammy, EVT_FLOAT(2.0)) + EVT_CALL(NpcMoveTo, NPC_Kammy, -130, -30, 0) + EVT_CALL(NpcMoveTo, NPC_Kammy, -120, 80, 0) + EVT_CALL(NpcMoveTo, NPC_Kammy, -70, 80, 0) + EVT_CALL(SetNpcAnimation, NPC_Kammy, ANIM_WorldKammy_Anim01) + EVT_EXEC_GET_TID(N(EVS_SweatyPeach), LVarA) + EVT_CALL(SpeakToPlayer, NPC_Kammy, ANIM_WorldKammy_Anim04, ANIM_WorldKammy_Anim01, 0, MSG_Peach_00B4) + EVT_CALL(EndSpeech, NPC_Kammy, ANIM_WorldKammy_Anim05, ANIM_WorldKammy_Anim05, 5) + EVT_CALL(SpeakToNpc, NPC_Kammy, ANIM_WorldKammy_Anim05, ANIM_WorldKammy_Anim01, 0, NPC_Koopatrol_01, MSG_Peach_00B5) + EVT_KILL_THREAD(LVarA) + EVT_CALL(DisablePlayerPhysics, TRUE) + EVT_EXEC_WAIT(N(EVS_ApproachPeach)) + EVT_EXEC_WAIT(N(EVS_PickUpPeach)) + EVT_CALL(SpeakToPlayer, NPC_PLAYER, ANIM_Peach_C0018, ANIM_Peach_C0018, 5, MSG_Peach_00B6) + EVT_THREAD + EVT_WAIT(30) + EVT_CALL(InterpNpcYaw, NPC_Kammy, 270, 5) + EVT_END_THREAD + EVT_EXEC_WAIT(N(EVS_CarryPeachAway)) + EVT_CALL(FadeOutMusic, 0, 1000) + EVT_EXEC_WAIT(N(EVS_EndPeachChapter4)) + EVT_CALL(EnablePartnerAI) + EVT_CALL(DisablePlayerPhysics, FALSE) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_ManageGourmetGuyScenes) = { + EVT_CALL(SetCamLeadPlayer, CAM_DEFAULT, FALSE) + EVT_IF_EQ(GF_KKJ18_GourmetGuy_GaveKey, FALSE) + EVT_EXEC_WAIT(N(EVS_Scene_GiveKitchenKey)) + EVT_END_IF + EVT_IF_EQ(AF_KKJ_FinishedBakingCake, TRUE) + EVT_EXEC_WAIT(N(EVS_Scene_JudgeCake)) + EVT_END_IF + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_kkj/kkj_19/AF7950.c b/src/world/area_kkj/kkj_19/AF7950.c deleted file mode 100644 index e8bb7f82ce..0000000000 --- a/src/world/area_kkj/kkj_19/AF7950.c +++ /dev/null @@ -1,87 +0,0 @@ -#include "kkj_19.h" - -typedef struct { - /* 0x00 */ s32 itemID; - /* 0x04 */ s32 flagIndex; - /* 0x08 */ s32 overrideDescMsg; -} UnkKkj19; // size = 0x0C - -extern UnkKkj19 D_80240E10_AF8760[]; -extern s32 D_80240E88_AF87D8; -extern s32 D_80240E8C_AF87DC; -extern s32 D_80240E90_AF87E0; -extern EvtScript D_80240E94_AF87E4; -extern MenuWindowBP D_80240EF0_AF8840[2]; - -static char* N(exit_str_0) = "kkj_10"; -static char* N(exit_str_1) = "kkj_00"; - -NOP_FIX // TODO remove after D_80240E8C_AF87DC is migrated - -ApiStatus func_80240000_AF7950(Evt* script, s32 isInitialCall) { - Bytecode* args = script->ptrReadPos; - s32 var; - - D_80240E90_AF87E0 = evt_get_variable(script, *args++); - var = evt_get_variable(NULL, AreaFlag(18)); - - if (var == 1) { - D_80240E88_AF87D8 = var; - D_80240E8C_AF87DC = 5; - } else { - D_80240E88_AF87D8 = 0; - } - - return ApiStatus_DONE2; -} - -void func_80240068_AF79B8(void) { - if (D_80240E88_AF87D8 != 0) { - set_window_update(WINDOW_ID_10, (s32)basic_window_update); - set_window_update(WINDOW_ID_11, (s32)basic_window_update); - } else { - set_window_update(WINDOW_ID_10, (s32)basic_hidden_window_update); - set_window_update(WINDOW_ID_11, (s32)basic_hidden_window_update); - } - - if (D_80240E8C_AF87DC > 0) { - D_80240E8C_AF87DC--; - } else { - D_80240E88_AF87D8 = 0; - } -} - -void func_802400E4_AF7A34(s32 arg0, s32 x, s32 y) { - ItemData* item = &gItemTable[D_80240E10_AF8760[D_80240E90_AF87E0].itemID]; - s32 width = (get_msg_width(item->nameMsg, 0) >> 1) - 60; - - draw_msg(item->nameMsg, x - width, y + 6, 255, 0, 0); -} - -void func_80240178_AF7AC8(s32 arg0, s32 x, s32 y) { - UnkKkj19* temp_a3 = &D_80240E10_AF8760[D_80240E90_AF87E0]; - ItemData* item = &gItemTable[temp_a3->itemID]; - - if (temp_a3->overrideDescMsg != 0) { - draw_msg(temp_a3->overrideDescMsg, x + 8, y, 255, 10, 0); - } else { - draw_msg(item->shortDescMsg, x + 8, y, 255, 10, 0); - } -} - -ApiStatus func_802401FC_AF7B4C(Evt* script, s32 isInitialCall) { - s32 i; - - D_80240E88_AF87D8 = 0; - D_80240E8C_AF87DC = 0; - D_80240E90_AF87E0 = 0; - - get_worker(create_worker_frontUI(func_80240068_AF79B8, NULL)); - setup_pause_menu_tab(D_80240EF0_AF8840, ARRAY_COUNT(D_80240EF0_AF8840)); - - for (i = 0; i < 10; i++) { - bind_trigger_1(&D_80240E94_AF87E4, TRIGGER_FLOOR_TOUCH, D_80240E10_AF8760[i].flagIndex, i, 0, 3); - } - - return ApiStatus_DONE2; -} diff --git a/src/world/area_kkj/kkj_19/AF7C00.c b/src/world/area_kkj/kkj_19/AF7C00.c deleted file mode 100644 index ec34b19a4e..0000000000 --- a/src/world/area_kkj/kkj_19/AF7C00.c +++ /dev/null @@ -1,272 +0,0 @@ -#include "kkj_19.h" -#include "hud_element.h" -#include "battle/action_cmd.h" - -BSS s32 kkj_19_D_802461F0[114]; -BSS s32 D_802463B8_kkj_19[92]; -BSS s32 kkj_19_D_80246528; -BSS s32 D_8024652C; -BSS s32 D_80246530; -BSS s32 D_80246534; -BSS s32 D_80246538_kkj_19[6]; -BSS s32 D_80246550_kkj_19; -BSS s32 D_80246554; -BSS u32 D_80246558_kkj_19; -BSS s32 D_8024655C; -BSS s32 D_80246560_kkj_19; -BSS s32 D_80246564_kkj_19; // unused? -BSS s32 D_80246568_C8C018[4]; -BSS s32 D_80246578[10]; -BSS s32 D_802465A0; - -#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; -} - -ApiStatus func_80240568_AF7EB8(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++) { - kkj_19_D_802461F0[i] = ptr[i]; - } - kkj_19_D_802461F0[i] = 0; - } else { - for (i = 0; i < 112; i++) { - kkj_19_D_802461F0[i] = i + 16; - kkj_19_D_802461F0[112] = 0; - } - } - - return ApiStatus_DONE2; -} - -ApiStatus func_80240604_AF7F54(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++) { - D_802463B8_kkj_19[i] = ptr[i]; - } - D_802463B8_kkj_19[i] = 0; - } else { - for (i = 0; i < 91; i++) { - D_802463B8_kkj_19[i] = i + 128; - D_802463B8_kkj_19[91] = 0; - } - } - - return ApiStatus_DONE2; -} - -void func_802406A0_AF7FF0(void) { - hud_element_draw_clipped(D_80246568_C8C018[0]); -} - -ApiStatus func_802406C4_AF8014(Evt* script, s32 isInitialCall) { - Bytecode* args = script->ptrReadPos; - s32 hudElemID; - s32 temp; - s32 i; - - if (isInitialCall) { - D_80246558_kkj_19 = 0; - } - - switch (D_80246558_kkj_19) { - case 0: - D_80246534 = evt_get_variable(script, *args++); - D_80246554 = create_worker_frontUI(NULL, func_802406A0_AF7FF0); - kkj_19_D_80246528 = 0; - D_80246530 = 0; - for (i = 0; i < 10; i++) { - D_80246578[i] = 0; - } - D_80246538_kkj_19[1] = 12; - D_80246538_kkj_19[2] = 24; - D_80246538_kkj_19[3] = 36; - D_80246538_kkj_19[4] = 48; - D_80246538_kkj_19[5] = 60; - D_80246550_kkj_19 = 5; - D_802465A0 = 0; - D_80246538_kkj_19[0] = 0; - D_8024655C = -48; - D_80246560_kkj_19 = 64; - - hudElemID = hud_element_create(&HES_AButton); - D_80246568_C8C018[0] = hudElemID; - hud_element_set_render_pos(hudElemID, D_8024655C, D_80246560_kkj_19); - hud_element_set_render_depth(hudElemID, 0); - hud_element_set_flags(hudElemID, HUD_ELEMENT_FLAG_80 | HUD_ELEMENT_FLAG_DISABLED); - - hudElemID = hud_element_create(&HES_BlueMeter); - D_80246568_C8C018[1] = hudElemID; - hud_element_set_render_pos(hudElemID, D_8024655C, D_80246560_kkj_19 + 28); - hud_element_set_render_depth(hudElemID, 0); - hud_element_set_flags(hudElemID, HUD_ELEMENT_FLAG_80 | HUD_ELEMENT_FLAG_DISABLED); - - hudElemID = D_80246568_C8C018[0]; - hud_element_set_alpha(hudElemID, 255); - hud_element_clear_flags(hudElemID, HUD_ELEMENT_FLAG_DISABLED); - - hudElemID = D_80246568_C8C018[1]; - hud_element_set_alpha(hudElemID, 255); - hud_element_clear_flags(hudElemID, HUD_ELEMENT_FLAG_DISABLED); - - D_80246558_kkj_19 = 1; - script->functionTemp[0] = 10; - break; - case 1: - D_8024655C += 20; - if (D_8024655C > 50) { - D_8024655C = 50; - } - hud_element_set_render_pos(D_80246568_C8C018[0], D_8024655C, D_80246560_kkj_19); - hud_element_set_render_pos(D_80246568_C8C018[1], D_8024655C, D_80246560_kkj_19 + 28); - if (script->functionTemp[0] != 0) { - script->functionTemp[0]--; - } else { - D_80246558_kkj_19 = 10; - } - break; - case 10: - hud_element_set_script(D_80246568_C8C018[0], &HES_MashAButton); - kkj_19_D_80246528 = 0; - D_8024652C = 0; - D_80246558_kkj_19 = 11; - // fallthrough - case 11: - temp = D_80246538_kkj_19[D_80246550_kkj_19]; - if (gGameStatusPtr->pressedButtons[0] & BUTTON_A) { - kkj_19_D_80246528++; - } - if (kkj_19_D_80246528 > temp) { - kkj_19_D_80246528 = temp; - } - if (D_8024652C == 2) { - D_8024652C = 3; - } - for (i = 0; i < 10; i++) { - if (D_80246578[i] != 0) { - break; - } - } - if (i >= 10) { - D_8024652C = 2; - } else if (D_8024652C != 3) { - D_8024652C = 2; - } - D_80246534--; - if (D_80246534 == 0) { - D_80246534 = 5; - D_80246558_kkj_19 = 12; - } - break; - case 12: - if (D_80246534 != 0) { - D_80246534--; - break; - } - script->varTable[0] = kkj_19_D_80246528; - hud_element_free(D_80246568_C8C018[0]); - hud_element_free(D_80246568_C8C018[1]); - free_worker(D_80246554); - return ApiStatus_DONE2; - } - - D_80246578[D_802465A0++] = gGameStatusPtr->pressedButtons[0] & BUTTON_A; - - if (D_802465A0 >= 10) { - D_802465A0 = 0; - } - - evt_set_variable(script, AreaByte(3), D_8024652C); - return ApiStatus_BLOCK; -} - -static char* N(exit_str_0) = "kkj_18"; - -ApiStatus func_80240B4C_AF849C(Evt* script, s32 isInitialCall) { - if (isInitialCall) { - script->functionTemp[1] = 0; - } - - if (gGameStatusPtr->pressedButtons[0] & BUTTON_A) { - script->varTable[0] = script->functionTemp[1]; - return ApiStatus_DONE2; - } - - script->functionTemp[1]++; - return ApiStatus_BLOCK; -} - -ApiStatus func_80240B8C_AF84DC(Evt* script, s32 isInitialCall) { - Bytecode* args = script->ptrReadPos; - Bytecode var = *args++; - s32 itemID = evt_get_variable(script, var); - - evt_set_variable(script, var, gItemTable[itemID].nameMsg); - return ApiStatus_DONE2; -} - -#include "world/common/todo/GetFloorCollider.inc.c" - -ApiStatus func_80240C10_AF8560(Evt* script, s32 isInitialCall) { - Bytecode* args = script->ptrReadPos; - - gPlayerStatus.peachItemHeld = evt_get_variable(script, *args++); - gGameStatusPtr->peachCookingIngredient = gPlayerStatus.peachItemHeld; - - return ApiStatus_DONE2; -} - -ApiStatus func_80240C4C_AF859C(Evt* script, s32 isInitialCall) { - if (isInitialCall) { - script->functionTemp[1] = 0; - } - - script->functionTemp[1] += 16; - - if (script->functionTemp[1] > 255) { - script->functionTemp[1] = 255; - } - - set_screen_overlay_params_front(0, script->functionTemp[1]); - - if (script->functionTemp[1] == 255) { - return ApiStatus_DONE2; - } - - return ApiStatus_BLOCK; -} - -ApiStatus func_80240CB4_AF8604(Evt* script, s32 isInitialCall) { - if (isInitialCall) { - script->functionTemp[1] = 255; - } - - script->functionTemp[1] -= 16; - if (script->functionTemp[1] <= 0) { - script->functionTemp[1] = 0; - return ApiStatus_DONE2; - } - - set_screen_overlay_params_front(0, script->functionTemp[1]); - return ApiStatus_BLOCK; -} diff --git a/src/world/area_kkj/kkj_19/kkj_19.h b/src/world/area_kkj/kkj_19/kkj_19.h index 3daa5aebb7..095c488e85 100644 --- a/src/world/area_kkj/kkj_19/kkj_19.h +++ b/src/world/area_kkj/kkj_19/kkj_19.h @@ -2,8 +2,31 @@ /// @brief Peach's Castle - Kitchen (1F) #include "common.h" -#include "../kkj.h" #include "message_ids.h" #include "map.h" +#include "../kkj.h" +#include "mapfs/kkj_19_shape.h" +#include "mapfs/kkj_19_hit.h" + +#include "sprite/npc/TayceT.h" +#include "sprite/npc/Twink.h" + +enum { + // intro + NPC_TayceT = 0, + NPC_Toad = 1, + // peach + NPC_Twink = 0, // normally, you cant interact with your partner, so a dummy npc is created to allow it +}; + #define NAMESPACE kkj_19 + +extern EvtScript N(EVS_Main); +extern EvtScript N(EVS_SetupMusic); +extern EvtScript N(EVS_ManageBaking); + +extern NpcGroupList N(IntroNPCs); +extern NpcGroupList N(PeachNPCs); + +extern unsigned char ui_box_corners5_png[]; diff --git a/src/world/area_kkj/kkj_19/kkj_19_0_header.c b/src/world/area_kkj/kkj_19/kkj_19_0_header.c new file mode 100644 index 0000000000..89eec1ba94 --- /dev/null +++ b/src/world/area_kkj/kkj_19/kkj_19_0_header.c @@ -0,0 +1,12 @@ +#include "kkj_19.h" + +EntryList N(Entrances) = { + [kkj_19_ENTRY_0] { 485.0, 0.0, 25.0, 330.0 }, +}; + +MapSettings N(settings) = { + .main = &N(EVS_Main), + .entryList = &N(Entrances), + .entryCount = ENTRY_COUNT(N(Entrances)), + .tattle = { MSG_MapTattle_kkj_19 }, +}; diff --git a/src/world/area_kkj/kkj_19/kkj_19_1_music.c b/src/world/area_kkj/kkj_19/kkj_19_1_music.c new file mode 100644 index 0000000000..b33e42a23d --- /dev/null +++ b/src/world/area_kkj/kkj_19/kkj_19_1_music.c @@ -0,0 +1,16 @@ +#include "kkj_19.h" + +EvtScript N(EVS_SetupMusic) = { + EVT_IF_EQ(GB_StoryProgress, STORY_INTRO) + EVT_CALL(SetMusicTrack, 0, SONG_PEACHS_CASTLE_PARTY, 1, 7) + EVT_WAIT(3) + EVT_CALL(SetMusicTrack, 0, SONG_PEACHS_CASTLE_PARTY, 1, 6) + EVT_RETURN + EVT_END_IF + EVT_IF_EQ(GB_StoryProgress, STORY_CH4_BEGAN_PEACH_MISSION) + EVT_CALL(SetMusicTrack, 0, SONG_PEACH_MISSION, 0, 8) + EVT_RETURN + EVT_END_IF + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_kkj/kkj_19/kkj_19_2_main.c b/src/world/area_kkj/kkj_19/kkj_19_2_main.c new file mode 100644 index 0000000000..da4ea04ed1 --- /dev/null +++ b/src/world/area_kkj/kkj_19/kkj_19_2_main.c @@ -0,0 +1,220 @@ +#include "kkj_19.h" + +typedef struct IngredientSouce { + /* 0x00 */ s32 itemID; + /* 0x04 */ s32 colliderID; + /* 0x08 */ s32 overrideDescMsg; +} IngredientSouce; // size = 0x0C + +IngredientSouce N(IngredientSources)[] = { + { ITEM_BAKING_SUGAR, COLLIDER_o101, MSG_NONE }, + { ITEM_BAKING_SALT, COLLIDER_o102, MSG_NONE }, + { ITEM_BAKING_EGG, COLLIDER_o103, MSG_NONE }, + { ITEM_BAKING_STRAWBERRY, COLLIDER_o105, MSG_NONE }, + { ITEM_BAKING_CREAM, COLLIDER_o106, MSG_NONE }, + { ITEM_BAKING_BUTTER, COLLIDER_o107, MSG_NONE }, + { ITEM_BAKING_CLEANSER, COLLIDER_o108, MSG_NONE }, + { ITEM_BAKING_WATER, COLLIDER_o114, MSG_NONE }, + { ITEM_BAKING_FLOUR, COLLIDER_o109, MSG_NONE }, + { ITEM_BAKING_MILK, COLLIDER_o110, MSG_NONE }, +}; + +s32 N(IngredientWindowsOpen) = FALSE; +s32 N(IngredientWindowsDismissTime) = 0; +s32 N(IngredientWindowsIndex) = 0; + +API_CALLABLE(N(TryOpenIngredientWindows)) { + Bytecode* args = script->ptrReadPos; + s32 canCheck; + + N(IngredientWindowsIndex) = evt_get_variable(script, *args++); + canCheck = evt_get_variable(NULL, AF_KKJ19_CanTakeIngredients); + + if (canCheck == TRUE) { + N(IngredientWindowsOpen) = TRUE; + N(IngredientWindowsDismissTime) = 5; + } else { + N(IngredientWindowsOpen) = FALSE; + } + + return ApiStatus_DONE2; +} + +void N(worker_update_ingredient_windows)(void) { + if (N(IngredientWindowsOpen)) { + set_window_update(WINDOW_ID_ITEM_INFO_NAME, (s32)basic_window_update); + set_window_update(WINDOW_ID_ITEM_INFO_DESC, (s32)basic_window_update); + } else { + set_window_update(WINDOW_ID_ITEM_INFO_NAME, (s32)basic_hidden_window_update); + set_window_update(WINDOW_ID_ITEM_INFO_DESC, (s32)basic_hidden_window_update); + } + + if (N(IngredientWindowsDismissTime) > 0) { + N(IngredientWindowsDismissTime)--; + } else { + N(IngredientWindowsOpen) = FALSE; + } +} + +void N(draw_content_ingredient_name)( + MenuPanel* menu, + s32 baseX, s32 baseY, + s32 width, s32 height, + s32 opacity, s32 darkening +) { + IngredientSouce* ingredient = &N(IngredientSources)[N(IngredientWindowsIndex)]; + ItemData* item = &gItemTable[ingredient->itemID]; + s32 halfWidth = get_msg_width(item->nameMsg, 0) >> 1; + + draw_msg(item->nameMsg, baseX + 60 - halfWidth, baseY + 6, 255, 0, 0); +} + +void N(draw_content_ingredient_desc)( + MenuPanel* menu, + s32 baseX, s32 baseY, + s32 width, s32 height, + s32 opacity, s32 darkening +) { + IngredientSouce* ingredient = &N(IngredientSources)[N(IngredientWindowsIndex)]; + ItemData* item = &gItemTable[ingredient->itemID]; + + if (ingredient->overrideDescMsg != MSG_NONE) { + draw_msg(ingredient->overrideDescMsg, baseX + 8, baseY, 255, 10, 0); + } else { + draw_msg(item->shortDescMsg, baseX + 8, baseY, 255, 10, 0); + } +} + +EvtScript N(EVS_TouchFloor_IngredientStation) = { + EVT_CALL(N(TryOpenIngredientWindows), LVar0) + EVT_RETURN + EVT_END +}; + +WindowStyleCustom N(IngredientNameWS) = { + .background = {}, + .corners = { + .imgData = ui_box_corners5_png, + .fmt = G_IM_FMT_IA, + .bitDepth = G_IM_SIZ_8b, + .size1 = { 16, 8}, + .size2 = { 16, 8}, + .size3 = { 16, 8}, + .size4 = { 16, 8}, + .unk_0D = { 0, 0, 0} + }, + .opaqueCombineMode = gsDPSetCombineLERP( + 1, 0, TEXEL1, 0, 0, 0, 0, TEXEL1, + PRIMITIVE, ENVIRONMENT, COMBINED, ENVIRONMENT, 0, 0, 0, COMBINED), + .transparentCombineMode = gsDPSetCombineLERP( + 1, 0, TEXEL1, 0, TEXEL1, 0, PRIMITIVE, 0, + PRIMITIVE, ENVIRONMENT, COMBINED, ENVIRONMENT, 0, 0, 0, COMBINED), + .color1 = { 255, 183, 181, 255 }, + .color2 = { 122, 89, 63, 255 }, +}; + +MenuWindowBP N(IngredientWindows)[] = { + { + .windowID = WINDOW_ID_ITEM_INFO_NAME, + .pos = { 100, 66 }, + .width = 120, + .height = 28, + .priority = 0, + .fpDrawContents = &N(draw_content_ingredient_name), + .tab = NULL, + .parentID = -1, + .fpUpdate = { WINDOW_UPDATE_HIDE }, + .extraFlags = 0, + .style = { .customStyle = &N(IngredientNameWS) }, + }, + { + .windowID = WINDOW_ID_ITEM_INFO_DESC, + .pos = { 32, 184 }, + .width = 256, + .height = 32, + .priority = 0, + .fpDrawContents = &N(draw_content_ingredient_desc), + .tab = NULL, + .parentID = -1, + .fpUpdate = { WINDOW_UPDATE_HIDE }, + .extraFlags = 0, + .style = { -1 }, + } +}; + +API_CALLABLE(N(CreateIngredientInfoWindows)) { + s32 i; + + N(IngredientWindowsOpen) = FALSE; + N(IngredientWindowsDismissTime) = 0; + N(IngredientWindowsIndex) = 0; + + get_worker(create_worker_frontUI(N(worker_update_ingredient_windows), NULL)); + setup_pause_menu_tab(N(IngredientWindows), ARRAY_COUNT(N(IngredientWindows))); + + for (i = 0; i < ARRAY_COUNT(N(IngredientSources)); i++) { + bind_trigger_1(&N(EVS_TouchFloor_IngredientStation), TRIGGER_FLOOR_TOUCH, N(IngredientSources)[i].colliderID, i, 0, 3); + } + + return ApiStatus_DONE2; +} + +EvtScript N(EVS_ExitDoor_0) = { + EVT_SET_GROUP(EVT_GROUP_1B) + EVT_CALL(DisablePlayerInput, TRUE) + EVT_SET(LVar0, kkj_19_ENTRY_0) + EVT_SET(LVar1, COLLIDER_ttse) + EVT_SET(LVar2, MODEL_o95) + EVT_SET(LVar3, DOOR_SWING_IN) + EVT_EXEC(ExitSingleDoor) + EVT_WAIT(17) + EVT_IF_EQ(GB_StoryProgress, STORY_INTRO) + EVT_CALL(GotoMap, EVT_PTR("kkj_00"), kkj_00_ENTRY_3) + EVT_ELSE + EVT_CALL(GotoMap, EVT_PTR("kkj_10"), kkj_10_ENTRY_3) + EVT_END_IF + EVT_WAIT(100) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_BindExitTriggers) = { + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitDoor_0)), TRIGGER_WALL_PRESS_A, COLLIDER_ttse, 1, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_EnterMap) = { + EVT_IF_EQ(GB_StoryProgress, STORY_CH4_BEGAN_PEACH_MISSION) + EVT_EXEC(N(EVS_ManageBaking)) + EVT_ELSE + EVT_SET(LVar0, kkj_19_ENTRY_0) + EVT_SET(LVar2, MODEL_o95) + EVT_SET(LVar3, DOOR_SWING_IN) + EVT_EXEC_WAIT(EnterSingleDoor) + EVT_EXEC(N(EVS_BindExitTriggers)) + EVT_END_IF + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Main) = { + EVT_SET(GB_WorldLocation, LOCATION_PEACHS_CASTLE) + EVT_CALL(SetSpriteShading, SHADING_NONE) + EVT_SETUP_CAMERA_DEFAULT() + EVT_SWITCH(GB_StoryProgress) + EVT_CASE_EQ(STORY_INTRO) + EVT_CALL(MakeNpcs, FALSE, EVT_PTR(N(IntroNPCs))) + EVT_CASE_EQ(STORY_CH4_BEGAN_PEACH_MISSION) + EVT_CALL(MakeNpcs, FALSE, EVT_PTR(N(PeachNPCs))) + EVT_END_SWITCH + EVT_EXEC(N(EVS_SetupMusic)) + EVT_CALL(UseDoorSounds, DOOR_SOUNDS_BASIC) + EVT_EXEC(N(EVS_EnterMap)) + EVT_WAIT(1) + EVT_IF_EQ(GB_StoryProgress, STORY_CH4_BEGAN_PEACH_MISSION) + EVT_CALL(N(CreateIngredientInfoWindows)) + EVT_END_IF + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_kkj/kkj_19/kkj_19_3_npcs_intro.c b/src/world/area_kkj/kkj_19/kkj_19_3_npcs_intro.c new file mode 100644 index 0000000000..0238912df2 --- /dev/null +++ b/src/world/area_kkj/kkj_19/kkj_19_3_npcs_intro.c @@ -0,0 +1,58 @@ +#include "kkj_19.h" + +#include "world/common/npc/Toad_Stationary.inc.c" + +EvtScript N(EVS_NpcInteract_TayceT) = { + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_TayceT_Talk, ANIM_TayceT_Idle, 0, MSG_Intro_0031) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInteract_Toad) = { + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Toad_Red_Talk, ANIM_Toad_Red_Idle, 0, MSG_Intro_0032) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_TayceT) = { + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_TayceT_Idle) + EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(EVS_NpcInteract_TayceT))) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_Toad) = { + EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(EVS_NpcInteract_Toad))) + EVT_RETURN + EVT_END +}; + +NpcData N(NpcData_TayceT)[] = { + { + .id = NPC_TayceT, + .pos = { 400.0f, 0.0f, -70.0f }, + .yaw = 90, + .init = &N(EVS_NpcInit_TayceT), + .settings = &N(NpcSettings_Toad_Stationary), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = NO_DROPS, + .animations = { + .idle = ANIM_TayceT_Idle, + }, + }, + { + .id = NPC_Toad, + .pos = { 250.0f, 0.0f, -110.0f }, + .yaw = 270, + .init = &N(EVS_NpcInit_Toad), + .settings = &N(NpcSettings_Toad_Stationary), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = NO_DROPS, + .animations = TOAD_RED_ANIMS, + }, +}; + +NpcGroupList N(IntroNPCs) = { + NPC_GROUP(N(NpcData_TayceT)), + {} +}; diff --git a/src/world/area_kkj/kkj_19/kkj_19_4_npcs_peach.c b/src/world/area_kkj/kkj_19/kkj_19_4_npcs_peach.c new file mode 100644 index 0000000000..6dafb841cc --- /dev/null +++ b/src/world/area_kkj/kkj_19/kkj_19_4_npcs_peach.c @@ -0,0 +1,53 @@ +#include "kkj_19.h" + +#include "world/common/npc/StarSpirit.inc.c" +#include "world/common/npc/Twink.h" + +EvtScript N(EVS_NpcInteract_Twink) = { + EVT_CALL(SetSelfVar, 0, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcIdle_Twink) = { + EVT_LOOP(0) + EVT_WAIT(1) + EVT_CALL(GetNpcPos, NPC_PARTNER, LVar0, LVar1, LVar2) + EVT_CALL(SetNpcPos, NPC_SELF, LVar0, LVar1, LVar2) + EVT_CALL(GetSelfVar, 1, LVar0) + EVT_IF_EQ(LVar0, 1) + EVT_CALL(NpcFacePlayer, NPC_PARTNER, 0) + EVT_END_IF + EVT_END_LOOP + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_Twink) = { + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_2, TRUE) + EVT_CALL(EnableNpcShadow, NPC_SELF, FALSE) + EVT_CALL(GetNpcPos, NPC_PARTNER, LVar0, LVar1, LVar2) + EVT_CALL(SetNpcPos, NPC_SELF, LVar0, LVar1, LVar2) + EVT_CALL(SetNpcCollisionSize, NPC_SELF, 20, 20) + EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(EVS_NpcInteract_Twink))) + EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(EVS_NpcIdle_Twink))) + EVT_RETURN + EVT_END +}; + +// normally, you cant interact with your partner, so a dummy npc is created to allow it +NpcData N(NpcData_Twink) = { + .id = NPC_Twink, + .pos = { 0.0f, -500.0f, 0.0f }, + .yaw = 0, + .init = &N(EVS_NpcInit_Twink), + .settings = &N(NpcSettings_StarSpirit), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_8000000, + .drops = NO_DROPS, + .animations = TWINK_ANIMS, +}; + +NpcGroupList N(PeachNPCs) = { + NPC_GROUP(N(NpcData_Twink)), + {} +}; diff --git a/src/world/area_kkj/kkj_19/kkj_19_5_baking.c b/src/world/area_kkj/kkj_19/kkj_19_5_baking.c new file mode 100644 index 0000000000..54ce862746 --- /dev/null +++ b/src/world/area_kkj/kkj_19/kkj_19_5_baking.c @@ -0,0 +1,1433 @@ +#include "kkj_19.h" + +#include "hud_element.h" +#include "battle/action_cmd.h" + +#include "world/common/complete/KeyItemChoice.inc.c" +MAP_STATIC_PAD(1,item_choice); +#include "world/common/complete/NormalItemChoice.inc.c" + +#define MIXING_TIME_IN_FRAMES 10 * 30 +#define MIXING_REQUIRED_INPUTS 27 + +#define BAKING_TIME_MIN_FRAMES 23 * 30 +#define BAKING_TIME_MAX_FRAMES 36 * 30 + +// similar to CAKE_TYPE with semantically distinct usage +enum { + BAKE_STEP_ADD_SUGAR_AND_EGGS = 1, + BAKE_STEP_MIXING = 2, + BAKE_STEP_ADD_FLOUR_AND_BUTTER = 3, + BAKE_STEP_BAKING = 4, + BAKE_STEP_DECORATING = 5, + BAKE_STEP_DONE = 6, +}; + +BSS s32 N(MixingGameInputs); +BSS s32 N(MixingAnimState); +BSS s32 N(MixingGameUnused); +BSS s32 N(MixingGameTimeLeft); +BSS s32 N(MixingGameMashIntervals)[6]; +BSS s32 N(MixingGameMashSegments); +BSS s32 N(MixingGameUIRenderer); +BSS u32 N(MixingGameState); +BSS s32 N(MixingGameUIBaseX); +BSS s32 N(MixingGameUIBaseY); +BSS s32 N(D_80246564); // unused? related to missing gauge hud element? +BSS s32 N(MixingGameHudElems)[4]; +BSS s32 N(MixingGameInputBuffer)[10]; +BSS s32 N(MixingGameInputBufferPos); + +void N(worker_draw_mixing_game_ui)(void) { + hud_element_draw_clipped(N(MixingGameHudElems)[0]); +} + +enum MixingGameStates { + MIXING_STATE_INIT = 0, + MIXING_STATE_APPEAR = 1, + MIXING_STATE_BEGIN = 10, + MIXING_STATE_MASHING = 11, + MIXING_STATE_END = 12, +}; + +enum MixingAnimStates { + MIXING_ANIM_INIT = 0, + MIXING_ANIM_IDLE = 2, + MIXING_ANIM_NEXT = 3, +}; + +// basically the typical mash meter with the gauge removed +API_CALLABLE(N(RunMixingMinigame)) { + Bytecode* args = script->ptrReadPos; + s32 hudElemID; + s32 maxMashAmount; + s32 i; + + if (isInitialCall) { + N(MixingGameState) = MIXING_STATE_INIT; + } + + switch (N(MixingGameState)) { + case MIXING_STATE_INIT: + N(MixingGameTimeLeft) = evt_get_variable(script, *args++); + N(MixingGameUIRenderer) = create_worker_frontUI(NULL, N(worker_draw_mixing_game_ui)); + N(MixingGameInputs) = 0; + N(MixingGameUnused) = 0; + for (i = 0; i < ARRAY_COUNT(N(MixingGameInputBuffer)); i++) { + N(MixingGameInputBuffer)[i] = 0; + } + N(MixingGameInputBufferPos) = 0; + N(MixingGameMashIntervals)[0] = 0; + N(MixingGameMashIntervals)[1] = 12; + N(MixingGameMashIntervals)[2] = 24; + N(MixingGameMashIntervals)[3] = 36; + N(MixingGameMashIntervals)[4] = 48; + N(MixingGameMashIntervals)[5] = 60; + N(MixingGameMashSegments) = 5; + + N(MixingGameUIBaseX) = -48; + N(MixingGameUIBaseY) = 64; + + hudElemID = hud_element_create(&HES_AButton); + N(MixingGameHudElems)[0] = hudElemID; + hud_element_set_render_pos(hudElemID, N(MixingGameUIBaseX), N(MixingGameUIBaseY)); + hud_element_set_render_depth(hudElemID, 0); + hud_element_set_flags(hudElemID, HUD_ELEMENT_FLAG_80 | HUD_ELEMENT_FLAG_DISABLED); + + hudElemID = hud_element_create(&HES_BlueMeter); + N(MixingGameHudElems)[1] = hudElemID; + hud_element_set_render_pos(hudElemID, N(MixingGameUIBaseX), N(MixingGameUIBaseY) + 28); + hud_element_set_render_depth(hudElemID, 0); + hud_element_set_flags(hudElemID, HUD_ELEMENT_FLAG_80 | HUD_ELEMENT_FLAG_DISABLED); + + hudElemID = N(MixingGameHudElems)[0]; + hud_element_set_alpha(hudElemID, 255); + hud_element_clear_flags(hudElemID, HUD_ELEMENT_FLAG_DISABLED); + + hudElemID = N(MixingGameHudElems)[1]; + hud_element_set_alpha(hudElemID, 255); + hud_element_clear_flags(hudElemID, HUD_ELEMENT_FLAG_DISABLED); + + N(MixingGameState) = MIXING_STATE_APPEAR; + script->functionTemp[0] = 10; + break; + case MIXING_STATE_APPEAR: + N(MixingGameUIBaseX) += 20; + if (N(MixingGameUIBaseX) > 50) { + N(MixingGameUIBaseX) = 50; + } + hud_element_set_render_pos(N(MixingGameHudElems)[0], N(MixingGameUIBaseX), N(MixingGameUIBaseY)); + hud_element_set_render_pos(N(MixingGameHudElems)[1], N(MixingGameUIBaseX), N(MixingGameUIBaseY) + 28); + if (script->functionTemp[0] != 0) { + script->functionTemp[0]--; + } else { + N(MixingGameState) = MIXING_STATE_BEGIN; + } + break; + case MIXING_STATE_BEGIN: + hud_element_set_script(N(MixingGameHudElems)[0], &HES_MashAButton); + N(MixingGameInputs) = 0; + N(MixingAnimState) = MIXING_ANIM_INIT; + N(MixingGameState) = MIXING_STATE_MASHING; + // fallthrough + case MIXING_STATE_MASHING: + maxMashAmount = N(MixingGameMashIntervals)[N(MixingGameMashSegments)]; + if (gGameStatusPtr->pressedButtons[0] & BUTTON_A) { + N(MixingGameInputs)++; + } + if (N(MixingGameInputs) > maxMashAmount) { + N(MixingGameInputs) = maxMashAmount; + } + if (N(MixingAnimState) == MIXING_ANIM_IDLE) { + N(MixingAnimState) = MIXING_ANIM_NEXT; + } + for (i = 0; i < ARRAY_COUNT(N(MixingGameInputBuffer)); i++) { + if (N(MixingGameInputBuffer)[i] != 0) { + break; + } + } + if (i >= ARRAY_COUNT(N(MixingGameInputBuffer))) { + N(MixingAnimState) = MIXING_ANIM_IDLE; + } else if (N(MixingAnimState) != MIXING_ANIM_NEXT) { + N(MixingAnimState) = MIXING_ANIM_IDLE; + } + N(MixingGameTimeLeft)--; + if (N(MixingGameTimeLeft) == 0) { + N(MixingGameTimeLeft) = 5; + N(MixingGameState) = MIXING_STATE_END; + } + break; + case MIXING_STATE_END: + if (N(MixingGameTimeLeft) != 0) { + N(MixingGameTimeLeft)--; + break; + } + script->varTable[0] = N(MixingGameInputs); + hud_element_free(N(MixingGameHudElems)[0]); + hud_element_free(N(MixingGameHudElems)[1]); + free_worker(N(MixingGameUIRenderer)); + return ApiStatus_DONE2; + } + + N(MixingGameInputBuffer)[N(MixingGameInputBufferPos)++] = gGameStatusPtr->pressedButtons[0] & BUTTON_A; + + if (N(MixingGameInputBufferPos) >= ARRAY_COUNT(N(MixingGameInputBuffer))) { + N(MixingGameInputBufferPos) = 0; + } + + evt_set_variable(script, AB_KKJ19_BakeStepProgress, N(MixingAnimState)); + return ApiStatus_BLOCK; +} + +API_CALLABLE(N(AwaitPlayerPressATimer)) { + if (isInitialCall) { + script->functionTemp[1] = 0; + } + + if (gGameStatusPtr->pressedButtons[0] & BUTTON_A) { + script->varTable[0] = script->functionTemp[1]; + return ApiStatus_DONE2; + } + + script->functionTemp[1]++; + return ApiStatus_BLOCK; +} + +// unlike the common import, does not mask out 0xF0000 from itemID +API_CALLABLE(N(GetItemNameRaw)) { + Bytecode* args = script->ptrReadPos; + s32 inOutVar = *args++; + s32 itemID = evt_get_variable(script, inOutVar); + + evt_set_variable(script, inOutVar, gItemTable[itemID].nameMsg); + return ApiStatus_DONE2; +} + +#include "world/common/todo/GetFloorCollider.inc.c" + +API_CALLABLE(N(SetHeldBakingItem)) { + Bytecode* args = script->ptrReadPos; + + gPlayerStatus.peachItemHeld = evt_get_variable(script, *args++); + gGameStatusPtr->peachBakingIngredient = gPlayerStatus.peachItemHeld; + + return ApiStatus_DONE2; +} + +API_CALLABLE(N(FadeScreenToBlack)) { + if (isInitialCall) { + script->functionTemp[1] = 0; + } + + script->functionTemp[1] += 16; + + if (script->functionTemp[1] > 255) { + script->functionTemp[1] = 255; + } + + set_screen_overlay_params_front(0, script->functionTemp[1]); + + if (script->functionTemp[1] == 255) { + return ApiStatus_DONE2; + } + + return ApiStatus_BLOCK; +} + +API_CALLABLE(N(FadeScreenFromBlack)) { + if (isInitialCall) { + script->functionTemp[1] = 255; + } + + script->functionTemp[1] -= 16; + if (script->functionTemp[1] <= 0) { + script->functionTemp[1] = 0; + return ApiStatus_DONE2; + } + + set_screen_overlay_params_front(0, script->functionTemp[1]); + return ApiStatus_BLOCK; +} + +s32 N(BakingIngredientsList)[] = { + ITEM_BAKING_SUGAR, + ITEM_BAKING_SALT, + ITEM_BAKING_EGG, + ITEM_BAKING_STRAWBERRY, + ITEM_BAKING_CREAM, + ITEM_BAKING_BUTTER, + ITEM_BAKING_CLEANSER, + ITEM_BAKING_WATER, + ITEM_BAKING_FLOUR, + ITEM_BAKING_MILK, +}; + +EvtScript N(EVS_SetCookwareOnTable) = { + EVT_SWITCH(AB_KKJ_CompletedBakeStep) + EVT_CASE_EQ(CAKE_TYPE_NONE) + EVT_CALL(MakeItemEntity, ITEM_CAKE_BOWL, 287, 16, -40, ITEM_SPAWN_MODE_DECORATION, 0) + EVT_SET(AB_KKJ19_CookwareItemIdx, LVar0) + EVT_CALL(MakeItemEntity, ITEM_CAKE_PAN, 230, 16, 0, ITEM_SPAWN_MODE_DECORATION, 0) + EVT_SET(AB_KKJ19_CakeItemIdx, LVar0) + EVT_CASE_EQ(CAKE_TYPE_BEGUN) + EVT_CALL(MakeItemEntity, ITEM_CAKE_BOWL, 287, 16, -40, ITEM_SPAWN_MODE_DECORATION, 0) + EVT_SET(AB_KKJ19_CookwareItemIdx, LVar0) + EVT_CALL(MakeItemEntity, ITEM_CAKE_PAN, 230, 16, 0, ITEM_SPAWN_MODE_DECORATION, 0) + EVT_SET(AB_KKJ19_CakeItemIdx, LVar0) + EVT_CASE_EQ(CAKE_TYPE_READY_TO_MIX) + EVT_CALL(MakeItemEntity, ITEM_CAKE_MIXED, 287, 16, -40, ITEM_SPAWN_MODE_DECORATION, 0) + EVT_SET(AB_KKJ19_CookwareItemIdx, LVar0) + EVT_CALL(MakeItemEntity, ITEM_CAKE_PAN, 230, 16, 0, ITEM_SPAWN_MODE_DECORATION, 0) + EVT_SET(AB_KKJ19_CakeItemIdx, LVar0) + EVT_CASE_EQ(CAKE_TYPE_MIXED) + EVT_CALL(MakeItemEntity, ITEM_CAKE_MIXED, 287, 16, -40, ITEM_SPAWN_MODE_DECORATION, 0) + EVT_SET(AB_KKJ19_CookwareItemIdx, LVar0) + EVT_CALL(MakeItemEntity, ITEM_CAKE_PAN, 230, 16, 0, ITEM_SPAWN_MODE_DECORATION, 0) + EVT_SET(AB_KKJ19_CakeItemIdx, LVar0) + EVT_CASE_EQ(CAKE_TYPE_READY_TO_BAKE) + EVT_CALL(MakeItemEntity, ITEM_CAKE_MIXED, 287, 16, -40, ITEM_SPAWN_MODE_DECORATION, 0) + EVT_SET(AB_KKJ19_CookwareItemIdx, LVar0) + EVT_CALL(MakeItemEntity, ITEM_CAKE_PAN, 230, 16, 0, ITEM_SPAWN_MODE_DECORATION, 0) + EVT_SET(AB_KKJ19_CakeItemIdx, LVar0) + EVT_CASE_EQ(CAKE_TYPE_BAKED) + EVT_CALL(MakeItemEntity, ITEM_CAKE_BARE, 287, 20, -30, ITEM_SPAWN_MODE_DECORATION, 0) + EVT_SET(AB_KKJ19_CakeItemIdx, LVar0) + EVT_CALL(MakeItemEntity, ITEM_CAKE_BOWL, 230, 16, 0, ITEM_SPAWN_MODE_DECORATION, 0) + EVT_SET(AB_KKJ19_CookwareItemIdx, LVar0) + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_UpdatePeachMixingAnimations) = { + EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0020) + EVT_SET(LVar0, 0) + EVT_LOOP(0) + EVT_SWITCH(AB_KKJ19_BakeStepProgress) + EVT_CASE_EQ(MIXING_ANIM_IDLE) + // increment the animation on next MIXING_ANIM_NEXT + EVT_SET(LVar1, 0) + EVT_CASE_EQ(MIXING_ANIM_NEXT) + EVT_IF_EQ(LVar1, 0) + // increment the animation + EVT_SWITCH(LVar0) + EVT_CASE_EQ(0) + EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0020) + EVT_SET(LVar0, 1) + EVT_CASE_EQ(1) + EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0021) + EVT_SET(LVar0, 2) + EVT_CASE_EQ(2) + EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0022) + EVT_SET(LVar0, 3) + EVT_CASE_EQ(3) + EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0023) + EVT_SET(LVar0, 0) + EVT_END_SWITCH + EVT_SET(LVar1, 1) + EVT_ELSE + // wait until next MIXING_ANIM_NEXT to increment the animation + EVT_SET(LVar1, 0) + EVT_END_IF + EVT_END_SWITCH + EVT_WAIT(1) + EVT_END_LOOP + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_ReturnHeldIngredient) = { + EVT_IF_NE(AB_KKJ19_HeldIngredient, PEACH_BAKING_NONE) + EVT_CALL(FindKeyItem, AB_KKJ19_HeldIngredient, LVar0) + EVT_CALL(RemoveKeyItemAt, LVar0) + EVT_SET(AB_KKJ19_HeldIngredient, PEACH_BAKING_NONE) + EVT_CALL(N(SetHeldBakingItem), PEACH_BAKING_NONE) + EVT_CALL(SetPlayerActionState, ACTION_STATE_IDLE) + EVT_END_IF + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_TakeIngredient) = { + EVT_IF_EQ(AB_KKJ19_CurrentBakeStep, BAKE_STEP_DONE) + EVT_RETURN + EVT_END_IF + // get itemID of current station + EVT_CALL(N(GetFloorCollider), LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_EQ(COLLIDER_o101) + EVT_SET(LVar0, ITEM_BAKING_SUGAR) + EVT_CASE_EQ(COLLIDER_o102) + EVT_SET(LVar0, ITEM_BAKING_SALT) + EVT_CASE_EQ(COLLIDER_o103) + EVT_SET(LVar0, ITEM_BAKING_EGG) + EVT_CASE_EQ(COLLIDER_o105) + EVT_SET(LVar0, ITEM_BAKING_STRAWBERRY) + EVT_CASE_EQ(COLLIDER_o106) + EVT_SET(LVar0, ITEM_BAKING_CREAM) + EVT_CASE_EQ(COLLIDER_o107) + EVT_SET(LVar0, ITEM_BAKING_BUTTER) + EVT_CASE_EQ(COLLIDER_o108) + EVT_SET(LVar0, ITEM_BAKING_CLEANSER) + EVT_CASE_EQ(COLLIDER_o114) + EVT_SET(LVar0, ITEM_BAKING_WATER) + EVT_CASE_EQ(COLLIDER_o109) + EVT_SET(LVar0, ITEM_BAKING_FLOUR) + EVT_CASE_EQ(COLLIDER_o110) + EVT_SET(LVar0, ITEM_BAKING_MILK) + EVT_CASE_DEFAULT + EVT_RETURN + EVT_END_SWITCH + EVT_CALL(DisablePlayerInput, TRUE) + EVT_SET(AF_KKJ19_CanTakeIngredients, FALSE) + EVT_WAIT(5) + EVT_SET(LVarA, LVar0) + EVT_SET(LVarB, LVar0) + EVT_IF_EQ(AB_KKJ19_HeldIngredient, PEACH_BAKING_NONE) + // picking up an ingredient while not holding any + EVT_CALL(N(GetItemNameRaw), LVarA) + EVT_CALL(SetMessageText, LVarA, 0) + EVT_CALL(N(GetFloorCollider), LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_EQ(COLLIDER_o101) + EVT_SET(LVar0, PEACH_BAKING_SUGAR) + EVT_CASE_EQ(COLLIDER_o102) + EVT_SET(LVar0, PEACH_BAKING_SALT) + EVT_CASE_EQ(COLLIDER_o103) + EVT_SET(LVar0, PEACH_BAKING_EGG) + EVT_CASE_EQ(COLLIDER_o105) + EVT_SET(LVar0, PEACH_BAKING_STRAWBERRY) + EVT_CASE_EQ(COLLIDER_o106) + EVT_SET(LVar0, PEACH_BAKING_CREAM) + EVT_CASE_EQ(COLLIDER_o107) + EVT_SET(LVar0, PEACH_BAKING_BUTTER) + EVT_CASE_EQ(COLLIDER_o108) + EVT_SET(LVar0, PEACH_BAKING_CLEANSER) + EVT_CASE_EQ(COLLIDER_o114) + EVT_SET(LVar0, PEACH_BAKING_WATER) + EVT_CASE_EQ(COLLIDER_o109) + EVT_SET(LVar0, PEACH_BAKING_FLOUR) + EVT_CASE_EQ(COLLIDER_o110) + EVT_SET(LVar0, PEACH_BAKING_MILK) + EVT_END_SWITCH + EVT_CALL(N(SetHeldBakingItem), LVar0) + EVT_CALL(SetPlayerActionState, ACTION_STATE_IDLE) + EVT_SET(AB_KKJ19_HeldIngredient, LVarB) + EVT_CALL(AddKeyItem, LVarB) + EVT_CALL(ShowMessageAtScreenPos, MSG_Peach_00E7, 160, 40) + EVT_ELSE + // exchanging held ingredient for current station + EVT_CALL(FindKeyItem, LVar0, LVar1) + EVT_IF_EQ(LVar1, -1) + EVT_SET(LVar9, AB_KKJ19_HeldIngredient) + EVT_CALL(N(GetItemNameRaw), LVar9) + EVT_CALL(N(GetItemNameRaw), LVarA) + EVT_CALL(SetMessageText, LVar9, 0) + EVT_CALL(SetMessageText, LVarA, 1) + EVT_CALL(ShowMessageAtScreenPos, MSG_Peach_00E9, 160, 40) + EVT_CALL(ShowChoice, MSG_Choice_002B) + EVT_IF_EQ(LVar0, 0) + EVT_EXEC_WAIT(N(EVS_ReturnHeldIngredient)) + EVT_CALL(N(GetFloorCollider), LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_EQ(COLLIDER_o101) + EVT_SET(LVar0, PEACH_BAKING_SUGAR) + EVT_CASE_EQ(COLLIDER_o102) + EVT_SET(LVar0, PEACH_BAKING_SALT) + EVT_CASE_EQ(COLLIDER_o103) + EVT_SET(LVar0, PEACH_BAKING_EGG) + EVT_CASE_EQ(COLLIDER_o105) + EVT_SET(LVar0, PEACH_BAKING_STRAWBERRY) + EVT_CASE_EQ(COLLIDER_o106) + EVT_SET(LVar0, PEACH_BAKING_CREAM) + EVT_CASE_EQ(COLLIDER_o107) + EVT_SET(LVar0, PEACH_BAKING_BUTTER) + EVT_CASE_EQ(COLLIDER_o108) + EVT_SET(LVar0, PEACH_BAKING_CLEANSER) + EVT_CASE_EQ(COLLIDER_o114) + EVT_SET(LVar0, PEACH_BAKING_WATER) + EVT_CASE_EQ(COLLIDER_o109) + EVT_SET(LVar0, PEACH_BAKING_FLOUR) + EVT_CASE_EQ(COLLIDER_o110) + EVT_SET(LVar0, PEACH_BAKING_MILK) + EVT_END_SWITCH + EVT_CALL(N(SetHeldBakingItem), LVar0) + EVT_CALL(SetPlayerActionState, ACTION_STATE_IDLE) + EVT_SET(AB_KKJ19_HeldIngredient, LVarB) + EVT_CALL(AddKeyItem, LVarB) + EVT_CALL(SwitchMessage, MSG_Peach_00EA) + EVT_ELSE + EVT_CALL(CloseMessage) + EVT_END_IF + EVT_ELSE + // placing ingredient back at its station + EVT_CALL(N(GetItemNameRaw), LVarA) + EVT_CALL(SetMessageText, LVarA, 0) + EVT_CALL(ShowMessageAtScreenPos, MSG_Peach_00E6, 160, 40) + EVT_CALL(ShowChoice, MSG_Choice_002B) + EVT_IF_EQ(LVar0, 0) + EVT_EXEC_WAIT(N(EVS_ReturnHeldIngredient)) + EVT_CALL(SwitchMessage, MSG_Peach_00E8) + EVT_ELSE + EVT_CALL(CloseMessage) + EVT_END_IF + EVT_END_IF + EVT_END_IF + EVT_SET(AF_KKJ19_CanTakeIngredients, TRUE) + EVT_WAIT(5) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_ItemPrompt_AddIngredient) = { + EVT_IF_EQ(AB_KKJ19_CurrentBakeStep, BAKE_STEP_DONE) + EVT_RETURN + EVT_END_IF + EVT_SET_GROUP(EVT_GROUP_00) + EVT_CALL(SetTimeFreezeMode, TIME_FREEZE_PARTIAL) + EVT_CALL(ShowKeyChoicePopup) + EVT_SET(LVar2, LVar0) + EVT_SWITCH(LVar2) + EVT_CASE_EQ(0) + EVT_CALL(CloseChoicePopup) + EVT_CALL(SetTimeFreezeMode, TIME_FREEZE_NORMAL) + EVT_RETURN + EVT_CASE_EQ(-1) + EVT_CALL(CloseChoicePopup) + EVT_CALL(SetTimeFreezeMode, TIME_FREEZE_NORMAL) + EVT_RETURN + EVT_END_SWITCH + EVT_CALL(RemoveKeyItemAt, LVar1) + EVT_SET(AB_KKJ19_HeldIngredient, PEACH_BAKING_NONE) + EVT_CALL(N(SetHeldBakingItem), PEACH_BAKING_NONE) + EVT_CALL(SetPlayerActionState, ACTION_STATE_IDLE) + EVT_SWITCH(AB_KKJ19_CurrentBakeStep) + EVT_CASE_EQ(BAKE_STEP_ADD_SUGAR_AND_EGGS) + EVT_SWITCH(LVar0) + EVT_CASE_EQ(ITEM_BAKING_SUGAR) + EVT_SET(AF_KKJ19_AddedSugar, TRUE) + EVT_CASE_EQ(ITEM_BAKING_EGG) + EVT_SET(AF_KKJ19_AddedEgg, TRUE) + EVT_CASE_DEFAULT + EVT_SET(AF_KKJ19_AddedNothingWrong, FALSE) + EVT_END_SWITCH + EVT_IF_EQ(AB_KKJ19_BakeStepProgress, 0) + EVT_CALL(RemoveItemEntity, AB_KKJ19_CookwareItemIdx) + EVT_CALL(MakeItemEntity, ITEM_CAKE_MIXED, 287, 16, -40, ITEM_SPAWN_MODE_DECORATION, 0) + EVT_SET(AB_KKJ19_CookwareItemIdx, LVar0) + EVT_END_IF + EVT_IF_GT(AB_KKJ19_BakeStepProgress, 1) + EVT_SET(AF_KKJ19_AddedNothingWrong, FALSE) + EVT_END_IF + EVT_CASE_EQ(BAKE_STEP_ADD_FLOUR_AND_BUTTER) + EVT_SWITCH(LVar0) + EVT_CASE_EQ(ITEM_BAKING_FLOUR) + EVT_SET(AF_KKJ19_AddedFlour, TRUE) + EVT_CASE_EQ(ITEM_BAKING_BUTTER) + EVT_SET(AF_KKJ19_AddedButter, TRUE) + EVT_CASE_DEFAULT + EVT_SET(AF_KKJ19_AddedNothingWrong, FALSE) + EVT_END_SWITCH + EVT_IF_GT(AB_KKJ19_BakeStepProgress, 1) + EVT_SET(AF_KKJ19_AddedNothingWrong, FALSE) + EVT_END_IF + EVT_CASE_EQ(BAKE_STEP_DECORATING) + EVT_SWITCH(AB_KKJ19_BakeStepProgress) + EVT_CASE_EQ(0) + EVT_IF_NE(LVar0, ITEM_BAKING_CREAM) + EVT_SET(AF_KKJ19_FailedBakingTask, TRUE) + EVT_END_IF + EVT_CASE_EQ(1) + EVT_IF_NE(LVar0, ITEM_BAKING_STRAWBERRY) + EVT_SET(AF_KKJ19_FailedBakingTask, TRUE) + EVT_END_IF + EVT_CASE_DEFAULT + EVT_SET(AF_KKJ19_FailedBakingTask, TRUE) + EVT_END_SWITCH + EVT_CALL(RemoveItemEntity, AB_KKJ19_CakeItemIdx) + EVT_SWITCH(LVar0) + EVT_CASE_EQ(ITEM_BAKING_STRAWBERRY) + EVT_IF_EQ(AB_KKJ19_AddedIcing, FALSE) + EVT_CALL(MakeItemEntity, ITEM_CAKE_WITH_BERRIES, 287, 20, -30, ITEM_SPAWN_MODE_DECORATION, 0) + EVT_SET(AB_KKJ19_CakeItemIdx, LVar0) + EVT_ELSE + EVT_CALL(MakeItemEntity, ITEM_CAKE_DONE, 287, 20, -30, ITEM_SPAWN_MODE_DECORATION, 0) + EVT_SET(AB_KKJ19_CakeItemIdx, LVar0) + EVT_END_IF + EVT_SET(AB_KKJ19_AddedBerries, TRUE) + EVT_CASE_DEFAULT + EVT_CALL(MakeItemEntity, ITEM_CAKE_WITH_ICING, 287, 20, -30, ITEM_SPAWN_MODE_DECORATION, 0) + EVT_SET(AB_KKJ19_CakeItemIdx, LVar0) + EVT_SET(AB_KKJ19_AddedIcing, TRUE) + EVT_SET(AB_KKJ19_AddedBerries, FALSE) + EVT_END_SWITCH + EVT_END_SWITCH + EVT_ADD(AB_KKJ19_BakeStepProgress, 1) + EVT_CALL(CloseChoicePopup) + EVT_CALL(SetTimeFreezeMode, TIME_FREEZE_NORMAL) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_BindInteractTriggers) = { + EVT_BIND_PADLOCK(EVT_PTR(N(EVS_ItemPrompt_AddIngredient)), TRIGGER_FLOOR_PRESS_A, COLLIDER_o118, EVT_PTR(N(BakingIngredientsList)), 0, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_TakeIngredient)), TRIGGER_FLOOR_PRESS_A, COLLIDER_o101, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_TakeIngredient)), TRIGGER_FLOOR_PRESS_A, COLLIDER_o102, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_TakeIngredient)), TRIGGER_FLOOR_PRESS_A, COLLIDER_o103, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_TakeIngredient)), TRIGGER_FLOOR_PRESS_A, COLLIDER_o105, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_TakeIngredient)), TRIGGER_FLOOR_PRESS_A, COLLIDER_o106, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_TakeIngredient)), TRIGGER_FLOOR_PRESS_A, COLLIDER_o107, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_TakeIngredient)), TRIGGER_FLOOR_PRESS_A, COLLIDER_o108, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_TakeIngredient)), TRIGGER_FLOOR_PRESS_A, COLLIDER_o114, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_TakeIngredient)), TRIGGER_FLOOR_PRESS_A, COLLIDER_o109, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_TakeIngredient)), TRIGGER_FLOOR_PRESS_A, COLLIDER_o110, 1, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_OpenOverDoor) = { + EVT_CALL(MakeLerp, 0, 90, 10, EASING_LINEAR) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_CALL(RotateGroup, MODEL_g33, LVar0, 1, 0, 0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_CloseOverDoor) = { + EVT_CALL(MakeLerp, 90, 0, 10, EASING_LINEAR) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_CALL(RotateGroup, MODEL_g33, LVar0, 1, 0, 0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_PickupFinalCake) = { + EVT_IF_EQ(AB_KKJ19_AddedBerries, FALSE) + EVT_SET(LVar0, PEACH_BAKING_CAKE_WITH_ICING) + EVT_ELSE + EVT_IF_EQ(AB_KKJ19_AddedIcing, FALSE) + EVT_SET(LVar0, PEACH_BAKING_CAKE_WITH_BERRIES) + EVT_ELSE + EVT_SET(LVar0, PEACH_BAKING_COMPLETE_CAKE) + EVT_END_IF + EVT_END_IF + EVT_CALL(RemoveItemEntity, AB_KKJ19_CakeItemIdx) + EVT_CALL(N(SetHeldBakingItem), LVar0) + EVT_CALL(SetPlayerActionState, ACTION_STATE_IDLE) + EVT_SET(AF_KKJ_FinishedBakingCake, TRUE) + EVT_UNBIND + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_BindCakePickup) = { + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_PickupFinalCake)), TRIGGER_WALL_PRESS_A, COLLIDER_o189, 1, 0) + EVT_RETURN + EVT_END +}; + +Vec3f N(FetchBookPath)[] = { + { 440.0, 25.0, -30.0 }, + { 480.0, 60.0, -60.0 }, + { 550.0, 50.0, -90.0 }, + { 590.0, 40.0, -110.0 }, + { 630.0, 100.0, -124.0 }, +}; + +EvtScript N(EVS_FocusCam_Twink) = { + EVT_CALL(GetNpcPos, NPC_PARTNER, LVar0, LVar1, LVar2) + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_CALL(SetCamDistance, CAM_DEFAULT, 200) + EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(17.0), EVT_FLOAT(-4.5)) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(4.0)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_FocusCam_PeachAndTwink) = { + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_CALL(GetNpcPos, NPC_PARTNER, LVar3, LVar4, LVar5) + // get average position of peach and twink + EVT_ADD(LVar0, LVar3) + EVT_DIV(LVar0, 2) + EVT_ADD(LVar1, LVar4) + EVT_DIV(LVar1, 2) + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_CALL(SetCamDistance, CAM_DEFAULT, 275) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(4.0)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_FocusCam_Oven) = { + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, 130, 0, -100) + EVT_CALL(SetPanTarget, CAM_DEFAULT, 130, 0, -100) + EVT_CALL(SetCamDistance, CAM_DEFAULT, 250) + EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(17.0), EVT_FLOAT(-13.0)) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_FocusCam_Table) = { + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, 330, 0, -80) + EVT_CALL(SetPanTarget, CAM_DEFAULT, 330, 0, -80) + EVT_CALL(SetCamDistance, CAM_DEFAULT, EVT_FLOAT(300.0)) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(90.0)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Twink_FlyToPlayer) = { + EVT_CALL(SetEnemyFlagBits, NPC_Twink, ENEMY_FLAG_8000000, 1) + EVT_CALL(SetNpcVar, NPC_Twink, 1, 0) + EVT_CALL(GetNpcPos, NPC_PARTNER, LVar3, LVar1, LVar2) + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_IF_LT(LVar0, LVar3) + EVT_ADD(LVar0, 40) + EVT_ELSE + EVT_SUB(LVar0, 40) + EVT_END_IF + EVT_ADD(LVar1, 30) + EVT_CALL(NpcFlyTo, NPC_PARTNER, LVar0, LVar1, LVar2, 15, -5, EASING_LINEAR) + EVT_CALL(NpcFacePlayer, NPC_PARTNER, 5) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Twink_FlyToHighPos) = { + EVT_CALL(SetNpcSpeed, NPC_PARTNER, EVT_FLOAT(2.0)) + EVT_CALL(NpcFlyTo, NPC_PARTNER, 390, 50, -70, 0, -5, EASING_LINEAR) + EVT_CALL(InterpNpcYaw, NPC_PARTNER, 270, 5) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_ExitDoorWithCake) = { + EVT_IF_EQ(AF_KKJ_FinishedBakingCake, FALSE) + EVT_CALL(DisablePlayerInput, TRUE) + EVT_IF_EQ(AB_KKJ19_CurrentBakeStep, CAKE_TYPE_DONE) + EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_Twink_Talk, ANIM_Twink_Idle, 0, MSG_Peach_00C1) + EVT_ELSE + EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_Twink_Talk, ANIM_Twink_Idle, 0, MSG_Peach_00BE) + EVT_END_IF + EVT_CALL(DisablePlayerInput, FALSE) + EVT_ELSE + EVT_SET(LVar0, kkj_19_ENTRY_0) + EVT_SET(LVar1, COLLIDER_ttse) + EVT_SET(LVar2, MODEL_o95) + EVT_SET(LVar3, DOOR_SWING_IN) + EVT_EXEC(ExitSingleDoor) + EVT_WAIT(17) + EVT_CALL(GotoMap, EVT_PTR("kkj_18"), kkj_18_ENTRY_0) + EVT_WAIT(100) + EVT_END_IF + EVT_RETURN + EVT_END +}; + +enum { + // starting + LBL_TRY_RESUME = 0, + // (1) add sugar & eggs + LBL_ADD_SUGAR_EGGS = 10, + LBL_ADD_SUGAR_EGGS_WAITING = 15, + // (2) mix it + LBL_MIX_FIRST = 20, + LBL_MIX_RESUME = 21, + // (3) add flour & butter + LBL_ADD_FLOUR_BUTTER_FIRST = 60, + LBL_ADD_FLOUR_BUTTER_RESUME = 61, + LBL_ADD_FLOUR_BUTTER_WAITING = 65, + // (4) baking + LBL_BAKE_FIRST = 30, + LBL_BAKE_RESUME = 31, + // (5) decorating + LBL_DECORATE_FIRST = 40, + LBL_DECORATE_RESUME = 41, + LBL_DECORATE_WAITING = 45, + // outcomes + LBL_FINISHED = 50, + LBL_START_OVER = 99, +}; + +EvtScript N(EVS_EnterKitchen_FirstTime) = { + EVT_SET(LVar0, kkj_19_ENTRY_0) + EVT_SET(LVar2, MODEL_o95) + EVT_SET(LVar3, DOOR_SWING_IN) + EVT_EXEC_WAIT(EnterSingleDoor) + EVT_THREAD + EVT_CALL(SetNpcSpeed, NPC_PARTNER, EVT_FLOAT(2.0)) + EVT_CALL(NpcFlyTo, NPC_PARTNER, 440, 25, -30, 0, -5, EASING_LINEAR) + EVT_CALL(NpcFacePlayer, NPC_PARTNER, 5) + EVT_END_THREAD + EVT_CALL(SetPlayerSpeed, EVT_FLOAT(2.0)) + EVT_CALL(PlayerMoveTo, 400, -30, 0) + EVT_WAIT(1) + EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0011) + EVT_WAIT(60) + EVT_CALL(SetPlayerAnimation, ANIM_Peach_A0001) + EVT_CALL(InterpPlayerYaw, 90, 5) + EVT_CALL(AdjustCam, CAM_DEFAULT, EVT_FLOAT(4.0), 0, EVT_FLOAT(300.0), EVT_FLOAT(17.0), EVT_FLOAT(-7.0)) + EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0000) + EVT_WAIT(10) + EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0026) + EVT_CALL(SpeakToPlayer, NPC_PLAYER, ANIM_Peach_C0001, ANIM_Peach_C0026, 5, MSG_Peach_00B9) + EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0002) + EVT_WAIT(10) + EVT_CALL(SetPlayerAnimation, ANIM_Peach_A0001) + EVT_THREAD + EVT_WAIT(30) + EVT_CALL(SetPanTarget, CAM_DEFAULT, 630, 85, -140) + EVT_CALL(SetCamDistance, CAM_DEFAULT, 200) + EVT_CALL(SetCamPosA, CAM_DEFAULT, 112, -200) + EVT_CALL(SetCamPosB, CAM_DEFAULT, 610, -60) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(90.0)) + EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_END_THREAD + EVT_CALL(InterpNpcYaw, NPC_PARTNER, 90, 5) + EVT_WAIT(10) + EVT_CALL(LoadPath, 60, EVT_PTR(N(FetchBookPath)), ARRAY_COUNT(N(FetchBookPath)), EASING_LINEAR) + EVT_LOOP(0) + EVT_CALL(GetNextPathPos) + EVT_CALL(SetNpcPos, NPC_PARTNER, LVar1, LVar2, LVar3) + EVT_WAIT(1) + EVT_IF_EQ(LVar0, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_CALL(InterpNpcYaw, NPC_PARTNER, 270, 5) + EVT_WAIT(10) + EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_Twink_Talk, ANIM_Twink_Idle, 0, MSG_Peach_00BA) + EVT_CALL(EnableModel, MODEL_o128, FALSE) + EVT_CALL(SetNpcAnimation, NPC_PARTNER, ANIM_Twink_TakeBook) + EVT_WAIT(30) + EVT_THREAD + EVT_WAIT(10) + EVT_CALL(AdjustCam, CAM_DEFAULT, EVT_FLOAT(90.0), 0, 300, EVT_FLOAT(17.0), EVT_FLOAT(-7.0)) + EVT_END_THREAD + EVT_CALL(SetNpcAnimation, NPC_PARTNER, ANIM_Twink_Idle) + EVT_CALL(SetNpcSpeed, NPC_PARTNER, EVT_FLOAT(3.0)) + EVT_CALL(NpcFlyTo, NPC_PARTNER, 440, 25, -30, 0, -5, EASING_LINEAR) + EVT_WAIT(10) + EVT_CALL(SetNpcAnimation, NPC_PARTNER, ANIM_Twink_OpenBook) + EVT_WAIT(10) + EVT_CALL(SetNpcAnimation, NPC_PARTNER, ANIM_Twink_IdleBook) + EVT_WAIT(20) + EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0000) + EVT_WAIT(10) + EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0026) + EVT_CALL(SpeakToPlayer, NPC_PLAYER, ANIM_Peach_C0001, ANIM_Peach_C0026, 5, MSG_Peach_00BB) + EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0002) + EVT_WAIT(10) + EVT_CALL(SetPlayerAnimation, ANIM_Peach_A0001) + EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_Twink_ReadBook, ANIM_Twink_IdleBook, 0, MSG_Peach_00BC) + EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0000) + EVT_WAIT(10) + EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0026) + EVT_CALL(SpeakToPlayer, NPC_PLAYER, ANIM_Peach_C0001, ANIM_Peach_C0026, 5, MSG_Peach_00BD) + EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0002) + EVT_WAIT(10) + EVT_CALL(SetPlayerAnimation, ANIM_Peach_A0001) + EVT_SET(AB_KKJ_CompletedBakeStep, CAKE_TYPE_BEGUN) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_EnterKitchen_TryAgain) = { + EVT_CALL(EnableModel, MODEL_o128, FALSE) + EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0012) + EVT_CALL(SetPlayerPos, 400, 0, -30) + EVT_CALL(InterpPlayerYaw, 90, 0) + EVT_CALL(SetNpcPos, NPC_PARTNER, 440, 25, -30) + EVT_CALL(SetNpcYaw, NPC_PARTNER, 270) + EVT_CALL(AdjustCam, CAM_DEFAULT, EVT_FLOAT(90.0), 0, 300, EVT_FLOAT(17.0), EVT_FLOAT(-7.0)) + EVT_WAIT(30) + EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_Twink_Talk, ANIM_Twink_Idle, 0, MSG_Peach_00C2) + EVT_CALL(SpeakToPlayer, NPC_PLAYER, ANIM_Peach_C0013, ANIM_Peach_C0012, 5, MSG_Peach_00C3) + EVT_CALL(SetPlayerAnimation, ANIM_Peach_A0001) + EVT_CALL(ContinueSpeech, NPC_PLAYER, ANIM_Peach_D0004, ANIM_Peach_A0001, 0, MSG_Peach_00C4) + EVT_WAIT(10) + EVT_CALL(SetNpcAnimation, NPC_PARTNER, ANIM_Twink_OpenBook) + EVT_WAIT(10) + EVT_CALL(SetNpcAnimation, NPC_PARTNER, ANIM_Twink_IdleBook) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_ManageBaking) = { + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(DisablePartnerAI, 0) + EVT_CALL(SetCamLeadPlayer, CAM_DEFAULT, FALSE) + EVT_CALL(EnableModel, MODEL_o46, FALSE) + EVT_CALL(EnableModel, MODEL_o50, FALSE) + EVT_EXEC_WAIT(N(EVS_SetCookwareOnTable)) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitDoorWithCake)), TRIGGER_WALL_PRESS_A, COLLIDER_ttse, 1, 0) + EVT_EXEC(N(EVS_BindInteractTriggers)) + EVT_IF_EQ(AB_KKJ_CompletedBakeStep, CAKE_TYPE_NONE) + EVT_EXEC_WAIT(N(EVS_EnterKitchen_FirstTime)) + EVT_ELSE + EVT_EXEC_WAIT(N(EVS_EnterKitchen_TryAgain)) + EVT_END_IF + + // start of cooking process + EVT_LABEL(LBL_TRY_RESUME) + EVT_SET(AF_KKJ_FinishedBakingCake, FALSE) + EVT_SET(AF_KKJ19_FailedBakingTask, FALSE) + EVT_SET(AB_KKJ19_HeldIngredient, PEACH_BAKING_NONE) + EVT_CALL(SetEnemyFlagBits, NPC_Twink, ENEMY_FLAG_8000000, 1) + EVT_CALL(SetNpcVar, NPC_Twink, 1, 0) + EVT_IF_EQ(AB_KKJ_CompletedBakeStep, CAKE_TYPE_READY_TO_MIX) + // resume mixing + EVT_EXEC_WAIT(N(EVS_FocusCam_Twink)) + EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_Twink_ReadBook, ANIM_Twink_IdleBook, 0, MSG_Peach_00C5) + EVT_EXEC_WAIT(N(EVS_FocusCam_Table)) + EVT_CALL(InterpPlayerYaw, 270, 5) + EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_Twink_ReadBook, ANIM_Twink_IdleBook, 5, MSG_Peach_00C6) + EVT_CALL(ResetCam, CAM_DEFAULT, EVT_FLOAT(90.0)) + EVT_CALL(SetNpcAnimation, NPC_PARTNER, ANIM_Twink_CloseBook) + EVT_WAIT(10) + EVT_CALL(SetNpcAnimation, NPC_PARTNER, ANIM_Twink_Fly) + EVT_WAIT(20) + EVT_EXEC(N(EVS_Twink_FlyToHighPos)) + EVT_GOTO(LBL_MIX_RESUME) + EVT_END_IF + EVT_IF_EQ(AB_KKJ_CompletedBakeStep, CAKE_TYPE_MIXED) + // resume adding flour & butter + EVT_EXEC_WAIT(N(EVS_FocusCam_Twink)) + EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_Twink_ReadBook, ANIM_Twink_IdleBook, 0, MSG_Peach_00C7) + EVT_EXEC_WAIT(N(EVS_FocusCam_Table)) + EVT_CALL(InterpPlayerYaw, 270, 5) + EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_Twink_ReadBook, ANIM_Twink_IdleBook, 5, MSG_Peach_00C8) + EVT_CALL(ResetCam, CAM_DEFAULT, EVT_FLOAT(90.0)) + EVT_CALL(SetNpcAnimation, NPC_PARTNER, ANIM_Twink_CloseBook) + EVT_WAIT(10) + EVT_CALL(SetNpcAnimation, NPC_PARTNER, ANIM_Twink_Fly) + EVT_WAIT(20) + EVT_GOTO(LBL_ADD_FLOUR_BUTTER_RESUME) + EVT_END_IF + EVT_IF_EQ(AB_KKJ_CompletedBakeStep, CAKE_TYPE_READY_TO_BAKE) + // resume baking + EVT_EXEC_WAIT(N(EVS_FocusCam_Twink)) + EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_Twink_ReadBook, ANIM_Twink_IdleBook, 0, MSG_Peach_00C9) + EVT_EXEC_WAIT(N(EVS_FocusCam_Table)) + EVT_CALL(InterpPlayerYaw, 270, 5) + EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_Twink_ReadBook, ANIM_Twink_IdleBook, 5, MSG_Peach_00CA) + EVT_CALL(ResetCam, CAM_DEFAULT, EVT_FLOAT(90.0)) + EVT_CALL(SetNpcAnimation, NPC_PARTNER, ANIM_Twink_CloseBook) + EVT_WAIT(10) + EVT_CALL(SetNpcAnimation, NPC_PARTNER, ANIM_Twink_Fly) + EVT_WAIT(20) + EVT_EXEC(N(EVS_Twink_FlyToHighPos)) + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_CALL(func_802D1270, LVar0, -74, EVT_FLOAT(2.0)) + EVT_CALL(func_802D1270, 287, -74, EVT_FLOAT(2.0)) + EVT_GOTO(LBL_BAKE_RESUME) + EVT_END_IF + EVT_IF_EQ(AB_KKJ_CompletedBakeStep, CAKE_TYPE_BAKED) + // resume decorating + EVT_EXEC_WAIT(N(EVS_FocusCam_Twink)) + EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_Twink_ReadBook, ANIM_Twink_IdleBook, 0, MSG_Peach_00CB) + EVT_EXEC_WAIT(N(EVS_FocusCam_Table)) + EVT_CALL(InterpPlayerYaw, 270, 5) + EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_Twink_ReadBook, ANIM_Twink_IdleBook, 5, MSG_Peach_00CC) + EVT_CALL(ResetCam, CAM_DEFAULT, EVT_FLOAT(90.0)) + EVT_CALL(SetNpcAnimation, NPC_PARTNER, ANIM_Twink_CloseBook) + EVT_WAIT(10) + EVT_CALL(SetNpcAnimation, NPC_PARTNER, ANIM_Twink_Fly) + EVT_WAIT(20) + EVT_THREAD + EVT_EXEC_WAIT(N(EVS_Twink_FlyToHighPos)) + EVT_CALL(SetEnemyFlagBits, NPC_Twink, ENEMY_FLAG_8000000, 0) + EVT_CALL(SetNpcVar, NPC_Twink, 1, 1) + EVT_END_THREAD + EVT_SET(LVarA, 1) + EVT_GOTO(LBL_DECORATE_RESUME) + EVT_END_IF + + // step 1: add sugar & eggs + EVT_LABEL(LBL_ADD_SUGAR_EGGS) + EVT_SET(AB_KKJ19_CurrentBakeStep, BAKE_STEP_ADD_SUGAR_AND_EGGS) + EVT_SET(AB_KKJ19_BakeStepProgress, 0) + EVT_SET(AF_KKJ19_CanTakeIngredients, TRUE) + EVT_SET(AF_KKJ19_AddedSugar, FALSE) + EVT_SET(AF_KKJ19_AddedEgg, FALSE) + EVT_SET(AF_KKJ19_AddedNothingWrong, TRUE) + EVT_EXEC_WAIT(N(EVS_FocusCam_Twink)) + EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_Twink_ReadBook, ANIM_Twink_IdleBook, 0, MSG_Peach_00D1) + EVT_CALL(SetNpcAnimation, NPC_PARTNER, ANIM_Twink_CloseBook) + EVT_WAIT(10) + EVT_CALL(SetNpcAnimation, NPC_PARTNER, ANIM_Twink_Fly) + EVT_SET(LVarA, 1) + EVT_THREAD + EVT_EXEC_WAIT(N(EVS_Twink_FlyToHighPos)) + EVT_CALL(SetEnemyFlagBits, NPC_Twink, ENEMY_FLAG_8000000, 0) + EVT_CALL(SetNpcVar, NPC_Twink, 1, 1) + EVT_END_THREAD + // wait for peach to tell twink shes done + EVT_LABEL(LBL_ADD_SUGAR_EGGS_WAITING) + EVT_CALL(ResetCam, CAM_DEFAULT, EVT_FLOAT(4.0)) + EVT_IF_EQ(LVarA, 0) + EVT_CALL(SetEnemyFlagBits, NPC_Twink, ENEMY_FLAG_8000000, 0) + EVT_CALL(SetNpcVar, NPC_Twink, 1, 1) + EVT_END_IF + EVT_CALL(DisablePlayerInput, FALSE) + EVT_CALL(SetNpcVar, NPC_Twink, 0, 1) + EVT_LOOP(0) + EVT_WAIT(1) + EVT_CALL(GetNpcVar, NPC_Twink, 0, LVar0) + EVT_IF_EQ(LVar0, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_CALL(DisablePlayerInput, TRUE) + EVT_EXEC_WAIT(N(EVS_Twink_FlyToPlayer)) + EVT_EXEC_WAIT(N(EVS_FocusCam_PeachAndTwink)) + EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_Twink_Talk, ANIM_Twink_Idle, 0, MSG_Peach_00D2) + EVT_CALL(ShowChoice, MSG_Choice_0029) + EVT_IF_EQ(LVar0, 0) + EVT_IF_EQ(AB_KKJ19_BakeStepProgress, 0) + EVT_CALL(ContinueSpeech, NPC_PARTNER, ANIM_Twink_Talk, ANIM_Twink_Idle, 0, MSG_Peach_00BF) + EVT_CALL(NpcFlyTo, NPC_PARTNER, 390, 50, -70, 15, -5, EASING_LINEAR) + EVT_SET(LVarA, 0) + EVT_GOTO(LBL_ADD_SUGAR_EGGS_WAITING) + EVT_END_IF + EVT_END_IF + EVT_IF_EQ(LVar0, 1) + EVT_CALL(ContinueSpeech, NPC_PARTNER, ANIM_Twink_Talk, ANIM_Twink_Idle, 0, MSG_Peach_00D3) + EVT_CALL(NpcFlyTo, NPC_PARTNER, 390, 50, -70, 15, -5, EASING_LINEAR) + EVT_SET(LVarA, 0) + EVT_GOTO(LBL_ADD_SUGAR_EGGS_WAITING) + EVT_END_IF + EVT_IF_EQ(LVar0, 2) + EVT_GOTO(LBL_START_OVER) + EVT_END_IF + EVT_EXEC_WAIT(N(EVS_ReturnHeldIngredient)) + EVT_SET(LVar0, 0) + EVT_ADD(LVar0, AF_KKJ19_AddedSugar) + EVT_ADD(LVar0, AF_KKJ19_AddedEgg) + EVT_ADD(LVar0, AF_KKJ19_AddedNothingWrong) + EVT_IF_NE(LVar0, 3) + EVT_SET(AF_KKJ19_FailedBakingTask, TRUE) + EVT_END_IF + EVT_IF_EQ(AF_KKJ19_FailedBakingTask, FALSE) + EVT_SET(AB_KKJ_CompletedBakeStep, CAKE_TYPE_READY_TO_MIX) + EVT_END_IF + + // step 2: mix the ingredients + EVT_LABEL(LBL_MIX_FIRST) + EVT_EXEC_WAIT(N(EVS_FocusCam_Twink)) + EVT_CALL(SetNpcAnimation, NPC_PARTNER, ANIM_Twink_OpenBook) + EVT_WAIT(10) + EVT_CALL(ContinueSpeech, NPC_PARTNER, ANIM_Twink_ReadBook, ANIM_Twink_IdleBook, 0, MSG_Peach_00D4) + EVT_CALL(SetNpcAnimation, NPC_PARTNER, ANIM_Twink_CloseBook) + EVT_WAIT(10) + EVT_CALL(SetNpcAnimation, NPC_PARTNER, ANIM_Twink_Fly) + EVT_CALL(ResetCam, CAM_DEFAULT, EVT_FLOAT(2.0)) + EVT_EXEC(N(EVS_Twink_FlyToHighPos)) + // resume failed step from here + EVT_LABEL(LBL_MIX_RESUME) + EVT_SET(AB_KKJ19_CurrentBakeStep, BAKE_STEP_MIXING) + EVT_SET(AB_KKJ19_BakeStepProgress, 0) + EVT_SET(AF_KKJ19_CanTakeIngredients, FALSE) + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_CALL(SetPlayerSpeed, EVT_FLOAT(2.0)) + EVT_CALL(PlayerMoveTo, LVar0, -74, 0) + EVT_CALL(PlayerMoveTo, 287, -74, 0) + EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0014) + EVT_WAIT(10) + EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_Twink_Talk, ANIM_Twink_Idle, 5, MSG_Peach_00D5) + EVT_CALL(RemoveItemEntity, AB_KKJ19_CookwareItemIdx) + EVT_EXEC_GET_TID(N(EVS_UpdatePeachMixingAnimations), LVarA) + EVT_WAIT(10) + EVT_CALL(SetMusicTrack, 0, SONG_STIRRING_CAKE, 0, 8) + EVT_CALL(PlaySound, SOUND_GENERAL_WHISTLE) + EVT_THREAD + EVT_CALL(AdjustCam, CAM_DEFAULT, EVT_FLOAT(0.2), 0, 250, EVT_FLOAT(17.0), EVT_FLOAT(-7.0)) + EVT_END_THREAD + EVT_CALL(N(RunMixingMinigame), MIXING_TIME_IN_FRAMES) + EVT_CALL(PlaySound, SOUND_GENERAL_WHISTLE) + EVT_CALL(FadeOutMusic, 0, 500) + EVT_KILL_THREAD(LVarA) + EVT_IF_LT(LVar0, MIXING_REQUIRED_INPUTS) + EVT_SET(AF_KKJ19_FailedBakingTask, TRUE) + EVT_END_IF + EVT_WAIT(10) + EVT_THREAD + EVT_CALL(ResetCam, CAM_DEFAULT, EVT_FLOAT(5.0)) + EVT_END_THREAD + EVT_CALL(NpcFlyTo, NPC_PARTNER, 337, 35, -74, 30, -5, EASING_LINEAR) + EVT_WAIT(10) + EVT_EXEC(N(EVS_SetupMusic)) + EVT_EXEC_WAIT(N(EVS_FocusCam_PeachAndTwink)) + EVT_THREAD + EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0014) + EVT_CALL(MakeItemEntity, ITEM_CAKE_MIXED, 287, 16, -40, ITEM_SPAWN_MODE_DECORATION, 0) + EVT_SET(AB_KKJ19_CookwareItemIdx, LVar0) + EVT_END_THREAD + EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_Twink_Talk, ANIM_Twink_Idle, 5, MSG_Peach_00D6) + EVT_CALL(ShowChoice, MSG_Choice_002B) + EVT_IF_EQ(LVar0, 0) + EVT_CALL(EndSpeech, NPC_PARTNER, ANIM_Twink_Talk, ANIM_Twink_Idle, 5) + EVT_ELSE + EVT_CALL(ContinueSpeech, NPC_PARTNER, ANIM_Twink_Talk, ANIM_Twink_Idle, 5, MSG_Peach_00D7) + EVT_CALL(ShowChoice, MSG_Choice_002A) + EVT_IF_EQ(LVar0, 0) + EVT_CALL(EndSpeech, NPC_PARTNER, ANIM_Twink_Talk, ANIM_Twink_Idle, 5) + EVT_ELSE + EVT_GOTO(LBL_START_OVER) + EVT_END_IF + EVT_END_IF + EVT_IF_EQ(AF_KKJ19_FailedBakingTask, FALSE) + EVT_SET(AB_KKJ_CompletedBakeStep, CAKE_TYPE_MIXED) + EVT_END_IF + + // step 3: add flour and butter + EVT_LABEL(LBL_ADD_FLOUR_BUTTER_FIRST) + EVT_EXEC_WAIT(N(EVS_FocusCam_Twink)) + EVT_CALL(SetNpcAnimation, NPC_PARTNER, ANIM_Twink_OpenBook) + EVT_WAIT(10) + EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_Twink_ReadBook, ANIM_Twink_IdleBook, 5, MSG_Peach_00D8) + EVT_CALL(SetNpcAnimation, NPC_PARTNER, ANIM_Twink_CloseBook) + EVT_WAIT(10) + EVT_CALL(SetNpcAnimation, NPC_PARTNER, ANIM_Twink_Fly) + // resume failed step from here + EVT_LABEL(LBL_ADD_FLOUR_BUTTER_RESUME) + EVT_SET(AB_KKJ19_CurrentBakeStep, BAKE_STEP_ADD_FLOUR_AND_BUTTER) + EVT_SET(AB_KKJ19_BakeStepProgress, 0) + EVT_SET(AF_KKJ19_CanTakeIngredients, TRUE) + EVT_SET(AF_KKJ19_AddedFlour, FALSE) + EVT_SET(AF_KKJ19_AddedButter, FALSE) + EVT_SET(AF_KKJ19_AddedNothingWrong, TRUE) + EVT_SET(LVarA, 1) + EVT_THREAD + EVT_EXEC_WAIT(N(EVS_Twink_FlyToHighPos)) + EVT_CALL(SetEnemyFlagBits, NPC_Twink, ENEMY_FLAG_8000000, 0) + EVT_CALL(SetNpcVar, NPC_Twink, 1, 1) + EVT_END_THREAD + // wait for peach to tell twink shes done + EVT_LABEL(LBL_ADD_FLOUR_BUTTER_WAITING) + EVT_CALL(ResetCam, CAM_DEFAULT, EVT_FLOAT(4.0)) + EVT_IF_EQ(LVarA, 0) + EVT_CALL(SetEnemyFlagBits, NPC_Twink, ENEMY_FLAG_8000000, 0) + EVT_CALL(SetNpcVar, NPC_Twink, 1, 1) + EVT_END_IF + EVT_CALL(DisablePlayerInput, FALSE) + EVT_CALL(SetNpcVar, NPC_Twink, 0, 1) + EVT_LOOP(0) + EVT_WAIT(1) + EVT_CALL(GetNpcVar, NPC_Twink, 0, LVar0) + EVT_IF_EQ(LVar0, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_CALL(DisablePlayerInput, TRUE) + EVT_EXEC_WAIT(N(EVS_Twink_FlyToPlayer)) + EVT_EXEC_WAIT(N(EVS_FocusCam_PeachAndTwink)) + EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_Twink_Talk, ANIM_Twink_Idle, 0, MSG_Peach_00D9) + EVT_CALL(ShowChoice, MSG_Choice_0029) + EVT_IF_EQ(LVar0, 0) + EVT_IF_EQ(AB_KKJ19_BakeStepProgress, 0) + EVT_CALL(ContinueSpeech, NPC_PARTNER, ANIM_Twink_Talk, ANIM_Twink_Idle, 0, MSG_Peach_00BF) + EVT_CALL(NpcFlyTo, NPC_PARTNER, 390, 50, -70, 15, -5, EASING_LINEAR) + EVT_SET(LVarA, 0) + EVT_GOTO(LBL_ADD_FLOUR_BUTTER_WAITING) + EVT_ELSE + EVT_CALL(EndSpeech, NPC_PARTNER, ANIM_Twink_Talk, ANIM_Twink_Idle, 5) + EVT_END_IF + EVT_END_IF + EVT_IF_EQ(LVar0, 1) + EVT_CALL(ContinueSpeech, NPC_PARTNER, ANIM_Twink_Talk, ANIM_Twink_Idle, 0, MSG_Peach_00DA) + EVT_CALL(NpcFlyTo, NPC_PARTNER, 390, 50, -70, 15, -5, EASING_LINEAR) + EVT_SET(LVarA, 0) + EVT_GOTO(LBL_ADD_FLOUR_BUTTER_WAITING) + EVT_END_IF + EVT_IF_EQ(LVar0, 2) + EVT_GOTO(LBL_START_OVER) + EVT_END_IF + EVT_EXEC_WAIT(N(EVS_ReturnHeldIngredient)) + EVT_SET(LVar0, 0) + EVT_ADD(LVar0, AF_KKJ19_AddedFlour) + EVT_ADD(LVar0, AF_KKJ19_AddedButter) + EVT_ADD(LVar0, AF_KKJ19_AddedNothingWrong) + EVT_IF_NE(LVar0, 3) + EVT_SET(AF_KKJ19_FailedBakingTask, TRUE) + EVT_END_IF + EVT_IF_EQ(AF_KKJ19_FailedBakingTask, FALSE) + EVT_SET(AB_KKJ_CompletedBakeStep, CAKE_TYPE_READY_TO_BAKE) + EVT_END_IF + + // step 4: baking + EVT_LABEL(LBL_BAKE_FIRST) + EVT_EXEC_WAIT(N(EVS_FocusCam_Twink)) + EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_Twink_Talk, ANIM_Twink_Idle, 5, MSG_Peach_00DB) + EVT_CALL(ResetCam, CAM_DEFAULT, EVT_FLOAT(2.0)) + EVT_EXEC(N(EVS_Twink_FlyToHighPos)) + // resume failed step from here + EVT_LABEL(LBL_BAKE_RESUME) + EVT_SET(AB_KKJ19_CurrentBakeStep, BAKE_STEP_BAKING) + EVT_SET(AF_KKJ19_CanTakeIngredients, FALSE) + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_CALL(SetPlayerSpeed, EVT_FLOAT(2.0)) + EVT_CALL(PlayerMoveTo, LVar0, -74, 0) + EVT_CALL(PlayerMoveTo, 287, -74, 0) + EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0014) + EVT_WAIT(10) + EVT_CALL(RemoveItemEntity, AB_KKJ19_CookwareItemIdx) + EVT_CALL(SetPlayerAnimation, ANIM_Peach_C001F) + EVT_WAIT(40) + EVT_CALL(N(SetHeldBakingItem), PEACH_BAKING_CAKE_MIXED) + EVT_CALL(SetPlayerActionState, ACTION_STATE_IDLE) + EVT_WAIT(10) + EVT_THREAD + EVT_CALL(SetNpcSpeed, NPC_PARTNER, EVT_FLOAT(2.0)) + EVT_CALL(NpcFlyTo, NPC_PARTNER, 337, 35, -74, 0, -5, EASING_LINEAR) + EVT_END_THREAD + EVT_CALL(SetPlayerSpeed, EVT_FLOAT(2.0)) + EVT_CALL(PlayerMoveTo, 190, -70, 0) + EVT_CALL(InterpPlayerYaw, 90, 1) + EVT_CALL(PlayerMoveTo, 190, 35, 0) + EVT_CALL(PlayerMoveTo, 240, 35, 0) + EVT_CALL(InterpPlayerYaw, 350, 5) + EVT_WAIT(10) + EVT_CALL(SetPlayerAnimation, ANIM_Peach_D000C) + EVT_WAIT(20) + EVT_CALL(RemoveItemEntity, AB_KKJ19_CakeItemIdx) + EVT_CALL(MakeItemEntity, ITEM_CAKE_BATTER, 230, 16, 0, ITEM_SPAWN_MODE_DECORATION, 0) + EVT_SET(AB_KKJ19_CakeItemIdx, LVar0) + EVT_WAIT(10) + EVT_CALL(N(SetHeldBakingItem), PEACH_BAKING_NONE) + EVT_CALL(SetPlayerActionState, ACTION_STATE_IDLE) + EVT_CALL(MakeItemEntity, ITEM_CAKE_BOWL, 250, 16, 0, ITEM_SPAWN_MODE_DECORATION, 0) + EVT_SET(AB_KKJ19_CookwareItemIdx, LVar0) + EVT_WAIT(40) + EVT_EXEC_WAIT(N(EVS_FocusCam_Twink)) + EVT_CALL(SetNpcAnimation, NPC_PARTNER, ANIM_Twink_OpenBook) + EVT_WAIT(10) + EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_Twink_ReadBook, ANIM_Twink_IdleBook, 0, MSG_Peach_00DC) + EVT_CALL(SetNpcAnimation, NPC_PARTNER, ANIM_Twink_CloseBook) + EVT_WAIT(10) + EVT_CALL(SetNpcAnimation, NPC_PARTNER, ANIM_Twink_Fly) + EVT_CALL(ResetCam, CAM_DEFAULT, EVT_FLOAT(2.0)) + EVT_CALL(InterpPlayerYaw, 315, 0) + EVT_WAIT(10) + EVT_CALL(RemoveItemEntity, AB_KKJ19_CakeItemIdx) + EVT_CALL(N(SetHeldBakingItem), PEACH_BAKING_CAKE_BATTER) + EVT_CALL(SetPlayerActionState, ACTION_STATE_IDLE) + EVT_WAIT(10) + EVT_EXEC(N(EVS_FocusCam_Oven)) + EVT_THREAD + EVT_CALL(NpcFlyTo, NPC_PARTNER, 190, 60, -100, 50, -5, EASING_LINEAR) + EVT_END_THREAD + EVT_CALL(SetPlayerSpeed, EVT_FLOAT(2.0)) + EVT_CALL(PlayerMoveTo, 190, 30, 0) + EVT_CALL(PlayerMoveTo, 190, -100, 0) + EVT_CALL(PlayerMoveTo, 125, -100, 0) + EVT_WAIT(30) + EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_Twink_Talk, ANIM_Twink_Idle, 0, MSG_Peach_00DD) + EVT_CALL(InterpPlayerYaw, 315, 5) + EVT_WAIT(10) + EVT_CALL(N(AwaitPlayerPressATimer)) + EVT_EXEC_WAIT(N(EVS_OpenOverDoor)) + EVT_CALL(N(SetHeldBakingItem), PEACH_BAKING_NONE) + EVT_CALL(SetPlayerActionState, ACTION_STATE_IDLE) + EVT_CALL(MakeItemEntity, ITEM_CAKE_BATTER, 100, 5, -135, ITEM_SPAWN_MODE_DECORATION, 0) + EVT_SET(AB_KKJ19_CakeItemIdx, LVar0) + EVT_SET(LVar0, -135) + EVT_LOOP(30) + EVT_SUB(LVar0, 1) + EVT_CALL(SetItemPos, AB_KKJ19_CakeItemIdx, 100, 5, LVar0) + EVT_WAIT(1) + EVT_END_LOOP + EVT_EXEC_WAIT(N(EVS_CloseOverDoor)) + EVT_WAIT(10) + EVT_CALL(PlaySoundAt, SOUND_FF, 0, 100, 22, -178) + EVT_WAIT(20) + EVT_CALL(FadeOutMusic, 0, 500) + EVT_CALL(PlaySoundAt, SOUND_394, 0, 100, 22, -178) + EVT_CALL(N(AwaitPlayerPressATimer)) + EVT_CALL(StopSound, SOUND_394) + EVT_CALL(PlaySoundAt, SOUND_3F3, 0, 100, 22, -178) + EVT_WAIT(10) + // check baking time + EVT_IF_LT(LVar0, BAKING_TIME_MIN_FRAMES) + EVT_SET(AF_KKJ19_FailedBakingTask, TRUE) + EVT_END_IF + EVT_IF_GT(LVar0, BAKING_TIME_MAX_FRAMES) + EVT_SET(AF_KKJ19_FailedBakingTask, TRUE) + EVT_END_IF + EVT_EXEC(N(EVS_SetupMusic)) + EVT_EXEC_WAIT(N(EVS_OpenOverDoor)) + EVT_SET(LVar0, -165) + EVT_LOOP(30) + EVT_WAIT(1) + EVT_ADD(LVar0, 1) + EVT_CALL(SetItemPos, AB_KKJ19_CakeItemIdx, 100, 5, LVar0) + EVT_END_LOOP + EVT_CALL(RemoveItemEntity, AB_KKJ19_CakeItemIdx) + EVT_CALL(N(SetHeldBakingItem), PEACH_BAKING_CAKE_BATTER) + EVT_CALL(SetPlayerActionState, ACTION_STATE_IDLE) + EVT_EXEC_WAIT(N(EVS_CloseOverDoor)) + EVT_WAIT(10) + EVT_CALL(InterpPlayerYaw, 90, 5) + EVT_EXEC_WAIT(N(EVS_FocusCam_PeachAndTwink)) + EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_Twink_Talk, ANIM_Twink_Idle, 0, MSG_Peach_00DE) + EVT_CALL(ShowChoice, MSG_Choice_002B) + EVT_IF_NE(LVar0, 0) + EVT_CALL(ContinueSpeech, NPC_PARTNER, ANIM_Twink_Talk, ANIM_Twink_Idle, 0, MSG_Peach_00DF) + EVT_CALL(ShowChoice, MSG_Choice_002A) + EVT_IF_NE(LVar0, 0) + EVT_GOTO(LBL_START_OVER) + EVT_END_IF + EVT_END_IF + EVT_CALL(ContinueSpeech, NPC_PARTNER, ANIM_Twink_Talk, ANIM_Twink_Idle, 0, MSG_Peach_00E0) + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, 287, 0, -74) + EVT_CALL(SetPanTarget, CAM_DEFAULT, 287, 0, -74) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_EXEC(N(EVS_Twink_FlyToHighPos)) + EVT_CALL(PlayerMoveTo, 287, -74, 100) + EVT_CALL(N(SetHeldBakingItem), PEACH_BAKING_NONE) + EVT_CALL(SetPlayerActionState, ACTION_STATE_IDLE) + EVT_CALL(MakeItemEntity, ITEM_CAKE_BATTER, 287, 16, -40, ITEM_SPAWN_MODE_DECORATION, 0) + EVT_WAIT(30) + EVT_CALL(RemoveItemEntity, LVar0) + EVT_CALL(MakeItemEntity, ITEM_CAKE_BARE, 287, 20, -30, ITEM_SPAWN_MODE_DECORATION, 0) + EVT_SET(AB_KKJ19_CakeItemIdx, LVar0) + EVT_WAIT(10) + EVT_IF_EQ(AF_KKJ19_FailedBakingTask, FALSE) + EVT_SET(AB_KKJ_CompletedBakeStep, CAKE_TYPE_BAKED) + EVT_END_IF + + // step 5: decorating + EVT_LABEL(LBL_DECORATE_FIRST) + EVT_EXEC_WAIT(N(EVS_FocusCam_Twink)) + EVT_CALL(SetNpcAnimation, NPC_PARTNER, ANIM_Twink_OpenBook) + EVT_WAIT(10) + EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_Twink_ReadBook, ANIM_Twink_IdleBook, 0, MSG_Peach_00E1) + EVT_CALL(SetNpcAnimation, NPC_PARTNER, ANIM_Twink_CloseBook) + EVT_WAIT(10) + EVT_CALL(SetNpcAnimation, NPC_PARTNER, ANIM_Twink_Fly) + EVT_SET(LVarA, 0) + // resume failed step from here + EVT_LABEL(LBL_DECORATE_RESUME) + EVT_SET(AB_KKJ19_CurrentBakeStep, BAKE_STEP_DECORATING) + EVT_SET(AB_KKJ19_BakeStepProgress, 0) + EVT_SET(AF_KKJ19_CanTakeIngredients, TRUE) + EVT_SET(AB_KKJ19_AddedIcing, FALSE) + EVT_SET(AB_KKJ19_AddedBerries, FALSE) + // wait for peach to tell twink shes done + EVT_LABEL(LBL_DECORATE_WAITING) + EVT_CALL(ResetCam, CAM_DEFAULT, EVT_FLOAT(4.0)) + EVT_IF_EQ(LVarA, 0) + EVT_CALL(SetEnemyFlagBits, NPC_Twink, ENEMY_FLAG_8000000, 0) + EVT_CALL(SetNpcVar, NPC_Twink, 1, 1) + EVT_END_IF + EVT_CALL(DisablePlayerInput, FALSE) + EVT_CALL(SetNpcVar, NPC_Twink, 0, 1) + EVT_LOOP(0) + EVT_WAIT(1) + EVT_CALL(GetNpcVar, NPC_Twink, 0, LVar0) + EVT_IF_EQ(LVar0, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_CALL(DisablePlayerInput, TRUE) + EVT_EXEC_WAIT(N(EVS_Twink_FlyToPlayer)) + EVT_EXEC_WAIT(N(EVS_FocusCam_PeachAndTwink)) + EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_Twink_Talk, ANIM_Twink_Idle, 0, MSG_Peach_00E2) + EVT_CALL(ShowChoice, MSG_Choice_0029) + EVT_IF_EQ(LVar0, 0) + // chose 'done' + EVT_IF_EQ(AB_KKJ19_BakeStepProgress, 0) + EVT_CALL(ContinueSpeech, NPC_PARTNER, ANIM_Twink_Talk, ANIM_Twink_Idle, 0, MSG_Peach_00C0) + EVT_CALL(NpcFlyTo, NPC_PARTNER, 390, 50, -70, 15, -5, EASING_LINEAR) + EVT_SET(LVarA, 0) + EVT_GOTO(LBL_DECORATE_WAITING) + EVT_END_IF + EVT_END_IF + EVT_IF_EQ(LVar0, 1) + // chose 'not done' + EVT_CALL(ContinueSpeech, NPC_PARTNER, ANIM_Twink_Talk, ANIM_Twink_Idle, 0, MSG_Peach_00E3) + EVT_CALL(NpcFlyTo, NPC_PARTNER, 390, 50, -70, 15, -5, EASING_LINEAR) + EVT_SET(LVarA, 0) + EVT_GOTO(LBL_DECORATE_WAITING) + EVT_END_IF + EVT_IF_EQ(LVar0, 2) + // chose 'start over' + EVT_GOTO(LBL_START_OVER) + EVT_END_IF + EVT_EXEC_WAIT(N(EVS_ReturnHeldIngredient)) + EVT_IF_EQ(AB_KKJ19_AddedBerries, FALSE) + EVT_SET(AF_KKJ19_FailedBakingTask, TRUE) + EVT_END_IF + EVT_IF_EQ(AF_KKJ19_FailedBakingTask, FALSE) + EVT_SET(AB_KKJ_CompletedBakeStep, CAKE_TYPE_DONE) + EVT_END_IF + EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0009) + EVT_CALL(ContinueSpeech, NPC_PARTNER, ANIM_Twink_ShoutJoy, ANIM_Twink_ShoutJoy, 0, MSG_Peach_00E4) + EVT_CALL(SetPlayerAnimation, ANIM_Peach_A0001) + + // cake ready for gourmet guy (but not necessarily succcesful) + EVT_LABEL(LBL_FINISHED) + EVT_SET(AB_KKJ19_CurrentBakeStep, BAKE_STEP_DONE) + EVT_SET(AF_KKJ19_CanTakeIngredients, FALSE) + EVT_CALL(ResetCam, CAM_DEFAULT, EVT_FLOAT(5.0)) + EVT_EXEC(N(EVS_BindCakePickup)) + EVT_CALL(EnablePartnerAI) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_RETURN + + // starting over + EVT_LABEL(LBL_START_OVER) + EVT_CALL(ContinueSpeech, NPC_PARTNER, ANIM_Twink_Talk, ANIM_Twink_Idle, 5, MSG_Peach_00CD) + EVT_CALL(N(FadeScreenToBlack)) + EVT_EXEC_WAIT(N(EVS_ReturnHeldIngredient)) + EVT_CALL(N(SetHeldBakingItem), PEACH_BAKING_NONE) + EVT_CALL(SetPlayerActionState, ACTION_STATE_IDLE) + EVT_CALL(RemoveItemEntity, AB_KKJ19_CookwareItemIdx) + EVT_IF_NE(AB_KKJ19_CurrentBakeStep, BAKE_STEP_BAKING) + EVT_CALL(RemoveItemEntity, AB_KKJ19_CakeItemIdx) + EVT_END_IF + EVT_EXEC_WAIT(N(EVS_SetCookwareOnTable)) + EVT_CALL(SetNpcPos, NPC_PARTNER, 440, 25, -30) + EVT_CALL(SetNpcYaw, NPC_PARTNER, 270) + EVT_CALL(SetPlayerAnimation, ANIM_Peach_A0001) + EVT_CALL(SetPlayerPos, 400, 0, -30) + EVT_CALL(InterpPlayerYaw, 90, 0) + EVT_CALL(AdjustCam, CAM_DEFAULT, EVT_FLOAT(90.0), 0, 350, EVT_FLOAT(17.0), EVT_FLOAT(-7.0)) + EVT_WAIT(10) + EVT_CALL(N(FadeScreenFromBlack)) + EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_Twink_Talk, ANIM_Twink_Idle, 0, MSG_Peach_00CE) + EVT_CALL(SpeakToPlayer, NPC_PLAYER, ANIM_Peach_C0013, ANIM_Peach_C0012, 5, MSG_Peach_00CF) + EVT_CALL(SetPlayerAnimation, ANIM_Peach_A0001) + EVT_CALL(ContinueSpeech, NPC_PLAYER, ANIM_Peach_D0004, ANIM_Peach_A0001, 0, MSG_Peach_00D0) + EVT_WAIT(10) + EVT_CALL(SetNpcAnimation, NPC_PARTNER, ANIM_Twink_OpenBook) + EVT_WAIT(10) + EVT_CALL(SetNpcAnimation, NPC_PARTNER, ANIM_Twink_IdleBook) + EVT_GOTO(LBL_TRY_RESUME) + EVT_END +}; diff --git a/src/world/area_kkj/kkj_20/AFDB40.c b/src/world/area_kkj/kkj_20/AFDB40.c deleted file mode 100644 index f7707904f7..0000000000 --- a/src/world/area_kkj/kkj_20/AFDB40.c +++ /dev/null @@ -1,12 +0,0 @@ -#include "kkj_20.h" - -static char* N(exit_str_0) = "kkj_10"; -static char* N(exit_str_1) = ""; - -#include "world/common/todo/StashVars.inc.c" - -#include "world/common/todo/GetItemName.inc.c" - -#include "world/common/todo/SomeItemEntityFunc.inc.c" - -#include "world/common/todo/IsItemBadge.inc.c" diff --git a/src/world/area_kkj/kkj_20/AFDE00.c b/src/world/area_kkj/kkj_20/AFDE00.c deleted file mode 100644 index 1600db61bc..0000000000 --- a/src/world/area_kkj/kkj_20/AFDE00.c +++ /dev/null @@ -1,5 +0,0 @@ -#include "kkj_20.h" - -#include "world/common/atomic/ToadHouse.inc.c" - -#include "world/common/todo/GetPeachDisguise.inc.c" diff --git a/src/world/area_kkj/kkj_20/kkj_20.h b/src/world/area_kkj/kkj_20/kkj_20.h index 9440d96194..67ddc064d2 100644 --- a/src/world/area_kkj/kkj_20/kkj_20.h +++ b/src/world/area_kkj/kkj_20/kkj_20.h @@ -2,8 +2,25 @@ /// @brief Peach's Castle - Guest Room (1F) #include "common.h" -#include "../kkj.h" #include "message_ids.h" #include "map.h" +#include "../kkj.h" +#include "mapfs/kkj_20_shape.h" +#include "mapfs/kkj_20_hit.h" + +#include "sprite/npc/Toad.h" +#include "sprite/npc/Twink.h" + +enum { + NPC_Toad = 0, +}; + #define NAMESPACE kkj_20 + +extern EvtScript N(EVS_Main); +extern EvtScript N(EVS_PlayBowserSong); +extern EvtScript N(EVS_PlayRestingSong); +extern EvtScript N(EVS_MakeEntities); + +extern NpcGroupList N(DefaultNPCs); diff --git a/src/world/area_kkj/kkj_20/kkj_20_0_header.c b/src/world/area_kkj/kkj_20/kkj_20_0_header.c new file mode 100644 index 0000000000..e557d73a1d --- /dev/null +++ b/src/world/area_kkj/kkj_20/kkj_20_0_header.c @@ -0,0 +1,12 @@ +#include "kkj_20.h" + +EntryList N(Entrances) = { + [kkj_20_ENTRY_0] { -185.0, 0.0, -25.0, 90.0 }, +}; + +MapSettings N(settings) = { + .main = &N(EVS_Main), + .entryList = &N(Entrances), + .entryCount = ENTRY_COUNT(N(Entrances)), + .tattle = { MSG_MapTattle_kkj_20 }, +}; diff --git a/src/world/area_kkj/kkj_20/kkj_20_1_music.c b/src/world/area_kkj/kkj_20/kkj_20_1_music.c new file mode 100644 index 0000000000..cbe6c351c6 --- /dev/null +++ b/src/world/area_kkj/kkj_20/kkj_20_1_music.c @@ -0,0 +1,13 @@ +#include "kkj_20.h" + +EvtScript N(EVS_PlayBowserSong) = { + EVT_CALL(SetMusicTrack, 0, SONG_BOWSER_ATTACKS, 1, 8) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_PlayRestingSong) = { + EVT_CALL(SetMusicTrack, 0, SONG_TAKING_REST, 0, 8) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_kkj/kkj_20/kkj_20_2_main.c b/src/world/area_kkj/kkj_20/kkj_20_2_main.c new file mode 100644 index 0000000000..7ae664c196 --- /dev/null +++ b/src/world/area_kkj/kkj_20/kkj_20_2_main.c @@ -0,0 +1,38 @@ +#include "kkj_20.h" + +EvtScript N(EVS_ExitDoor_kkj_10_4) = { + EVT_SET_GROUP(EVT_GROUP_1B) + EVT_CALL(DisablePlayerInput, TRUE) + EVT_SET(LVar0, kkj_20_ENTRY_0) + EVT_SET(LVar1, COLLIDER_ttw) + EVT_SET(LVar2, MODEL_o9) + EVT_SET(LVar3, DOOR_SWING_IN) + EVT_EXEC(ExitSingleDoor) + EVT_WAIT(17) + EVT_CALL(GotoMap, EVT_PTR("kkj_10"), kkj_10_ENTRY_4) + EVT_WAIT(100) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_EnterMap) = { + EVT_SET(LVar0, kkj_20_ENTRY_0) + EVT_SET(LVar2, MODEL_o9) + EVT_SET(LVar3, DOOR_SWING_IN) + EVT_EXEC_WAIT(EnterSingleDoor) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Main) = { + EVT_SET(GB_WorldLocation, LOCATION_PEACHS_CASTLE) + EVT_CALL(SetSpriteShading, SHADING_KKJ_20) + EVT_SETUP_CAMERA_NO_LEAD() + EVT_CALL(MakeNpcs, FALSE, EVT_PTR(N(DefaultNPCs))) + EVT_EXEC_WAIT(N(EVS_MakeEntities)) + EVT_CALL(UseDoorSounds, DOOR_SOUNDS_BASIC) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitDoor_kkj_10_4)), TRIGGER_WALL_PRESS_A, COLLIDER_ttw, 1, 0) + EVT_EXEC(N(EVS_EnterMap)) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_kkj/kkj_20/kkj_20_3_entity.c b/src/world/area_kkj/kkj_20/kkj_20_3_entity.c new file mode 100644 index 0000000000..94aa8c99b2 --- /dev/null +++ b/src/world/area_kkj/kkj_20/kkj_20_3_entity.c @@ -0,0 +1,27 @@ +#include "kkj_20.h" +#include "entity.h" + +#include "world/common/entity/Chest.inc.c" + +EvtScript N(EVS_OpenChest_LastStand) = { + EVT_SET(LVarA, ITEM_LAST_STAND) + EVT_CALL(DisablePlayerInput, TRUE) + EVT_SET(LVar0, LVarA) + EVT_EXEC_WAIT(N(EVS_Chest_ShowGotItem)) + EVT_IF_GE(GB_StoryProgress, STORY_CH8_REACHED_PEACHS_CASTLE) + EVT_CALL(AddBadge, LVarA, LVar0) + EVT_END_IF + EVT_SET(GF_KKJ20_Chest_LastStand, TRUE) + EVT_WAIT(15) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_MakeEntities) = { + EVT_CALL(MakeEntity, EVT_PTR(Entity_Chest), 95, 0, 0, 0, 0, MAKE_ENTITY_END) + EVT_CALL(AssignChestFlag, GF_KKJ20_Chest_LastStand) + EVT_CALL(AssignScript, EVT_PTR(N(EVS_OpenChest_LastStand))) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_kkj/kkj_20/kkj_20_4_npc.c b/src/world/area_kkj/kkj_20/kkj_20_4_npc.c new file mode 100644 index 0000000000..4acc676de8 --- /dev/null +++ b/src/world/area_kkj/kkj_20/kkj_20_4_npc.c @@ -0,0 +1,355 @@ +#include "kkj_20.h" + +#include "world/common/npc/Toad_Stationary.inc.c" + +#include "world/common/complete/ToadHouseBlanketAnim.inc.c" +#include "world/common/atomic/ToadHouse.inc.c" +#include "world/common/atomic/ToadHouse.data.inc.c" + +#include "world/common/todo/GetPeachDisguise.inc.c" + +EvtScript N(EVS_OpenDresserDoors) = { + EVT_CALL(PlaySoundAtCollider, COLLIDER_o80, SOUND_1CF, 0) + EVT_CALL(MakeLerp, 0, 80, 14, EASING_QUADRATIC_OUT) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_CALL(RotateGroup, MODEL_g16, LVar0, 0, 1, 0) + EVT_CALL(RotateGroup, MODEL_g15, LVar0, 0, -1, 0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_CloseDresserDoors) = { + EVT_CALL(MakeLerp, 80, 0, 14, EASING_QUADRATIC_OUT) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_CALL(RotateGroup, MODEL_g16, LVar0, 0, 1, 0) + EVT_CALL(RotateGroup, MODEL_g15, LVar0, 0, -1, 0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_CALL(PlaySoundAtCollider, COLLIDER_o80, SOUND_1D0, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_ShakeDresser) = { + EVT_LOOP(0) + EVT_CALL(TranslateGroup, MODEL_g9, 1, 0, 0) + EVT_WAIT(1) + EVT_CALL(TranslateGroup, MODEL_g9, -1, 0, 0) + EVT_WAIT(1) + EVT_CALL(TranslateGroup, MODEL_g9, 0, 0, 0) + EVT_WAIT(30) + EVT_CALL(GetSelfVar, 0, LVar0) + EVT_IF_EQ(LVar0, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Inspect_Dresser_Peach) = { + EVT_CALL(N(GetPeachDisguise), LVar0) + EVT_IF_NE(LVar0, PEACH_DISGUISE_NONE) + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(SpeakToPlayer, NPC_Toad, ANIM_Toad_Red_Talk, ANIM_Toad_Red_Idle, 0, MSG_Peach_0185) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_RETURN + EVT_END_IF + EVT_IF_NE(GF_KKJ20_PeachMet_ToadInHiding, FALSE) + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(SpeakToPlayer, NPC_Toad, ANIM_Toad_Red_Talk, ANIM_Toad_Red_Idle, 0, MSG_Peach_0185) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_RETURN + EVT_END_IF + EVT_CALL(SetNpcVar, NPC_Toad, 0, 0) + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(SetCamProperties, CAM_DEFAULT, EVT_FLOAT(4.0), -10, 0, 80, EVT_FLOAT(300.0), EVT_FLOAT(17.0), EVT_FLOAT(-10.0)) + EVT_THREAD + EVT_CALL(SetPlayerSpeed, EVT_FLOAT(2.0)) + EVT_CALL(PlayerMoveTo, -50, 0, 0) + EVT_CALL(InterpPlayerYaw, 90, 5) + EVT_CALL(func_802CF56C, 2) + EVT_END_THREAD + EVT_WAIT(10) + EVT_EXEC(N(EVS_OpenDresserDoors)) + EVT_WAIT(30) + EVT_CALL(SetNpcJumpscale, NPC_Toad, EVT_FLOAT(1.0)) + EVT_CALL(NpcJump0, NPC_Toad, -10, 0, -40, 15) + EVT_CALL(SetNpcAnimation, NPC_Toad, ANIM_Toad_Red_Walk) + EVT_CALL(NpcMoveTo, NPC_Toad, 30, 0, 20) + EVT_CALL(SetNpcAnimation, NPC_Toad, ANIM_Toad_Red_Idle) + EVT_CALL(InterpNpcYaw, NPC_Toad, 270, 5) + EVT_WAIT(10) + EVT_CALL(SpeakToPlayer, NPC_Toad, ANIM_Toad_Red_Talk, ANIM_Toad_Red_Idle, 0, MSG_Peach_0182) + EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0000) + EVT_WAIT(10) + EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0026) + EVT_CALL(SpeakToPlayer, NPC_PLAYER, ANIM_Peach_C0001, ANIM_Peach_C0026, 5, MSG_Peach_0183) + EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0002) + EVT_WAIT(10) + EVT_CALL(SetPlayerAnimation, ANIM_Peach_A0001) + EVT_CALL(SpeakToPlayer, NPC_Toad, ANIM_Toad_Red_Talk, ANIM_Toad_Red_Idle, 0, MSG_Peach_0184) + EVT_CALL(SetNpcAnimation, NPC_Toad, ANIM_Toad_Red_Walk) + EVT_CALL(SetNpcSpeed, NPC_Toad, EVT_FLOAT(3.0)) + EVT_CALL(NpcMoveTo, NPC_Toad, -10, -60, 0) + EVT_CALL(SetNpcAnimation, NPC_Toad, ANIM_Toad_Red_Idle) + EVT_WAIT(10) + EVT_CALL(NpcJump0, NPC_Toad, -10, 30, -132, 10) + EVT_EXEC(N(EVS_CloseDresserDoors)) + EVT_WAIT(30) + EVT_SET(GF_KKJ20_PeachMet_ToadInHiding, TRUE) + EVT_CALL(ResetCam, CAM_DEFAULT, EVT_FLOAT(4.0)) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_ToadHouse_SetDialogue) = { + EVT_IF_EQ(GF_KKJ20_Met_ToadInHiding, FALSE) + EVT_SET(LVar0, MSG_Peach_0187) + EVT_SET(LVar8, MSG_Peach_0188) + EVT_SET(GF_KKJ20_Met_ToadInHiding, TRUE) + EVT_ELSE + EVT_SET(LVar0, MSG_Peach_0189) + EVT_SET(LVar8, MSG_Peach_018A) + EVT_END_IF + EVT_SET(LVar1, MSG_Peach_018B) + EVT_SET(LVar2, MSG_Peach_018C) + EVT_SET(LVar3, MSG_Peach_018D) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_ToadHouse_GetInBed) = { + EVT_EXEC(N(EVS_PlayRestingSong)) + EVT_CALL(SetPlayerSpeed, EVT_FLOAT(3.0)) + EVT_CALL(PlayerMoveTo, 50, -40, 0) + EVT_THREAD + EVT_WAIT(20) + EVT_CALL(N(ToadHouse_CamSetFOV), 0, 40) + EVT_CALL(SetCamType, CAM_DEFAULT, 4, FALSE) + EVT_CALL(SetCamDistance, CAM_DEFAULT, EVT_FLOAT(200.0)) + EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(70.0), EVT_FLOAT(-30.0)) + EVT_CALL(SetCamPosA, CAM_DEFAULT, EVT_FLOAT(-260.0), EVT_FLOAT(270.0)) + EVT_CALL(SetCamPosB, CAM_DEFAULT, EVT_FLOAT(30.0), EVT_FLOAT(-85.0)) + EVT_CALL(SetCamPosC, CAM_DEFAULT, 0, EVT_FLOAT(-50.0)) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(90.0)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_END_THREAD + EVT_CALL(PlayerMoveTo, 95, -87, 0) + EVT_CALL(InterpPlayerYaw, 229, 1) + EVT_CALL(HidePlayerShadow, TRUE) + EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_CALL(func_802D286C, 0x800) + EVT_CALL(func_802D2520, ANIM_Mario_10002, FOLD_TYPE_5, 7, 1, 1, 0) + EVT_THREAD + EVT_WAIT(60) + EVT_CALL(SetPlayerAnimation, ANIM_Mario_8001D) + EVT_END_THREAD + EVT_WAIT(20) + EVT_THREAD + EVT_WAIT(65) + EVT_CALL(N(ToadHouse_CamSetFOV), 0, 25) + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_WAIT(1) + EVT_END_THREAD + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_ToadHouse_ReturnFromRest) = { + EVT_CALL(HidePlayerShadow, FALSE) + EVT_CALL(func_802D2520, ANIM_Mario_10002, FOLD_TYPE_NONE, 0, 0, 0, 0) + EVT_CALL(SetPlayerPos, 85, 0, -85) + EVT_CALL(SetPlayerSpeed, EVT_FLOAT(3.0)) + EVT_CALL(PlayerMoveTo, 60, -50, 0) + EVT_EXEC(N(EVS_PlayBowserSong)) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_MeetToadHouseKeeper) = { + EVT_CALL(N(ToadHouse_InitScreenOverlay), 0, 0, 0) + EVT_EXEC_WAIT(N(EVS_ToadHouse_SetDialogue)) + EVT_SET(LVar9, LVar1) + EVT_SET(LVarA, LVar2) + EVT_SET(LVarB, LVar3) + EVT_CALL(N(ToadHouse_DoesPlayerNeedSleep)) + EVT_IF_EQ(LVar1, 0) + EVT_SET(LVar8, LVar0) + EVT_END_IF + EVT_CALL(SpeakToPlayer, NPC_Toad, ANIM_Toad_Red_Talk, ANIM_Toad_Red_Idle, 0, LVar8) + EVT_CALL(ShowChoice, MSG_Choice_0006) + EVT_WAIT(10) + EVT_IF_EQ(LVar0, 1) + EVT_CALL(ContinueSpeech, NPC_Toad, ANIM_Toad_Red_Talk, ANIM_Toad_Red_Idle, 0, LVar9) + EVT_RETURN + EVT_END_IF + EVT_CALL(ContinueSpeech, NPC_Toad, ANIM_Toad_Red_Talk, ANIM_Toad_Red_Idle, 0, LVarA) + EVT_CALL(SetPlayerJumpscale, 1) + EVT_CALL(DisablePlayerPhysics, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_Toad, NPC_FLAG_100, TRUE) + EVT_CALL(N(ToadHouse_DisableStatusMenu)) + EVT_IF_NE(LVar4, 0) + EVT_EXEC(N(EVS_ToadHouse_Unk2)) + EVT_END_IF + EVT_CALL(N(ToadHouse_PutPartnerAway), LVarA) + EVT_WAIT(20) + EVT_EXEC_GET_TID(N(EVS_ToadHouse_GetInBed), LVar9) + EVT_CALL(N(ToadHouse_AwaitScriptComplete), LVar9) + EVT_THREAD + EVT_CALL(MakeLerp, 0, 255, 60, EASING_LINEAR) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_CALL(N(ToadHouse_UpdateScreenOverlay), 3, LVar0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_CALL(FullyRestoreHPandFP) + EVT_CALL(FullyRestoreSP) + EVT_IF_NE(LVar4, 0) + EVT_EXEC(N(EVS_ToadHouse_Unk1)) + EVT_END_IF + EVT_CALL(N(ToadHouse_GetPartnerBackOut), LVarA) + EVT_WAIT(30) + EVT_CALL(MakeLerp, 255, 0, 30, EASING_LINEAR) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_CALL(N(ToadHouse_UpdateScreenOverlay), 0, LVar0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_END_THREAD + EVT_WAIT(90) + EVT_EXEC_GET_TID(N(EVS_ToadHouse_ReturnFromRest), LVar9) + EVT_CALL(N(ToadHouse_AwaitScriptComplete), LVar9) + EVT_CALL(DisablePlayerPhysics, FALSE) + EVT_CALL(SetNpcFlagBits, NPC_Toad, NPC_FLAG_100, FALSE) + EVT_CALL(SpeakToPlayer, NPC_Toad, ANIM_Toad_Red_Talk, ANIM_Toad_Red_Idle, 0, LVarB) + EVT_CALL(N(ToadHouse_ShowStatusMenu)) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Inspect_Dresser_Mario) = { + EVT_CALL(SetNpcVar, NPC_Toad, 0, 0) + EVT_CALL(DisablePlayerInput, TRUE) + EVT_EXEC(N(EVS_OpenDresserDoors)) + EVT_WAIT(30) + EVT_CALL(SetNpcJumpscale, NPC_Toad, EVT_FLOAT(1.0)) + EVT_CALL(NpcJump0, NPC_Toad, -10, 0, -40, 15) + EVT_CALL(PlayerFaceNpc, NPC_Toad, FALSE) + EVT_CALL(NpcFaceNpc, NPC_PARTNER, NPC_Toad, 0) + EVT_EXEC(N(EVS_CloseDresserDoors)) + EVT_CALL(SetNpcAnimation, NPC_Toad, ANIM_Toad_Red_Walk) + EVT_CALL(NpcMoveTo, NPC_Toad, 30, 0, 20) + EVT_CALL(SetNpcAnimation, NPC_Toad, ANIM_Toad_Red_Idle) + EVT_CALL(InterpNpcYaw, NPC_Toad, 270, 5) + EVT_WAIT(10) + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, -10, 0, 80) + EVT_CALL(SetPanTarget, CAM_DEFAULT, -10, 0, 80) + EVT_CALL(SetCamDistance, CAM_DEFAULT, 250) + EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(18.0), EVT_FLOAT(-11.0)) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(4.0)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_CALL(func_802D1270, -50, 0, EVT_FLOAT(2.5)) + EVT_CALL(InterpPlayerYaw, 90, 5) + EVT_CALL(func_802CF56C, 2) + EVT_WAIT(10) + EVT_CALL(SpeakToPlayer, NPC_Toad, ANIM_Toad_Red_Talk, ANIM_Toad_Red_Idle, 0, MSG_Peach_0186) + EVT_CALL(GetNpcPos, NPC_Toad, LVar0, LVar1, LVar2) + EVT_CALL(NpcJump0, NPC_Toad, LVar0, LVar1, LVar2, 10) + EVT_EXEC_WAIT(N(EVS_MeetToadHouseKeeper)) + EVT_CALL(ResetCam, CAM_DEFAULT, EVT_FLOAT(90.0)) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_UNBIND + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcIdle_Toad) = { + EVT_CALL(WaitForPlayerInputEnabled) + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(DisablePartnerAI, 1) + EVT_CALL(SetNpcJumpscale, NPC_PARTNER, EVT_FLOAT(0.5)) + EVT_CALL(NpcJump0, NPC_PARTNER, -86, 40, -25, 15) + EVT_WAIT(10) + EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_Twink_Talk, ANIM_Twink_Idle, 5, MSG_Peach_0181) + EVT_CALL(NpcFlyTo, NPC_PARTNER, -165, 55, -25, 20, -5, EASING_LINEAR) + EVT_CALL(InterpNpcYaw, NPC_PARTNER, 90, 0) + EVT_CALL(EnablePartnerAI) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInteract_Toad) = { + EVT_EXEC_WAIT(N(EVS_NpcInteract_ToadHouseKeeper)) + EVT_CALL(ResetCam, CAM_DEFAULT, EVT_FLOAT(90.0)) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_Toad) = { + EVT_SWITCH(GB_StoryProgress) + EVT_CASE_OR_EQ(STORY_CH4_BEGAN_PEACH_MISSION) + EVT_CASE_OR_EQ(STORY_CH5_BEGAN_PEACH_MISSION) + EVT_CASE_OR_EQ(STORY_CH6_BEGAN_PEACH_MISSION) + EVT_CALL(SetNpcPos, NPC_SELF, -10, 30, -132) + EVT_CALL(SetNpcYaw, NPC_SELF, 270) + EVT_IF_EQ(GF_KKJ20_PeachMet_ToadInHiding, FALSE) + EVT_CALL(SetSelfVar, 0, 1) + EVT_EXEC(N(EVS_ShakeDresser)) + EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(EVS_NpcIdle_Toad))) + EVT_END_IF + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_Inspect_Dresser_Peach)), TRIGGER_WALL_PRESS_A, COLLIDER_o80, 1, 0) + EVT_END_CASE_GROUP + EVT_CASE_DEFAULT + EVT_IF_EQ(GF_KKJ20_Met_ToadInHiding, FALSE) + EVT_CALL(SetNpcPos, NPC_SELF, -10, 30, -132) + EVT_CALL(SetSelfVar, 0, 1) + EVT_EXEC(N(EVS_ShakeDresser)) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_Inspect_Dresser_Mario)), TRIGGER_WALL_PRESS_A, COLLIDER_o80, 1, 0) + EVT_ELSE + EVT_CALL(SetNpcPos, NPC_SELF, 30, 0, 0) + EVT_END_IF + EVT_CALL(SetNpcYaw, NPC_SELF, 270) + EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(EVS_NpcInteract_Toad))) + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +NpcData N(NpcData_Toad) = { + .id = NPC_Toad, + .pos = { NPC_DISPOSE_LOCATION }, + .yaw = 0, + .init = &N(EVS_NpcInit_Toad), + .settings = &N(NpcSettings_Toad_Stationary), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = NO_DROPS, + .animations = TOAD_RED_ANIMS, + .tattle = MSG_NpcTattle_KKJ_ToadHouseToad, +}; + +NpcGroupList N(DefaultNPCs) = { + NPC_GROUP(N(NpcData_Toad)), + {} +}; diff --git a/src/world/area_kkj/kkj_21/B022A0.c b/src/world/area_kkj/kkj_21/B022A0.c deleted file mode 100644 index 0562b6f72a..0000000000 --- a/src/world/area_kkj/kkj_21/B022A0.c +++ /dev/null @@ -1,3 +0,0 @@ -#include "kkj_21.h" - -static char* N(exit_str_0) = "kkj_10"; diff --git a/src/world/area_kkj/kkj_21/kkj_21.h b/src/world/area_kkj/kkj_21/kkj_21.h index f00f0d0c8b..8efcc6b6d6 100644 --- a/src/world/area_kkj/kkj_21/kkj_21.h +++ b/src/world/area_kkj/kkj_21/kkj_21.h @@ -2,8 +2,14 @@ /// @brief Peach's Castle - Inactive Quiz-Off (1F) #include "common.h" -#include "../kkj.h" #include "message_ids.h" #include "map.h" +#include "../kkj.h" +#include "mapfs/kkj_21_shape.h" +#include "mapfs/kkj_21_hit.h" + #define NAMESPACE kkj_21 + +extern EvtScript N(EVS_Main); + diff --git a/src/world/area_kkj/kkj_21/kkj_21_0_header.c b/src/world/area_kkj/kkj_21/kkj_21_0_header.c new file mode 100644 index 0000000000..4d000e9279 --- /dev/null +++ b/src/world/area_kkj/kkj_21/kkj_21_0_header.c @@ -0,0 +1,12 @@ +#include "kkj_21.h" + +EntryList N(Entrances) = { + [kkj_21_ENTRY_0] { 325.0, 0.0, -30.0, 270.0 }, +}; + +MapSettings N(settings) = { + .main = &N(EVS_Main), + .entryList = &N(Entrances), + .entryCount = ENTRY_COUNT(N(Entrances)), + .tattle = { MSG_MapTattle_kkj_21 }, +}; diff --git a/src/world/area_kkj/kkj_21/kkj_21_1_main.c b/src/world/area_kkj/kkj_21/kkj_21_1_main.c new file mode 100644 index 0000000000..75463c8fcb --- /dev/null +++ b/src/world/area_kkj/kkj_21/kkj_21_1_main.c @@ -0,0 +1,40 @@ +#include "kkj_21.h" + +EvtScript N(EVS_ExitDoor_kkj_10_2) = { + EVT_SET_GROUP(EVT_GROUP_1B) + EVT_CALL(DisablePlayerInput, TRUE) + EVT_SET(LVar0, kkj_21_ENTRY_0) + EVT_SET(LVar1, COLLIDER_tte) + EVT_SET(LVar2, MODEL_o57) + EVT_SET(LVar3, DOOR_SWING_IN) + EVT_EXEC(ExitSingleDoor) + EVT_WAIT(17) + EVT_CALL(GotoMap, EVT_PTR("kkj_10"), kkj_10_ENTRY_2) + EVT_WAIT(100) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_EnterMap) = { + EVT_CALL(GetEntryID, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_EQ(kkj_21_ENTRY_0) + EVT_SET(LVar2, MODEL_o57) + EVT_SET(LVar3, DOOR_SWING_IN) + EVT_EXEC_WAIT(EnterSingleDoor) + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Main) = { + EVT_SET(GB_WorldLocation, LOCATION_PEACHS_CASTLE) + EVT_CALL(SetSpriteShading, SHADING_NONE) + EVT_SETUP_CAMERA_NO_LEAD() + EVT_CALL(UseDoorSounds, DOOR_SOUNDS_BASIC) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitDoor_kkj_10_2)), TRIGGER_WALL_PRESS_A, COLLIDER_tte, 1, 0) + EVT_EXEC(N(EVS_EnterMap)) + EVT_WAIT(1) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_kkj/kkj_22/B024F0.c b/src/world/area_kkj/kkj_22/B024F0.c deleted file mode 100644 index 731d4c4997..0000000000 --- a/src/world/area_kkj/kkj_22/B024F0.c +++ /dev/null @@ -1,4 +0,0 @@ -#include "kkj_22.h" - -static char* N(exit_str_0) = "kkj_13"; -static char* N(exit_str_1) = "kkj_23"; diff --git a/src/world/area_kkj/kkj_22/kkj_22.h b/src/world/area_kkj/kkj_22/kkj_22.h index 52fa722d21..016e929ce5 100644 --- a/src/world/area_kkj/kkj_22/kkj_22.h +++ b/src/world/area_kkj/kkj_22/kkj_22.h @@ -2,8 +2,14 @@ /// @brief Peach's Castle - Double Staircase (4F) #include "common.h" -#include "../kkj.h" #include "message_ids.h" #include "map.h" +#include "../kkj.h" +#include "mapfs/kkj_22_shape.h" +#include "mapfs/kkj_22_hit.h" + #define NAMESPACE kkj_22 + +extern EvtScript N(EVS_Main); +extern EvtScript N(EVS_SetupMusic); diff --git a/src/world/area_kkj/kkj_22/kkj_22_0_header.c b/src/world/area_kkj/kkj_22/kkj_22_0_header.c new file mode 100644 index 0000000000..3862eb9f5b --- /dev/null +++ b/src/world/area_kkj/kkj_22/kkj_22_0_header.c @@ -0,0 +1,14 @@ +#include "kkj_22.h" + +EntryList N(Entrances) = { + [kkj_22_ENTRY_0] { -225.0, 0.0, -45.0, 90.0 }, + [kkj_22_ENTRY_1] { -395.0, 300.0, -115.0, 90.0 }, +}; + +MapSettings N(settings) = { + .main = &N(EVS_Main), + .entryList = &N(Entrances), + .entryCount = ENTRY_COUNT(N(Entrances)), + .background = &gBackgroundImage, + .tattle = { MSG_MapTattle_kkj_22 }, +}; diff --git a/src/world/area_kkj/kkj_22/kkj_22_1_music.c b/src/world/area_kkj/kkj_22/kkj_22_1_music.c new file mode 100644 index 0000000000..29562853d6 --- /dev/null +++ b/src/world/area_kkj/kkj_22/kkj_22_1_music.c @@ -0,0 +1,9 @@ +#include "kkj_22.h" + +EvtScript N(EVS_SetupMusic) = { + EVT_IF_GE(GB_StoryProgress, STORY_CH8_REACHED_PEACHS_CASTLE) + EVT_CALL(SetMusicTrack, 0, SONG_BOWSER_THEME, 0, 8) + EVT_END_IF + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_kkj/kkj_22/kkj_22_2_main.c b/src/world/area_kkj/kkj_22/kkj_22_2_main.c new file mode 100644 index 0000000000..0704b2f626 --- /dev/null +++ b/src/world/area_kkj/kkj_22/kkj_22_2_main.c @@ -0,0 +1,33 @@ +#include "kkj_22.h" + +EvtScript N(EVS_ExitDoor_kkj_13_1) = EVT_EXIT_DOUBLE_DOOR(kkj_22_ENTRY_0, "kkj_13", kkj_13_ENTRY_1, COLLIDER_ttw, MODEL_o51, MODEL_o52); +EvtScript N(EVS_ExitDoor_kkj_23_0) = EVT_EXIT_DOUBLE_DOOR(kkj_22_ENTRY_1, "kkj_23", kkj_23_ENTRY_0, COLLIDER_ttnw, MODEL_o94, MODEL_o95); + +EvtScript N(EVS_EnterMap) = { + EVT_CALL(GetEntryID, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_EQ(kkj_22_ENTRY_0) + EVT_SET(LVar2, MODEL_o51) + EVT_SET(LVar3, MODEL_o52) + EVT_EXEC_WAIT(EnterDoubleDoor) + EVT_CASE_EQ(kkj_22_ENTRY_1) + EVT_SET(LVar2, MODEL_o94) + EVT_SET(LVar3, MODEL_o95) + EVT_EXEC_WAIT(EnterDoubleDoor) + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Main) = { + EVT_SET(GB_WorldLocation, LOCATION_PEACHS_CASTLE) + EVT_CALL(SetSpriteShading, SHADING_KKJ_22) + EVT_SETUP_CAMERA_DEFAULT() + EVT_EXEC(N(EVS_SetupMusic)) + EVT_CALL(UseDoorSounds, DOOR_SOUNDS_LARGE) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitDoor_kkj_13_1)), TRIGGER_WALL_PRESS_A, COLLIDER_ttw, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitDoor_kkj_23_0)), TRIGGER_WALL_PRESS_A, COLLIDER_ttnw, 1, 0) + EVT_EXEC(N(EVS_EnterMap)) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_kkj/kkj_23/B02880.c b/src/world/area_kkj/kkj_23/B02880.c deleted file mode 100644 index 4847f662f2..0000000000 --- a/src/world/area_kkj/kkj_23/B02880.c +++ /dev/null @@ -1,8 +0,0 @@ -#include "kkj_23.h" - -static char* N(exit_str_0) = "flo_00"; -static char* N(exit_str_1) = "kkj_22"; -static char* N(exit_str_2) = "kkj_24"; -static char* N(exit_str_3) = ""; - -#include "world/common/todo/SetPlayerSpriteSet2_MapInit.inc.c" diff --git a/src/world/area_kkj/kkj_23/B028A0.c b/src/world/area_kkj/kkj_23/B028A0.c deleted file mode 100644 index 77a6372304..0000000000 --- a/src/world/area_kkj/kkj_23/B028A0.c +++ /dev/null @@ -1,40 +0,0 @@ -#include "kkj_23.h" - -ApiStatus func_80240020_B028A0(Evt* script, s32 isInitialCall) { - gGameStatusPtr->peachFlags &= ~PEACH_STATUS_FLAG_IS_PEACH; - gPlayerData.currentPartner = script->varTable[0]; - - return ApiStatus_DONE2; -} - -ApiStatus func_80240048_B028C8(Evt* script, s32 isInitialCall) { - Bytecode* args = script->ptrReadPos; - - gPlayerStatus.availableDisguiseType = evt_get_float_variable(script, *args++); - return ApiStatus_DONE2; -} - -ApiStatus func_80240080_B02900(Evt* script, s32 isInitialCall) { - Npc *npc = get_npc_safe(1); - f32 x = npc->pos.x; - f32 y = npc->pos.y; - f32 z = npc->pos.z; - - sfx_adjust_env_sound_pos(SOUND_23D, SOUND_SPACE_MODE_0, x, y, z); - script->varTable[0] = y; - - return ApiStatus_DONE2; -} - -#include "world/common/atomic/UnkPhysicsFuncs.inc.c" - -#include "world/common/todo/GetPeachDisguise.inc.c" - -ApiStatus func_80240784_B03004(Evt* script, s32 isInitialCall) { - gGameStatusPtr->peachFlags |= PEACH_STATUS_FLAG_8; - return ApiStatus_DONE2; -} - -#include "world/common/todo/UnkGooberFunc50.inc.c" - -const char* kkj_23_str = "kkj_14"; diff --git a/src/world/area_kkj/kkj_23/B03190.c b/src/world/area_kkj/kkj_23/B03190.c deleted file mode 100644 index 08480851aa..0000000000 --- a/src/world/area_kkj/kkj_23/B03190.c +++ /dev/null @@ -1,23 +0,0 @@ -#include "kkj_23.h" -#include "effects.h" - -void peach_force_disguise_action(s32); - -ApiStatus func_80240910_B03190(Evt* script, s32 isInitialCall) { - Bytecode* args = script->ptrReadPos; - EffectInstance* effect = (EffectInstance*) evt_get_variable(script, *args++); - s32 var1 = evt_get_variable(script, *args++); - s32 var2 = evt_get_variable(script, *args++); - s32 var3 = evt_get_variable(script, *args++); - - effect->data.any[12] = var1; - effect->data.any[13] = var2; - effect->data.any[14] = var3; - - return ApiStatus_DONE2; -} - -ApiStatus func_802409AC_B0322C(Evt* script, s32 isInitialCall) { - peach_force_disguise_action(FALSE); - return ApiStatus_DONE2; -} diff --git a/src/world/area_kkj/kkj_23/kkj_23.h b/src/world/area_kkj/kkj_23/kkj_23.h index aa6aa56707..ac45b575f4 100644 --- a/src/world/area_kkj/kkj_23/kkj_23.h +++ b/src/world/area_kkj/kkj_23/kkj_23.h @@ -2,8 +2,35 @@ /// @brief Peach's Castle - Rooftop (5F) #include "common.h" -#include "../kkj.h" #include "message_ids.h" #include "map.h" +#include "../kkj.h" +#include "mapfs/kkj_23_shape.h" +#include "mapfs/kkj_23_hit.h" + +#include "sprite/npc/WorldBowser.h" +#include "sprite/npc/WorldKoopatrol.h" +#include "sprite/npc/WorldKammy.h" + +enum { + // peach + NPC_Kammy = 0, + NPC_Koopatrol_01 = 1, + NPC_Koopatrol_02 = 2, + // finale + NPC_Bowser_Body = 0, + NPC_Bowser_Prop = 1, + NPC_Peach = 2, +}; + #define NAMESPACE kkj_23 + +extern EvtScript N(EVS_Main); +extern EvtScript N(EVS_SetupMusic); +extern EvtScript N(EVS_Scene_KammyUnmasksPeach); +extern EvtScript N(EVS_BowserTauntMario); +extern EvtScript N(EVS_EndPeachChapter6); + +extern NpcGroupList N(PeachNPCs); +extern NpcGroupList N(FinaleNPCs); diff --git a/src/world/area_kkj/kkj_23/kkj_23_0_header.c b/src/world/area_kkj/kkj_23/kkj_23_0_header.c new file mode 100644 index 0000000000..5446d6f2fc --- /dev/null +++ b/src/world/area_kkj/kkj_23/kkj_23_0_header.c @@ -0,0 +1,16 @@ +#include "kkj_23.h" + +#include "world/common/todo/SetPlayerSpriteSet2_MapInit.inc.c" + +EntryList N(Entrances) = { + [kkj_23_ENTRY_0] { 735.0, 0.0, -60.0, 270.0 }, + [kkj_23_ENTRY_1] { 10.0, 0.0, -60.0, 90.0 }, +}; + +MapSettings N(settings) = { + .main = &N(EVS_Main), + .entryList = &N(Entrances), + .entryCount = ENTRY_COUNT(N(Entrances)), + .background = &gBackgroundImage, + .tattle = { MSG_MapTattle_kkj_23 }, +}; diff --git a/src/world/area_kkj/kkj_23/kkj_23_1_music.c b/src/world/area_kkj/kkj_23/kkj_23_1_music.c new file mode 100644 index 0000000000..54a01c37fd --- /dev/null +++ b/src/world/area_kkj/kkj_23/kkj_23_1_music.c @@ -0,0 +1,9 @@ +#include "kkj_23.h" + +EvtScript N(EVS_SetupMusic) = { + EVT_IF_GE(GB_StoryProgress, STORY_CH8_REACHED_PEACHS_CASTLE) + EVT_CALL(SetMusicTrack, 0, SONG_BOWSER_THEME, 0, 8) + EVT_END_IF + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_kkj/kkj_23/kkj_23_2_main.c b/src/world/area_kkj/kkj_23/kkj_23_2_main.c new file mode 100644 index 0000000000..37f779be30 --- /dev/null +++ b/src/world/area_kkj/kkj_23/kkj_23_2_main.c @@ -0,0 +1,71 @@ +#include "kkj_23.h" + +#include "../common/RestoreFromPeachState.inc.c" +#include "../common/SetAvailableDisguise.inc.c" + +EvtScript N(EVS_EndPeachChapter6) = { + EVT_SET(LVar0, GB_KKJ_LastPartner) + EVT_CALL(N(RestoreFromPeachState)) + EVT_CALL(PlaySound, SOUND_DC) + EVT_CALL(GotoMapSpecial, EVT_PTR("flo_00"), flo_00_ENTRY_A, TRANSITION_12) + EVT_WAIT(100) +}; //@bug script not properly terminated + +EvtScript N(EVS_ExitDoors_kkj_22_1) = { + EVT_SET_GROUP(EVT_GROUP_1B) + EVT_CALL(DisablePlayerInput, TRUE) + EVT_SET(LVar0, kkj_23_ENTRY_0) + EVT_SET(LVar1, COLLIDER_tte) + EVT_SET(LVar2, MODEL_o5) + EVT_SET(LVar3, MODEL_o4) + EVT_EXEC(ExitDoubleDoor) + EVT_WAIT(17) + EVT_CALL(GotoMap, EVT_PTR("kkj_22"), kkj_22_ENTRY_1) + EVT_WAIT(100) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_ExitDoors_kkj_24_0) = EVT_EXIT_DOUBLE_DOOR(kkj_23_ENTRY_1, "kkj_24", kkj_24_ENTRY_0, COLLIDER_ttw, MODEL_o9, MODEL_o10); + +MAP_RODATA_PAD(1, exits); + +EvtScript N(EVS_EnterMap) = { + EVT_CALL(GetEntryID, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_EQ(kkj_23_ENTRY_0) + EVT_SET(LVar2, MODEL_o5) + EVT_SET(LVar3, MODEL_o4) + EVT_EXEC_WAIT(EnterDoubleDoor) + EVT_IF_EQ(GB_StoryProgress, STORY_CH6_BEGAN_PEACH_MISSION) + EVT_EXEC(N(EVS_Scene_KammyUnmasksPeach)) + EVT_ELSE + EVT_EXEC(N(EVS_BowserTauntMario)) + EVT_END_IF + EVT_CASE_EQ(kkj_23_ENTRY_1) + EVT_SET(LVar2, MODEL_o9) + EVT_SET(LVar3, MODEL_o10) + EVT_EXEC_WAIT(EnterDoubleDoor) + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Main) = { + EVT_SET(GB_WorldLocation, LOCATION_PEACHS_CASTLE) + EVT_CALL(SetSpriteShading, SHADING_KKJ_23) + EVT_SETUP_CAMERA_DEFAULT() + EVT_IF_EQ(GB_StoryProgress, STORY_CH6_BEGAN_PEACH_MISSION) + EVT_CALL(N(SetAvailableDisguise), PEACH_DISGUISE_KOOPATROL) + EVT_CALL(MakeNpcs, FALSE, EVT_PTR(N(PeachNPCs))) + EVT_ELSE + EVT_CALL(MakeNpcs, FALSE, EVT_PTR(N(FinaleNPCs))) + EVT_END_IF + EVT_EXEC(N(EVS_SetupMusic)) + EVT_CALL(UseDoorSounds, DOOR_SOUNDS_LARGE) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitDoors_kkj_24_0)), TRIGGER_WALL_PRESS_A, COLLIDER_ttw, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitDoors_kkj_22_1)), TRIGGER_WALL_PRESS_A, COLLIDER_tte, 1, 0) + EVT_EXEC(N(EVS_EnterMap)) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_kkj/kkj_23/kkj_23_3_npcs_finale.c b/src/world/area_kkj/kkj_23/kkj_23_3_npcs_finale.c new file mode 100644 index 0000000000..60939d2b95 --- /dev/null +++ b/src/world/area_kkj/kkj_23/kkj_23_3_npcs_finale.c @@ -0,0 +1,208 @@ +#include "kkj_23.h" + +#include "world/common/npc/Bowser.inc.c" +#include "world/common/npc/Dummy.inc.c" +#include "world/common/npc/Peach.h" + +Vec3f N(FlyAwayPath)[] = { + { 250.0, 10.0, -240.0 }, + { 220.0, 0.0, -260.0 }, + { 205.0, 40.0, -280.0 }, + { 170.0, 190.0, -300.0 }, +}; + +API_CALLABLE(N(UpdatePropellerSoundPos)) { + Npc *npc = get_npc_safe(NPC_Bowser_Prop); + f32 x = npc->pos.x; + f32 y = npc->pos.y; + f32 z = npc->pos.z; + + sfx_adjust_env_sound_pos(SOUND_23D, SOUND_SPACE_MODE_0, x, y, z); + script->varTable[0] = y; + + return ApiStatus_DONE2; +} + +EvtScript N(EVS_UpdatePropellerSounds) = { + EVT_CALL(PlaySoundAtNpc, NPC_Bowser_Prop, SOUND_80000066, 0) + EVT_LOOP(0) + EVT_CALL(N(UpdatePropellerSoundPos)) + EVT_IF_LT(LVar0, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_WAIT(1) + EVT_END_LOOP + EVT_CALL(StopSound, SOUND_80000066) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_BowserTauntMario) = { + EVT_IF_EQ(GF_KKJ13_BowserTaunts, TRUE) + EVT_IF_EQ(GF_KKJ23_BowserFledToTower, TRUE) + EVT_RETURN + EVT_END_IF + EVT_END_IF + EVT_CALL(SetNpcAnimation, NPC_Bowser_Body, ANIM_WorldBowser_ClownCarIdle) + EVT_CALL(AwaitPlayerApproach, 100, -60, 300) + EVT_SET(GF_KKJ23_BowserFledToTower, TRUE) + EVT_THREAD + EVT_CALL(SetNpcAnimation, NPC_Bowser_Body, ANIM_WorldBowser_ClownCarLaugh) + EVT_WAIT(30) + EVT_CALL(SetNpcAnimation, NPC_Bowser_Body, ANIM_WorldBowser_ClownCarIdle) + EVT_END_THREAD + EVT_CALL(AwaitPlayerApproach, 0, -60, 250) + EVT_CALL(LoadPath, 30, EVT_PTR(N(FlyAwayPath)), ARRAY_COUNT(N(FlyAwayPath)), EASING_LINEAR) + EVT_LABEL(0) + EVT_CALL(GetNextPathPos) + EVT_CALL(SetNpcPos, NPC_Bowser_Body, LVar1, LVar2, LVar3) + EVT_CALL(SetNpcPos, NPC_Bowser_Prop, LVar1, LVar2, LVar3) + EVT_ADD(LVar1, 28) + EVT_ADD(LVar2, 40) + EVT_ADD(LVar3, -3) + EVT_CALL(SetNpcPos, NPC_Peach, LVar1, LVar2, LVar3) + EVT_WAIT(1) + EVT_IF_EQ(LVar0, 1) + EVT_GOTO(0) + EVT_END_IF + EVT_CALL(SetNpcPos, NPC_Bowser_Body, NPC_DISPOSE_LOCATION) + EVT_CALL(SetNpcPos, NPC_Bowser_Prop, NPC_DISPOSE_LOCATION) + EVT_RETURN + EVT_END +}; + +s32 N(HoverYOffsets)[] = { + 1, 2, 3, 2, 1, + -1, -2, -3, -2, -1, +}; + +EvtScript N(EVS_NpcIdle_Bowser_Body) = { + EVT_LABEL(0) + EVT_USE_BUF(EVT_PTR(N(HoverYOffsets))) + EVT_LOOP(10) + EVT_BUF_READ1(LVar1) + EVT_CALL(GetNpcPos, NPC_Bowser_Body, LVar2, LVar3, LVar4) + EVT_ADD(LVar3, LVar1) + EVT_CALL(SetNpcPos, NPC_Bowser_Body, LVar2, LVar3, LVar4) + EVT_WAIT(3) + EVT_END_LOOP + EVT_GOTO(0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcIdle_Bowser_Propeller) = { + EVT_LABEL(0) + EVT_USE_BUF(EVT_PTR(N(HoverYOffsets))) + EVT_LOOP(10) + EVT_BUF_READ1(LVar1) + EVT_CALL(GetNpcPos, NPC_Bowser_Prop, LVar2, LVar3, LVar4) + EVT_ADD(LVar3, LVar1) + EVT_CALL(SetNpcPos, NPC_Bowser_Prop, LVar2, LVar3, LVar4) + EVT_WAIT(3) + EVT_END_LOOP + EVT_GOTO(0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcIdle_Peach) = { + EVT_LABEL(0) + EVT_USE_BUF(EVT_PTR(N(HoverYOffsets))) + EVT_LOOP(10) + EVT_BUF_READ1(LVar1) + EVT_CALL(GetNpcPos, NPC_Peach, LVar2, LVar3, LVar4) + EVT_ADD(LVar3, LVar1) + EVT_CALL(SetNpcPos, NPC_Peach, LVar2, LVar3, LVar4) + EVT_WAIT(3) + EVT_END_LOOP + EVT_GOTO(0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_Bowser_Body) = { + EVT_CALL(SetNpcPos, NPC_Bowser_Body, NPC_DISPOSE_LOCATION) + EVT_IF_EQ(GF_KKJ13_BowserTaunts, TRUE) + EVT_IF_EQ(GF_KKJ23_BowserFledToTower, TRUE) + EVT_RETURN + EVT_END_IF + EVT_END_IF + EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(EVS_NpcIdle_Bowser_Body))) + EVT_CALL(SetNpcYaw, NPC_SELF, 90) + EVT_CALL(SetNpcPos, NPC_SELF, 250, 10, -250) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_WorldBowser_ClownCarIdle) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_Bowser_Propeller) = { + EVT_CALL(SetNpcPos, NPC_Bowser_Prop, NPC_DISPOSE_LOCATION) + EVT_IF_EQ(GF_KKJ13_BowserTaunts, TRUE) + EVT_IF_EQ(GF_KKJ23_BowserFledToTower, TRUE) + EVT_RETURN + EVT_END_IF + EVT_END_IF + EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(EVS_NpcIdle_Bowser_Propeller))) + EVT_CALL(SetNpcYaw, NPC_SELF, 90) + EVT_CALL(SetNpcPos, NPC_SELF, 250, 10, -250) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_WorldBowser_ClownCarPropeller) + EVT_EXEC(N(EVS_UpdatePropellerSounds)) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_Peach) = { + EVT_CALL(SetNpcPos, NPC_Peach, NPC_DISPOSE_LOCATION) + EVT_IF_EQ(GF_KKJ13_BowserTaunts, TRUE) + EVT_IF_EQ(GF_KKJ23_BowserFledToTower, TRUE) + EVT_RETURN + EVT_END_IF + EVT_END_IF + EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(EVS_NpcIdle_Peach))) + EVT_CALL(SetNpcYaw, NPC_SELF, 90) + EVT_CALL(SetNpcPos, NPC_Peach, 278, 50, -253) + EVT_CALL(SetNpcAnimation, NPC_Peach, ANIM_Peach_C001E) + EVT_RETURN + EVT_END +}; + +NpcData N(NpcData_Bowser_Body) = { + .id = NPC_Bowser_Body, + .pos = { 0.0f, 0.0f, 0.0f }, + .yaw = 270, + .init = &N(EVS_NpcInit_Bowser_Body), + .settings = &N(NpcSettings_Bowser), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = NO_DROPS, + .animations = BOWSER_ANIMS, +}; + +NpcData N(NpcData_Bowser_Prop) = { + .id = NPC_Bowser_Prop, + .pos = { 0.0f, 0.0f, 0.0f }, + .yaw = 270, + .init = &N(EVS_NpcInit_Bowser_Propeller), + .settings = &N(NpcSettings_Dummy), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = NO_DROPS, + .animations = BOWSER_ANIMS, +}; + +NpcData N(NpcData_Peach) = { + .id = NPC_Peach, + .pos = { 0.0f, 0.0f, 0.0f }, + .yaw = 270, + .init = &N(EVS_NpcInit_Peach), + .settings = &N(NpcSettings_Dummy), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_20000, + .drops = NO_DROPS, + .animations = PEACH_ANIMS, +}; + +NpcGroupList N(FinaleNPCs) = { + NPC_GROUP(N(NpcData_Bowser_Body)), + NPC_GROUP(N(NpcData_Bowser_Prop)), + NPC_GROUP(N(NpcData_Peach)), + {} +}; diff --git a/src/world/area_kkj/kkj_23/kkj_23_4_npcs_peach.c b/src/world/area_kkj/kkj_23/kkj_23_4_npcs_peach.c new file mode 100644 index 0000000000..88e20af477 --- /dev/null +++ b/src/world/area_kkj/kkj_23/kkj_23_4_npcs_peach.c @@ -0,0 +1,170 @@ +#include "kkj_23.h" + +#include "../common/Searchlights.inc.c" + +#include "world/common/todo/GetPeachDisguise.inc.c" +#include "../common/SetPeachFlag8.inc.c" +#include "../common/ApproachPlayer50Units.inc.c" + +#include "world/common/enemy/Kammy.inc.c" +#include "world/common/enemy/Koopatrol_Stationary.inc.c" + +AnimID N(ExtraAnims_Koopatrol)[] = { + ANIM_WorldKoopatrol_Anim00, + ANIM_WorldKoopatrol_Anim01, + ANIM_WorldKoopatrol_Anim02, + ANIM_WorldKoopatrol_Anim04, + ANIM_WorldKoopatrol_Anim05, + ANIM_WorldKoopatrol_Anim06, + ANIM_WorldKoopatrol_Anim07, + ANIM_WorldKoopatrol_Anim08, + ANIM_WorldKoopatrol_Anim09, + ANIM_WorldKoopatrol_Anim12, + ANIM_WorldKoopatrol_Anim14, + ANIM_WorldKoopatrol_Anim1B, + ANIM_LIST_END +}; + +EvtScript N(EVS_NpcInteract_Koopatrol_01) = { + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(GetSelfVar, 0, LVar0) + EVT_IF_EQ(LVar0, 0) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_WorldKoopatrol_Anim08, ANIM_WorldKoopatrol_Anim01, 0, MSG_Peach_014D) + EVT_CALL(SetSelfVar, 0, 1) + EVT_ELSE + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_WorldKoopatrol_Anim08, ANIM_WorldKoopatrol_Anim01, 0, MSG_Peach_014E) + EVT_CALL(SetSelfVar, 0, 0) + EVT_END_IF + EVT_CALL(InterpNpcYaw, NPC_SELF, 90, 0) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_CapturePeach) = { + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(N(SetPeachFlag8)) + EVT_SET_GROUP(EVT_GROUP_00) + EVT_CALL(SetTimeFreezeMode, TIME_FREEZE_PARTIAL) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_262, 0) + EVT_CALL(ShowEmote, NPC_SELF, EMOTE_EXCLAMATION, 0, 20, TRUE, 0, 0, 0, 0) + EVT_CALL(NpcFacePlayer, NPC_SELF, 0) + EVT_WAIT(20) + EVT_CALL(PlayerFaceNpc, NPC_SELF, FALSE) + EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0005) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_WorldKoopatrol_Anim01) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_WorldKoopatrol_Anim08, ANIM_WorldKoopatrol_Anim01, 0, MSG_Peach_0174) + EVT_CALL(N(ApproachPlayer50Units), -1, LVar3, LVar0, LVar2) + EVT_IF_NE(LVar3, 0) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_WorldKoopatrol_Anim06) + EVT_CALL(SetNpcSpeed, NPC_SELF, EVT_FLOAT(5.0)) + EVT_CALL(NpcMoveTo, NPC_SELF, LVar0, LVar2, 0) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_WorldKoopatrol_Anim01) + EVT_END_IF + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_WorldKoopatrol_Anim08, ANIM_WorldKoopatrol_Anim01, 0, MSG_Peach_0175) + EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0017) + EVT_WAIT(20) + EVT_CALL(GotoMapSpecial, EVT_PTR("kkj_14"), kkj_14_ENTRY_B, TRANSITION_13) + EVT_WAIT(100) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Koopatrol_WatchForPeach) = { + EVT_LOOP(0) + EVT_CALL(N(GetPeachDisguise), LVar1) + EVT_IF_EQ(LVar1, PEACH_DISGUISE_NONE) + EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_8000000, 1) + EVT_CALL(BindNpcAI, NPC_SELF, EVT_PTR(N(EVS_CapturePeach))) + EVT_RETURN + EVT_ELSE + EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_8000000, 0) + EVT_END_IF + EVT_WAIT(1) + EVT_END_LOOP + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcIdle_Koopatrol_01) = { + EVT_EXEC_GET_TID(N(EVS_Koopatrol_WatchForPeach), LVarA) + EVT_CALL(SetSelfVar, 1, 1) + EVT_LOOP(0) + EVT_WAIT(1) + EVT_CALL(GetSelfVar, 1, LVar0) + EVT_IF_EQ(LVar0, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_KILL_THREAD(LVarA) + EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_8000000, 1) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_Koopatrol_01) = { + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_WorldKoopatrol_Anim01) + EVT_CALL(SetNpcPos, NPC_SELF, 140, 0, -80) + EVT_CALL(SetNpcYaw, NPC_SELF, 90) + EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(EVS_NpcIdle_Koopatrol_01))) + EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(EVS_NpcInteract_Koopatrol_01))) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_Koopatrol_02) = { + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_WorldKoopatrol_Anim01) + EVT_CALL(SetNpcPos, NPC_SELF, 40, 0, -80) + EVT_CALL(SetNpcYaw, NPC_SELF, 90) + EVT_RETURN + EVT_END +}; + +AnimID N(ExtraAnims_Kammy)[] = { + ANIM_WorldKammy_Anim01, + ANIM_WorldKammy_Anim02, + ANIM_WorldKammy_Anim04, + ANIM_WorldKammy_Anim05, + ANIM_LIST_END +}; + +NpcData N(NpcData_Kammy)[] = { + { + .id = NPC_Kammy, + .pos = { 0.0f, -500.0f, 0.0f }, + .yaw = 270, + .settings = &N(NpcSettings_Kammy), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = NO_DROPS, + .animations = KAMMY_ANIMS, + .extraAnimations = N(ExtraAnims_Kammy), + }, + { + .id = NPC_Koopatrol_01, + .pos = { 0.0f, -500.0f, 0.0f }, + .yaw = 0, + .init = &N(EVS_NpcInit_Koopatrol_01), + .settings = &N(NpcSettings_Koopatrol_Stationary), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_400000, + .drops = NO_DROPS, + .animations = KOOPATROL_ANIMS, + .extraAnimations = N(ExtraAnims_Koopatrol), + }, + { + .id = NPC_Koopatrol_02, + .pos = { 0.0f, -500.0f, 0.0f }, + .yaw = 0, + .init = &N(EVS_NpcInit_Koopatrol_02), + .settings = &N(NpcSettings_Koopatrol_Stationary), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = NO_DROPS, + .animations = KOOPATROL_ANIMS, + .extraAnimations = N(ExtraAnims_Koopatrol), + }, +}; + +NpcGroupList N(PeachNPCs) = { + NPC_GROUP(N(NpcData_Kammy)), + {} +}; diff --git a/src/world/area_kkj/kkj_23/kkj_23_5_scene.c b/src/world/area_kkj/kkj_23/kkj_23_5_scene.c new file mode 100644 index 0000000000..07ff29bfec --- /dev/null +++ b/src/world/area_kkj/kkj_23/kkj_23_5_scene.c @@ -0,0 +1,347 @@ +#include "kkj_23.h" +#include "effects.h" + +void peach_force_disguise_action(s32); + +API_CALLABLE(N(SetLightningBoltColor)) { + Bytecode* args = script->ptrReadPos; + EffectInstance* effect = (EffectInstance*) evt_get_variable(script, *args++); + s32 r = evt_get_variable(script, *args++); + s32 g = evt_get_variable(script, *args++); + s32 b = evt_get_variable(script, *args++); + + effect->data.lightningBolt->outerColor.r = r; + effect->data.lightningBolt->outerColor.g = g; + effect->data.lightningBolt->outerColor.b = b; + + return ApiStatus_DONE2; +} + +API_CALLABLE(N(ForceDisguiseLoss)) { + peach_force_disguise_action(FALSE); + return ApiStatus_DONE2; +} + +EvtScript N(EVS_ApproachPeach) = { + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_THREAD + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_ADD(LVar0, 26) + EVT_ADD(LVar2, 2) + EVT_CALL(SetNpcAnimation, NPC_Koopatrol_01, ANIM_WorldKoopatrol_Anim06) + EVT_CALL(SetNpcSpeed, NPC_Koopatrol_01, EVT_FLOAT(5.0)) + EVT_CALL(NpcMoveTo, NPC_Koopatrol_01, LVar0, LVar2, 0) + EVT_CALL(SetNpcAnimation, NPC_Koopatrol_01, ANIM_WorldKoopatrol_Anim01) + EVT_CALL(NpcFacePlayer, NPC_Koopatrol_01, 5) + EVT_END_THREAD + EVT_CALL(SetNpcVar, NPC_Koopatrol_02, 0, 1) + EVT_THREAD + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_SUB(LVar0, 26) + EVT_SUB(LVar2, 2) + EVT_CALL(SetNpcAnimation, NPC_Koopatrol_02, ANIM_WorldKoopatrol_Anim06) + EVT_CALL(SetNpcSpeed, NPC_Koopatrol_02, EVT_FLOAT(5.0)) + EVT_CALL(NpcMoveTo, NPC_Koopatrol_02, LVar0, LVar2, 0) + EVT_CALL(SetNpcAnimation, NPC_Koopatrol_02, ANIM_WorldKoopatrol_Anim01) + EVT_CALL(NpcFacePlayer, NPC_Koopatrol_02, 5) + EVT_CALL(SetNpcVar, NPC_Koopatrol_02, 0, 0) + EVT_END_THREAD + EVT_LOOP(0) + EVT_WAIT(1) + EVT_CALL(GetNpcVar, NPC_Koopatrol_02, 0, LVar0) + EVT_IF_EQ(LVar0, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_WAIT(10) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_PickUpPeach) = { + EVT_THREAD + EVT_CALL(GetNpcPos, NPC_Koopatrol_01, LVar0, LVar1, LVar2) + EVT_SUB(LVar0, 5) + EVT_CALL(NpcMoveTo, NPC_Koopatrol_01, LVar0, LVar2, 5) + EVT_CALL(SetNpcAnimation, NPC_Koopatrol_01, ANIM_WorldKoopatrol_Anim12) + EVT_SUB(LVar0, 5) + EVT_CALL(NpcMoveTo, NPC_Koopatrol_01, LVar0, LVar2, 5) + EVT_END_THREAD + EVT_THREAD + EVT_CALL(GetNpcPos, NPC_Koopatrol_02, LVar0, LVar1, LVar2) + EVT_ADD(LVar0, 5) + EVT_CALL(NpcMoveTo, NPC_Koopatrol_02, LVar0, LVar2, 5) + EVT_CALL(SetNpcAnimation, NPC_Koopatrol_02, ANIM_WorldKoopatrol_Anim12) + EVT_ADD(LVar0, 5) + EVT_CALL(NpcMoveTo, NPC_Koopatrol_02, LVar0, LVar2, 5) + EVT_END_THREAD + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0005) + EVT_WAIT(1) + EVT_LOOP(4) + EVT_ADD(LVar1, 2) + EVT_CALL(SetPlayerPos, LVar0, LVar1, LVar2) + EVT_WAIT(1) + EVT_END_LOOP + EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0018) + EVT_SUB(LVar0, 15) + EVT_LOOP(5) + EVT_ADD(LVar1, 4) + EVT_CALL(SetPlayerPos, LVar0, LVar1, LVar2) + EVT_WAIT(1) + EVT_END_LOOP + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_CarryPeachAway) = { + EVT_CALL(InterpNpcYaw, NPC_Koopatrol_01, 90, 3) + EVT_WAIT(10) + EVT_THREAD + EVT_LOOP(0) + EVT_CALL(GetNpcPos, NPC_Koopatrol_02, LVar0, LVar1, LVar2) + EVT_ADD(LVar0, 10) + EVT_ADD(LVar2, 2) + EVT_CALL(SetPlayerPos, LVar0, 30, LVar2) + EVT_WAIT(1) + EVT_END_LOOP + EVT_END_THREAD + EVT_THREAD + EVT_CALL(SetNpcAnimation, NPC_Koopatrol_02, ANIM_WorldKoopatrol_Anim14) + EVT_CALL(SetNpcSpeed, NPC_Koopatrol_02, EVT_FLOAT(5.0)) + EVT_CALL(NpcMoveTo, NPC_Koopatrol_02, 684, -52, 0) + EVT_END_THREAD + EVT_THREAD + EVT_CALL(SetNpcAnimation, NPC_Koopatrol_01, ANIM_WorldKoopatrol_Anim14) + EVT_CALL(SetNpcSpeed, NPC_Koopatrol_01, EVT_FLOAT(5.0)) + EVT_CALL(NpcMoveTo, NPC_Koopatrol_01, 716, -48, 0) + EVT_END_THREAD + EVT_CALL(GetNpcPos, NPC_Kammy, LVar0, LVar1, LVar2) + EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(0.5)) + EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_OpenAndCloseTowerDoors) = { + EVT_CALL(PlaySoundAtCollider, COLLIDER_ttw, SOUND_LARGE_DOOR_OPEN, 0) + EVT_CALL(MakeLerp, 0, 80, 14, EASING_QUADRATIC_OUT) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_CALL(RotateModel, MODEL_o9, LVar0, 0, -1, 0) + EVT_CALL(RotateModel, MODEL_o10, LVar0, 0, 1, 0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_WAIT(20) + EVT_CALL(MakeLerp, 80, 0, 14, EASING_QUADRATIC_OUT) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_CALL(RotateModel, MODEL_o9, LVar0, 0, -1, 0) + EVT_CALL(RotateModel, MODEL_o10, LVar0, 0, 1, 0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_CALL(PlaySoundAtCollider, COLLIDER_ttw, SOUND_LARGE_DOOR_CLOSE, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_RemoveDisguise) = { + EVT_SET(LVar0, 0) + EVT_SET(LVar1, 45) + EVT_LOOP(10) + EVT_CALL(InterpPlayerYaw, LVar0, 0) + EVT_ADD(LVar0, LVar1) + EVT_ADD(LVar1, 4) + EVT_WAIT(1) + EVT_END_LOOP + EVT_CALL(PlaySoundAtPlayer, SOUND_2049, 0) + EVT_CALL(N(ForceDisguiseLoss)) + EVT_LOOP(10) + EVT_CALL(InterpPlayerYaw, LVar0, 0) + EVT_ADD(LVar0, LVar1) + EVT_SUB(LVar1, 4) + EVT_WAIT(1) + EVT_END_LOOP + EVT_CALL(InterpPlayerYaw, 90, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Scene_KammyUnmasksPeach) = { + EVT_CALL(SetCamLeadPlayer, CAM_DEFAULT, FALSE) + EVT_LOOP(0) + EVT_WAIT(1) + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_IF_LE(LVar0, 140) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(DisablePlayerPhysics, TRUE) + EVT_CALL(DisablePartnerAI, 0) + EVT_CALL(SetMusicTrack, 0, SONG_KAMMY_KOOPA_THEME, 0, 8) + EVT_CALL(SetNpcVar, NPC_Koopatrol_01, 1, 0) + EVT_CALL(SetNpcFlagBits, NPC_Koopatrol_01, NPC_FLAG_100, TRUE) + EVT_CALL(SetNpcPos, NPC_Kammy, -50, 0, -50) + EVT_EXEC(N(EVS_OpenAndCloseTowerDoors)) + EVT_CALL(SetNpcAnimation, NPC_Kammy, ANIM_WorldKammy_Anim02) + EVT_CALL(SetNpcSpeed, NPC_Kammy, EVT_FLOAT(2.0)) + EVT_CALL(NpcMoveTo, NPC_Kammy, 30, -50, 0) + EVT_CALL(SetNpcAnimation, NPC_Kammy, ANIM_WorldKammy_Anim01) + EVT_THREAD + EVT_CALL(InterpNpcYaw, NPC_Koopatrol_01, 270, 5) + EVT_LOOP(0) + EVT_WAIT(1) + EVT_CALL(GetNpcPos, NPC_Kammy, LVar0, LVar1, LVar2) + EVT_IF_GT(LVar0, 140) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_CALL(InterpNpcYaw, NPC_Koopatrol_01, 90, 5) + EVT_END_THREAD + EVT_THREAD + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_CALL(func_802D1270, 190, LVar2, EVT_FLOAT(4.0)) + EVT_CALL(func_802D1270, 195, -80, EVT_FLOAT(4.0)) + EVT_CALL(func_802D1270, 190, -80, EVT_FLOAT(4.0)) + EVT_LOOP(0) + EVT_WAIT(1) + EVT_CALL(GetNpcPos, NPC_Kammy, LVar0, LVar1, LVar2) + EVT_IF_GT(LVar0, 190) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_CALL(InterpPlayerYaw, 90, 5) + EVT_END_THREAD + EVT_THREAD + EVT_CALL(GetNpcPos, NPC_PARTNER, LVar0, LVar1, LVar2) + EVT_CALL(NpcJump0, NPC_PARTNER, LVar0, -10, -130, 20) + EVT_CALL(SetNpcSpeed, NPC_PARTNER, EVT_FLOAT(4.0)) + EVT_CALL(NpcFlyTo, NPC_PARTNER, 210, -10, -130, 0, 0, EASING_LINEAR) + EVT_CALL(InterpNpcYaw, NPC_PARTNER, 270, 5) + EVT_LOOP(0) + EVT_WAIT(1) + EVT_CALL(GetNpcPos, NPC_Kammy, LVar0, LVar1, LVar2) + EVT_IF_GT(LVar0, 210) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_CALL(InterpNpcYaw, NPC_PARTNER, 90, 5) + EVT_END_THREAD + EVT_WAIT(30) + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, 0, 0, -50) + EVT_CALL(SetPanTarget, CAM_DEFAULT, 0, 0, -50) + EVT_CALL(SetCamDistance, CAM_DEFAULT, EVT_FLOAT(300.0)) + EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(17.0), EVT_FLOAT(-9.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_WAIT(10) + EVT_CALL(SpeakToPlayer, NPC_Kammy, ANIM_WorldKammy_Anim04, ANIM_WorldKammy_Anim01, 5, MSG_Peach_014F) + EVT_CALL(SpeakToNpc, NPC_Koopatrol_01, ANIM_WorldKoopatrol_Anim08, ANIM_WorldKoopatrol_Anim01, 0, NPC_Kammy, MSG_Peach_0150) + EVT_CALL(SetNpcVar, NPC_Kammy, 0, 1) + EVT_THREAD + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(90.0)) + EVT_LOOP(0) + EVT_CALL(GetNpcPos, NPC_Kammy, LVar0, LVar1, LVar2) + EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_WAIT(1) + EVT_CALL(GetNpcVar, NPC_Kammy, 0, LVar0) + EVT_IF_EQ(LVar0, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_END_THREAD + EVT_CALL(SetNpcAnimation, NPC_Kammy, ANIM_WorldKammy_Anim02) + EVT_CALL(NpcMoveTo, NPC_Kammy, 270, -50, 0) + EVT_CALL(SetNpcAnimation, NPC_Kammy, ANIM_WorldKammy_Anim01) + EVT_CALL(SetNpcVar, NPC_Kammy, 0, 0) + EVT_WAIT(10) + EVT_CALL(InterpNpcYaw, NPC_Kammy, 270, 5) + EVT_CALL(SetPanTarget, CAM_DEFAULT, 230, 0, -50) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(3.0)) + EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_CALL(SpeakToPlayer, NPC_Kammy, ANIM_WorldKammy_Anim04, ANIM_WorldKammy_Anim01, 5, MSG_Peach_0151) + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_CALL(SetPlayerJumpscale, EVT_FLOAT(1.0)) + EVT_CALL(PlayerJump1, LVar0, LVar1, LVar2, 10) + EVT_WAIT(30) + EVT_CALL(SpeakToPlayer, NPC_Kammy, ANIM_WorldKammy_Anim04, ANIM_WorldKammy_Anim01, 5, MSG_Peach_0152) + EVT_CALL(InterpNpcYaw, NPC_Kammy, 90, 5) + EVT_WAIT(10) + EVT_CALL(NpcMoveTo, NPC_Kammy, 280, -50, 0) + EVT_CALL(PlaySoundAtNpc, NPC_Kammy, SOUND_262, 0) + EVT_CALL(ShowEmote, NPC_Kammy, EMOTE_EXCLAMATION, -45, 15, TRUE, 0, 0, 0, 0) + EVT_WAIT(20) + EVT_CALL(InterpNpcYaw, NPC_Kammy, 270, 5) + EVT_CALL(SpeakToPlayer, NPC_Kammy, ANIM_WorldKammy_Anim04, ANIM_WorldKammy_Anim01, 5, MSG_Peach_0153) + EVT_WAIT(10) + EVT_CALL(InterpNpcYaw, NPC_Koopatrol_01, 90, 5) + EVT_CALL(SetNpcAnimation, NPC_Kammy, ANIM_WorldKammy_Anim05) + EVT_CALL(SpeakToPlayer, NPC_Kammy, ANIM_WorldKammy_Anim05, ANIM_WorldKammy_Anim05, 5, MSG_Peach_0154) + EVT_CALL(PlaySoundAtNpc, NPC_Kammy, SOUND_207A, 0) + EVT_CALL(GetNpcPos, NPC_Kammy, LVar0, LVar1, LVar2) + EVT_ADD(LVar0, -20) + EVT_ADD(LVar1, 40) + EVT_ADD(LVar2, 27) + EVT_PLAY_EFFECT(EFFECT_GATHER_ENERGY_PINK, 0, LVar0, LVar1, LVar2, 1, 50) + EVT_WAIT(60) + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_ADD(LVar2, 5) + EVT_CALL(GetNpcPos, NPC_Kammy, LVar3, LVar4, LVar5) + EVT_ADD(LVar4, 180) + EVT_CALL(PlaySoundAtPlayer, SOUND_2127, 0) + EVT_PLAY_EFFECT(EFFECT_LIGHTNING_BOLT, 0, LVar0, LVar1, LVar2, LVar3, LVar4, LVar5, 5, 20) + EVT_CALL(N(SetLightningBoltColor), LVarF, 255, 0, 255) + EVT_ADD(LVar1, 15) + EVT_PLAY_EFFECT(EFFECT_SHIMMER_BURST, 1, LVar0, LVar1, LVar2, 1, 30) + EVT_CALL(NpcFacePlayer, NPC_PARTNER, 0) + EVT_EXEC_WAIT(N(EVS_RemoveDisguise)) + EVT_CALL(SetNpcAnimation, NPC_Kammy, ANIM_WorldKammy_Anim01) + EVT_CALL(SpeakToPlayer, NPC_PLAYER, ANIM_Peach_C0006, ANIM_Peach_C0006, 5, MSG_Peach_0155) + EVT_CALL(SpeakToPlayer, NPC_Kammy, ANIM_WorldKammy_Anim05, ANIM_WorldKammy_Anim05, 5, MSG_Peach_0156) + EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0011) + EVT_CALL(SetNpcAnimation, NPC_Kammy, ANIM_WorldKammy_Anim02) + EVT_CALL(NpcMoveTo, NPC_Kammy, 260, -50, 0) + EVT_CALL(SetNpcAnimation, NPC_Kammy, ANIM_WorldKammy_Anim01) + EVT_CALL(SpeakToPlayer, NPC_Kammy, ANIM_WorldKammy_Anim04, ANIM_WorldKammy_Anim01, 5, MSG_Peach_0157) + EVT_THREAD + EVT_LOOP(0) + EVT_CALL(NpcFacePlayer, NPC_Kammy, 0) + EVT_WAIT(1) + EVT_END_LOOP + EVT_END_THREAD + EVT_THREAD + EVT_LOOP(0) + EVT_WAIT(1) + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_IF_GT(LVar0, 240) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_CALL(InterpNpcYaw, NPC_PARTNER, 90, 0) + EVT_END_THREAD + EVT_EXEC_WAIT(N(EVS_ApproachPeach)) + EVT_EXEC_WAIT(N(EVS_PickUpPeach)) + EVT_CALL(SpeakToPlayer, NPC_PLAYER, ANIM_Peach_C0018, ANIM_Peach_C0018, 5, MSG_Peach_0158) + EVT_EXEC_WAIT(N(EVS_CarryPeachAway)) + EVT_WAIT(20) + EVT_CALL(SetNpcSpeed, NPC_PARTNER, EVT_FLOAT(6.0)) + EVT_CALL(NpcFlyTo, NPC_PARTNER, 460, -10, -130, 0, 0, EASING_LINEAR) + EVT_WAIT(60) + EVT_CALL(FadeOutMusic, 0, 1000) + EVT_EXEC_WAIT(N(EVS_EndPeachChapter6)) + EVT_CALL(DisablePlayerPhysics, FALSE) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_kkj/kkj_24/B06570.c b/src/world/area_kkj/kkj_24/B06570.c deleted file mode 100644 index bf2f5f2822..0000000000 --- a/src/world/area_kkj/kkj_24/B06570.c +++ /dev/null @@ -1,9 +0,0 @@ -#include "kkj_24.h" - -static char* N(exit_str_0) = "kkj_23"; -static char* N(exit_str_1) = "kkj_25"; - -ApiStatus func_80240000_B06570(Evt* script, s32 isInitialCall) { - enable_world_fog(); - return ApiStatus_DONE2; -} diff --git a/src/world/area_kkj/kkj_24/kkj_24.h b/src/world/area_kkj/kkj_24/kkj_24.h index 07d4c91c55..6a93897087 100644 --- a/src/world/area_kkj/kkj_24/kkj_24.h +++ b/src/world/area_kkj/kkj_24/kkj_24.h @@ -2,8 +2,15 @@ /// @brief Peach's Castle - Tower Staircase (5F) #include "common.h" -#include "../kkj.h" #include "message_ids.h" #include "map.h" +#include "../kkj.h" +#include "mapfs/kkj_24_shape.h" +#include "mapfs/kkj_24_hit.h" + #define NAMESPACE kkj_24 + +extern EvtScript N(EVS_Main); +extern EvtScript N(EVS_SetupMusic); +extern EvtScript N(EVS_MakeEntities); diff --git a/src/world/area_kkj/kkj_24/kkj_24_0_header.c b/src/world/area_kkj/kkj_24/kkj_24_0_header.c new file mode 100644 index 0000000000..4ecb60c649 --- /dev/null +++ b/src/world/area_kkj/kkj_24/kkj_24_0_header.c @@ -0,0 +1,14 @@ +#include "kkj_24.h" + +EntryList N(Entrances) = { + [kkj_24_ENTRY_0] { 145.0, 0.0, -10.0, 270.0 }, + [kkj_24_ENTRY_1] { 145.0, 420.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_kkj_24 }, +}; diff --git a/src/world/area_kkj/kkj_24/kkj_24_1_music.c b/src/world/area_kkj/kkj_24/kkj_24_1_music.c new file mode 100644 index 0000000000..e9b0770fad --- /dev/null +++ b/src/world/area_kkj/kkj_24/kkj_24_1_music.c @@ -0,0 +1,9 @@ +#include "kkj_24.h" + +EvtScript N(EVS_SetupMusic) = { + EVT_IF_GE(GB_StoryProgress, STORY_CH8_REACHED_PEACHS_CASTLE) + EVT_CALL(SetMusicTrack, 0, SONG_BOWSER_THEME, 0, 8) + EVT_END_IF + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_kkj/kkj_24/kkj_24_2_main.c b/src/world/area_kkj/kkj_24/kkj_24_2_main.c new file mode 100644 index 0000000000..65c1e0b49d --- /dev/null +++ b/src/world/area_kkj/kkj_24/kkj_24_2_main.c @@ -0,0 +1,53 @@ +#include "kkj_24.h" + +API_CALLABLE(N(func_80240000_B06570)) { + enable_world_fog(); + return ApiStatus_DONE2; +} + +EvtScript N(EVS_ExitDoors_kkj_23_1) = EVT_EXIT_DOUBLE_DOOR(kkj_24_ENTRY_0, "kkj_23", kkj_23_ENTRY_1, COLLIDER_tte, MODEL_o58, MODEL_o57); +EvtScript N(EVS_ExitDoors_kkj_25_0) = EVT_EXIT_DOUBLE_DOOR(kkj_24_ENTRY_1, "kkj_25", kkj_25_ENTRY_0, COLLIDER_tte2, MODEL_o78, MODEL_o77); + +EvtScript N(EVS_BindExitTriggers) = { + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitDoors_kkj_23_1)), TRIGGER_WALL_PRESS_A, COLLIDER_tte, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitDoors_kkj_25_0)), TRIGGER_WALL_PRESS_A, COLLIDER_tte2, 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(kkj_24_ENTRY_0) + EVT_SET(LVar2, MODEL_o58) + EVT_SET(LVar3, MODEL_o57) + EVT_EXEC_WAIT(EnterDoubleDoor) + EVT_CASE_EQ(kkj_24_ENTRY_1) + EVT_SET(LVar2, MODEL_o78) + EVT_SET(LVar3, MODEL_o77) + 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_PEACHS_CASTLE) + EVT_CALL(SetSpriteShading, SHADING_KKJ_24) + EVT_SETUP_CAMERA_NO_LEAD() + EVT_EXEC_WAIT(N(EVS_MakeEntities)) + EVT_CALL(N(func_80240000_B06570)) + EVT_EXEC(N(EVS_SetupMusic)) + EVT_CALL(UseDoorSounds, DOOR_SOUNDS_LARGE) + EVT_EXEC(N(EVS_EnterMap)) + EVT_WAIT(1) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_kkj/kkj_24/kkj_24_3_entity.c b/src/world/area_kkj/kkj_24/kkj_24_3_entity.c new file mode 100644 index 0000000000..dfed781003 --- /dev/null +++ b/src/world/area_kkj/kkj_24/kkj_24_3_entity.c @@ -0,0 +1,8 @@ +#include "kkj_24.h" +#include "entity.h" + +EvtScript N(EVS_MakeEntities) = { + EVT_CALL(MakeEntity, EVT_PTR(Entity_SavePoint), -25, 60, -50, 0, MAKE_ENTITY_END) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_kkj/kkj_25/B06A00.c b/src/world/area_kkj/kkj_25/B06A00.c deleted file mode 100644 index 734d6555f8..0000000000 --- a/src/world/area_kkj/kkj_25/B06A00.c +++ /dev/null @@ -1,8 +0,0 @@ -#include "kkj_25.h" - -static char* N(exit_str_0) = "kkj_24"; -static char* N(exit_str_1) = "kkj_25"; -static char* N(exit_str_2) = "kkj_25\0"; -static char* N(exit_str_3) = "osr_03"; - -#include "world/common/todo/SetPlayerSpriteSet2_MapInit.inc.c" diff --git a/src/world/area_kkj/kkj_25/B06A20.c b/src/world/area_kkj/kkj_25/B06A20.c deleted file mode 100644 index 05133b8ae5..0000000000 --- a/src/world/area_kkj/kkj_25/B06A20.c +++ /dev/null @@ -1,8 +0,0 @@ -#include "kkj_25.h" - -ApiStatus func_80240020_B06A20(Evt* script, s32 isInitialCall) { - increment_status_menu_disabled(); - set_screen_overlay_params_back(0, 255.0f); - - return ApiStatus_DONE2; -} diff --git a/src/world/area_kkj/kkj_25/B06A50.c b/src/world/area_kkj/kkj_25/B06A50.c deleted file mode 100644 index 85dc199974..0000000000 --- a/src/world/area_kkj/kkj_25/B06A50.c +++ /dev/null @@ -1,3 +0,0 @@ -#include "kkj_25.h" - -#include "world/common/todo/UnkFunc1.inc.c" diff --git a/src/world/area_kkj/kkj_25/B06A80.c b/src/world/area_kkj/kkj_25/B06A80.c deleted file mode 100644 index 154cb0a0e9..0000000000 --- a/src/world/area_kkj/kkj_25/B06A80.c +++ /dev/null @@ -1,21 +0,0 @@ -#include "effects.h" -#include "kkj_25.h" - -#include "world/common/todo/GetFloorCollider.inc.c" - -#include "common/UnkLightningFXFunc.inc.c" - -#include "world/common/todo/SetEntityPositionF.inc.c" - -#include "world/common/todo/GetEntityPosition.inc.c" - -ApiStatus func_80240264_B06C64(Evt* script, s32 isInitialCall) { - Bytecode* args = script->ptrReadPos; - f32 posX = evt_get_float_variable(script, *args++); - f32 posY = evt_get_float_variable(script, *args++); - f32 posZ = evt_get_float_variable(script, *args++); - s32 duration = evt_get_variable(script, *args++); - - fx_lens_flare(0, posX, posY, posZ, duration); - return ApiStatus_DONE2; -} diff --git a/src/world/area_kkj/kkj_25/B06D10.c b/src/world/area_kkj/kkj_25/B06D10.c deleted file mode 100644 index a1afaa04f4..0000000000 --- a/src/world/area_kkj/kkj_25/B06D10.c +++ /dev/null @@ -1,135 +0,0 @@ -#include "kkj_25.h" -#include "effects.h" - -#define KNOCK_DOWN_MAP_VAR MapVar(10) -#include "world/common/complete/KnockDownPlayer.inc.c" - -ApiStatus func_80240B18_B07518(Evt* script, s32 isInitialCall) { - EffectInstance* effect; - - fx_stars_orbiting(0, script->varTable[0], script->varTable[1], script->varTable[2], script->varTable[3], script->varTable[4], &effect); - script->varTablePtr[0] = effect; - - return ApiStatus_DONE2; -} - -ApiStatus func_80240B8C_B0758C(Evt* script, s32 isInitialCall) { - EffectInstance* effect = (EffectInstance*) script->varTablePtr[0]; - - effect->data.starsOrbiting->unk_28 = 0; - return ApiStatus_DONE2; -} - -ApiStatus func_80240BA0_B075A0(Evt* script, s32 isInitialCall) { - Bytecode* args = script->ptrReadPos; - EffectInstance* effect = (EffectInstance*) evt_get_variable(script, *args++); - s32 var1 = evt_get_variable(script, *args++); - s32 var2 = evt_get_variable(script, *args++); - s32 var3 = evt_get_variable(script, *args++); - - effect->data.starsOrbiting->pos.x = var1; - effect->data.starsOrbiting->pos.y = var2; - effect->data.starsOrbiting->pos.z = var3; - - return ApiStatus_DONE2; -} - -ApiStatus func_80240C60_B07660(Evt* script, s32 isInitialCall) { - EffectInstance* effect; - - fx_stars_orbiting(0, script->varTable[0], script->varTable[1], script->varTable[2], script->varTable[3], script->varTable[4], &effect); - script->varTablePtr[0] = effect; - - return ApiStatus_DONE2; -} - -ApiStatus func_80240CD4_B076D4(Evt* script, s32 isInitialCall) { - EffectInstance* effect = (EffectInstance*) script->varTablePtr[0]; - - effect->data.starsOrbiting->unk_28 = 0; - return ApiStatus_DONE2; -} - -ApiStatus func_80240CE8_B076E8(Evt* script, s32 isInitialCall) { - gPlayerData.starBeamLevel = 2; - gPlayerData.curHP = gPlayerData.curMaxHP; - gPlayerData.curFP = gPlayerData.curMaxFP; - gPlayerData.specialBarsFilled = gPlayerData.maxStarPower * 256; - - sync_status_menu(); - return ApiStatus_DONE2; -} - -ApiStatus func_80240D30_B07730(Evt* script, s32 isInitialCall) { - if (isInitialCall) { - script->functionTemp[1] = 0; - script->functionTemp[2] = 0; - } - - switch (script->functionTemp[2]) { - case 0: - set_screen_overlay_color(0, 208, 0, 0); - set_screen_overlay_params_front(1, script->functionTemp[1]); - if (script->functionTemp[1] == 255) { - script->functionTemp[1] = 0; - script->functionTemp[2] = 1; - } else { - script->functionTemp[1] += 7; - if (script->functionTemp[1] > 255) { - script->functionTemp[1] = 255; - } - } - break; - case 1: - set_screen_overlay_color( - 0, - 208, - (script->functionTemp[1] * 208) / 255, - (script->functionTemp[1] * 208) / 255 - ); - set_screen_overlay_params_front(1, 255.0f); - if (script->functionTemp[1] == 255) { - script->functionTemp[2] = 2; - } - script->functionTemp[1] += 14; - if (script->functionTemp[1] > 255) { - script->functionTemp[1] = 255; - } - } - return (script->functionTemp[2] == 2) * 2; -} - -ApiStatus func_80240E54_B07854(Evt* script, s32 isInitialCall) { - if (isInitialCall) { - script->functionTemp[1] = 255; - } - - set_screen_overlay_params_front(1, script->functionTemp[1]); - - if (script->functionTemp[1] == 0) { - return ApiStatus_DONE2; - } - - script->functionTemp[1] -= 16; - if (script->functionTemp[1] <= 0) { - script->functionTemp[1] = 0; - } - - return ApiStatus_BLOCK; -} - -ApiStatus func_80240EB8_B078B8(Evt* script, s32 isInitialCall) { - EffectInstance* effect; - - fx_stars_orbiting(0, script->varTable[0], script->varTable[1], script->varTable[2], script->varTable[3], script->varTable[4], &effect); - script->varTablePtr[0] = effect; - - return ApiStatus_DONE2; -} - -ApiStatus func_80240F2C_B0792C(Evt* script, s32 isInitialCall) { - EffectInstance* effect = (EffectInstance*) script->varTablePtr[0]; - - effect->data.starsOrbiting->unk_28 = 0; - return ApiStatus_DONE2; -} diff --git a/src/world/area_kkj/kkj_25/kkj_25.h b/src/world/area_kkj/kkj_25/kkj_25.h index 118de6e1cb..1d6d2c381c 100644 --- a/src/world/area_kkj/kkj_25/kkj_25.h +++ b/src/world/area_kkj/kkj_25/kkj_25.h @@ -2,8 +2,94 @@ /// @brief Peach's Castle - Final Boss Arena (6F) #include "common.h" -#include "../kkj.h" #include "message_ids.h" #include "map.h" +#include "../kkj.h" +#include "mapfs/kkj_25_shape.h" +#include "mapfs/kkj_25_hit.h" + +#include "sprite/npc/BattleKammy.h" +#include "sprite/npc/Twink.h" +#include "sprite/npc/WorldBowser.h" +#include "sprite/npc/WorldEldstar.h" +#include "sprite/npc/WorldMamar.h" +#include "sprite/npc/WorldSkolar.h" +#include "sprite/npc/WorldMuskular.h" +#include "sprite/npc/WorldMisstar.h" +#include "sprite/npc/WorldKlevar.h" +#include "sprite/npc/WorldKalmar.h" +#include "sprite/npc/StarRod.h" + +enum { + // part 1 + NPC_Bowser_01 = 0, + NPC_Peach_01 = 1, + NPC_Kammy_01 = 2, + NPC_Kammy_02 = 3, + NPC_Twink_01 = 4, + // part 2 + NPC_Bowser_02 = 5, + NPC_Kammy_03 = 6, + NPC_Kammy_04 = 7, + NPC_Eldstar = 8, + NPC_Mamar = 9, + NPC_Skolar = 10, + NPC_Muskular = 11, + NPC_Misstar = 12, + NPC_Klevar = 13, + NPC_Kalmar = 14, + // part 3 + NPC_Bowser_03 = 15, + NPC_Peach_02 = 16, + NPC_Kammy_05 = 17, + NPC_Twink_02 = 18, + NPC_StarRod = 19, +}; + +enum { + ARENA_STATE_IDLE = 0, + ARENA_STATE_ACTIVATING = 1, + ARENA_STATE_FULL_POWER = 2, + ARENA_STATE_OVERLOADING = 10, + ARENA_STATE_BROKEN = -1, +}; + +enum { + DESTRUCT_STATE_NONE = 0, + DESTRUCT_STATE_1 = 1, + DESTRUCT_STATE_2 = 2, + DESTRUCT_STATE_3 = 3, + DESTRUCT_STATE_4 = 4, + DESTRUCT_STATE_5 = 5, + DESTRUCT_STATE_6 = 6, + DESTRUCT_STATE_7 = 7, + DESTRUCT_STATE_10 = 10, + DESTRUCT_STATE_TREMBLE = -1, +}; + +enum { + MV_SwitchEntityIdx = MapVar(0), + MV_OrbitingEffectAIdx = MapVar(0), + MV_OrbitingEffectBIdx = MapVar(1), + MV_Unk_0A = MapVar(10), // KNOCK_DOWN_MAP_VAR + MV_ArenaState = MapVar(11), + MV_DestructState = MapVar(12), + MV_PrevDestructState = MapVar(13), +}; + #define NAMESPACE kkj_25 + +extern EvtScript N(EVS_Main); +extern EvtScript N(EVS_ManageArenaEffects); +extern EvtScript N(EVS_Scene_BowserTrapsMario); +extern EvtScript N(EVS_Scene_KammyDefeated); +extern EvtScript N(EVS_Scene_BowserDefeated); +extern EvtScript N(EVS_Scene_PeachBreaksFree); +extern EvtScript N(EVS_Scene_ActivateMachine); +extern EvtScript N(EVS_SpawnBowserStarEnergyWaves); +extern EvtScript N(EVS_MakeEntities); + +extern NpcGroupList N(InitialNpcs); +extern NpcGroupList N(MidpointNpcs); +extern NpcGroupList N(FinaleNpcs); diff --git a/src/world/area_kkj/kkj_25/kkj_25_0_header.c b/src/world/area_kkj/kkj_25/kkj_25_0_header.c new file mode 100644 index 0000000000..6520edc078 --- /dev/null +++ b/src/world/area_kkj/kkj_25/kkj_25_0_header.c @@ -0,0 +1,15 @@ +#include "kkj_25.h" + +#include "world/common/todo/SetPlayerSpriteSet2_MapInit.inc.c" + +EntryList N(Entrances) = { + [kkj_25_ENTRY_0] { -605.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_kkj_25 }, +}; diff --git a/src/world/area_kkj/kkj_25/kkj_25_1_main.c b/src/world/area_kkj/kkj_25/kkj_25_1_main.c new file mode 100644 index 0000000000..799c104c39 --- /dev/null +++ b/src/world/area_kkj/kkj_25/kkj_25_1_main.c @@ -0,0 +1,135 @@ +#include "kkj_25.h" + +EvtScript N(EVS_ExitDoors_kkj_24_1) = EVT_EXIT_DOUBLE_DOOR(kkj_25_ENTRY_0, "kkj_24", kkj_24_ENTRY_1, COLLIDER_ttw, MODEL_o84, MODEL_o85); + +EvtScript N(EVS_BindExitTriggers) = { + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitDoors_kkj_24_1)), TRIGGER_WALL_PRESS_A, COLLIDER_ttw, 1, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_EnterMap) = { + EVT_CALL(GetEntryID, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_EQ(kkj_25_ENTRY_0) + EVT_IF_EQ(GF_KKJ25_Visited, FALSE) + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(SetPlayerPos, -645, 0, 0) + EVT_CALL(GetPartnerInUse, LVar0) + EVT_IF_EQ(LVar0, 0) + EVT_CALL(DisablePartnerAI, 0) + EVT_CALL(SetNpcPos, NPC_PARTNER, -660, 0, 0) + EVT_WAIT(1) + EVT_CALL(EnablePartnerAI) + EVT_END_IF + EVT_WAIT(150) + EVT_CALL(PlaySoundAtCollider, COLLIDER_ttw, SOUND_LARGE_DOOR_OPEN, 0) + EVT_CALL(MakeLerp, 0, 80, 10, EASING_LINEAR) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_CALL(RotateModel, MODEL_o84, LVar0, 0, -1, 0) + EVT_CALL(RotateModel, MODEL_o85, LVar0, 0, 1, 0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_CALL(SetPlayerPos, -605, 0, 0) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_CALL(SetZoneEnabled, ZONE_o15, FALSE) + EVT_CALL(ResetCam, CAM_DEFAULT, EVT_FLOAT(90.0)) + EVT_SET(GF_KKJ25_Visited, TRUE) + EVT_ELSE + EVT_CALL(SetZoneEnabled, ZONE_o15, FALSE) + EVT_CALL(ResetCam, CAM_DEFAULT, EVT_FLOAT(90.0)) + EVT_END_IF + EVT_SET(LVar0, 0) + EVT_SET(LVar2, MODEL_o84) + EVT_SET(LVar3, MODEL_o85) + EVT_EXEC_WAIT(EnterDoubleDoor) + EVT_EXEC(N(EVS_BindExitTriggers)) + EVT_EXEC(N(EVS_Scene_BowserTrapsMario)) + EVT_CASE_EQ(kkj_25_ENTRY_1) + EVT_EXEC(N(EVS_Scene_KammyDefeated)) + EVT_CASE_EQ(kkj_25_ENTRY_2) + EVT_EXEC(N(EVS_Scene_BowserDefeated)) + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Rotate_Propellers) = { + EVT_THREAD + EVT_SET(LVar2, 0) + EVT_LOOP(0) + EVT_ADD(LVar2, 10) + EVT_CALL(RotateGroup, MODEL_g3, LVar2, 0, 1, 0) + EVT_CALL(RotateGroup, MODEL_g12, LVar2, 0, 1, 0) + EVT_CALL(RotateGroup, MODEL_g14, LVar2, 0, 1, 0) + EVT_CALL(RotateGroup, MODEL_g16, LVar2, 0, 1, 0) + EVT_CALL(RotateGroup, MODEL_g18, LVar2, 0, 1, 0) + EVT_WAIT(1) + EVT_END_LOOP + EVT_END_THREAD + EVT_SET(LVar2, 90) + EVT_LOOP(0) + EVT_ADD(LVar2, 10) + EVT_CALL(RotateGroup, MODEL_g11, LVar2, 0, 1, 0) + EVT_CALL(RotateGroup, MODEL_g13, LVar2, 0, 1, 0) + EVT_CALL(RotateGroup, MODEL_g15, LVar2, 0, 1, 0) + EVT_CALL(RotateGroup, MODEL_g17, LVar2, 0, 1, 0) + EVT_WAIT(1) + EVT_END_LOOP + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Main) = { + EVT_CALL(GetEntryID, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_EQ(1) + EVT_SET(GF_KKJ25_Defeated_Kammy, TRUE) + EVT_CASE_EQ(2) + EVT_SET(GF_KKJ25_Defeated_Kammy, TRUE) + EVT_SET(GF_KKJ25_Defeated_Bowser, TRUE) + EVT_END_SWITCH + EVT_SET(GB_WorldLocation, LOCATION_PEACHS_CASTLE) + EVT_CALL(SetSpriteShading, SHADING_KKJ_25) + EVT_CALL(SetCamLeadPlayer, CAM_DEFAULT, FALSE) + EVT_SETUP_CAMERA_DEFAULT() + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(0.75)) + EVT_IF_EQ(GF_KKJ25_Defeated_Bowser, FALSE) + EVT_IF_EQ(GF_KKJ25_Defeated_Kammy, FALSE) + EVT_CALL(MakeNpcs, FALSE, EVT_PTR(N(InitialNpcs))) + EVT_ELSE + EVT_CALL(MakeNpcs, FALSE, EVT_PTR(N(MidpointNpcs))) + EVT_CALL(EnableGroup, MODEL_g30, FALSE) + EVT_END_IF + EVT_ELSE + EVT_CALL(MakeNpcs, FALSE, EVT_PTR(N(FinaleNpcs))) + EVT_CALL(EnableGroup, MODEL_g30, FALSE) + EVT_END_IF + EVT_EXEC_WAIT(N(EVS_MakeEntities)) + EVT_CALL(UseDoorSounds, DOOR_SOUNDS_LARGE) + EVT_EXEC(N(EVS_EnterMap)) + EVT_CALL(ParentColliderToModel, COLLIDER_o128, MODEL_o1) + EVT_EXEC(N(EVS_Rotate_Propellers)) + EVT_CALL(GetEntryID, LVar0) + EVT_THREAD + EVT_SET(MV_ArenaState, ARENA_STATE_IDLE) + EVT_IF_EQ(LVar0, kkj_25_ENTRY_0) + EVT_CALL(EnableModel, MODEL_o122, FALSE) + EVT_LOOP(0) + EVT_WAIT(1) + EVT_IF_EQ(MV_ArenaState, ARENA_STATE_ACTIVATING) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_ELSE + EVT_CALL(ScaleModel, MODEL_o122, 250, 1, 250) + EVT_END_IF + EVT_EXEC(N(EVS_ManageArenaEffects)) + EVT_END_THREAD + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_kkj/kkj_25/kkj_25_2_npc_initial.c b/src/world/area_kkj/kkj_25/kkj_25_2_npc_initial.c new file mode 100644 index 0000000000..bf5dff2d3c --- /dev/null +++ b/src/world/area_kkj/kkj_25/kkj_25_2_npc_initial.c @@ -0,0 +1,298 @@ +#include "kkj_25.h" + +#define NAME_SUFFIX _Npc1 + +#include "world/common/npc/Bowser.inc.c" +#include "world/common/npc/Dummy.inc.c" +#include "world/common/enemy/Kammy_Flying.inc.c" + +#include "world/common/npc/Peach.h" +#include "world/common/npc/Twink.h" + +EvtScript N(EVS_NpcIdle_Bowser) = { + EVT_CALL(SetSelfVar, 0, 0) + EVT_LOOP(0) + EVT_CALL(GetSelfVar, 0, LVar0) + EVT_IF_NE(LVar0, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_WAIT(1) + EVT_END_LOOP + EVT_THREAD + EVT_CALL(GetNpcPos, NPC_Bowser_01, LVar0, LVar1, LVar2) + EVT_ADD(LVar0, -75) + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_CALL(SetCamDistance, CAM_DEFAULT, 1000) + EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(17.0), EVT_FLOAT(-7.0)) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(4.0)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_END_THREAD + EVT_CALL(ModifyGlobalOverrideFlags, 1, GLOBAL_OVERRIDES_20000) + EVT_CALL(StopSound, SOUND_22C) + EVT_CALL(StartBossBattle, SONG_BOWSER_BATTLE) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcDefeat_Bowser) = { + #define NAME_SUFFIX + EVT_CALL(PlaySound, SOUND_22D) + EVT_EXEC(N(EVS_Scene_PeachBreaksFree)) + EVT_RETURN + EVT_END + #define NAME_SUFFIX _Npc1 +}; + +EvtScript N(EVS_NpcInit_Bowser) = { + EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(EVS_NpcIdle_Bowser))) + EVT_CALL(BindNpcDefeat, NPC_SELF, EVT_PTR(N(EVS_NpcDefeat_Bowser))) + EVT_CALL(SetNpcPos, NPC_Bowser_01, 350, 0, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcIdle_Kammy_Broom) = { + EVT_CALL(SetSelfVar, 0, 0) + EVT_LOOP(0) + EVT_CALL(GetSelfVar, 0, LVar0) + EVT_IF_NE(LVar0, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_WAIT(1) + EVT_END_LOOP + EVT_CALL(func_802D286C, 0x2000) + EVT_CALL(func_802D2520, ANIM_Mario_10002, 8, 0, 0, 0, 0) + EVT_CALL(HidePlayerShadow, TRUE) + EVT_CALL(DisablePartnerAI, 0) + EVT_WAIT(1) + EVT_CALL(GetNpcPos, NPC_Peach_01, LVar0, LVar1, LVar2) + EVT_CALL(SetPlayerPos, LVar0, LVar1, LVar2) + EVT_CALL(ModifyGlobalOverrideFlags, 1, GLOBAL_OVERRIDES_20000) + EVT_CALL(StopSound, SOUND_22D) + EVT_CALL(StartBossBattle, SONG_BOWSER_BATTLE) + EVT_CALL(EnablePartnerAI) + EVT_RETURN + EVT_END +}; + +API_CALLABLE(N(func_80240020_B06A20)) { + increment_status_menu_disabled(); + set_screen_overlay_params_back(0, 255.0f); + + return ApiStatus_DONE2; +} + +EvtScript N(EVS_NpcDefeat_Kammy_Broom) = { + EVT_CALL(GetBattleOutcome, LVar0) + EVT_CALL(N(func_80240020_B06A20)) + EVT_SET(GF_KKJ25_Defeated_Kammy, TRUE) + // reload the map in the 'midpoint' configuration + EVT_CALL(GotoMap, EVT_PTR("kkj_25"), kkj_25_ENTRY_1) + EVT_WAIT(100) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcAux_Kammy_Broom) = { + EVT_SET(LVar3, 1) + EVT_LOOP(0) + EVT_LOOP(5) + EVT_CALL(GetNpcPos, NPC_Kammy_01, LVar0, LVar1, LVar2) + EVT_ADD(LVar1, LVar3) + EVT_CALL(SetNpcPos, NPC_Kammy_01, LVar0, LVar1, LVar2) + EVT_WAIT(2) + EVT_END_LOOP + EVT_MUL(LVar3, -1) + EVT_WAIT(3) + EVT_END_LOOP + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_Kammy_Broom) = { + EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(EVS_NpcIdle_Kammy_Broom))) + EVT_CALL(BindNpcDefeat, NPC_SELF, EVT_PTR(N(EVS_NpcDefeat_Kammy_Broom))) + EVT_CALL(BindNpcAux, NPC_SELF, EVT_PTR(N(EVS_NpcAux_Kammy_Broom))) + EVT_CALL(SetNpcPos, NPC_Kammy_01, 460, 10, 0) + EVT_CALL(SetNpcYaw, NPC_Kammy_01, 270) + EVT_CALL(SetNpcAnimation, NPC_Kammy_01, ANIM_BattleKammy_Anim04) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_Kammy) = { + EVT_CALL(SetNpcPos, NPC_Kammy_02, 300, -100, 0) + EVT_CALL(SetNpcAnimation, NPC_Kammy_02, ANIM_BattleKammy_Anim02) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_BattleKooper_01) = { + EVT_CALL(SetNpcPos, NPC_Peach_01, 400, 0, -30) + EVT_CALL(SetNpcYaw, NPC_Peach_01, 270) + EVT_CALL(SetNpcAnimation, NPC_Peach_01, ANIM_Peach_C001E) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_Twink) = { + EVT_CALL(SetNpcAnimation, NPC_Twink_01, ANIM_Twink_Idle) + EVT_CALL(EnableNpcShadow, NPC_Twink_01, FALSE) + EVT_CALL(SetNpcPos, NPC_Twink_01, 300, -100, 0) + EVT_RETURN + EVT_END +}; + +AnimID N(ExtraAnims_Bowser)[] = { + ANIM_WorldBowser_Idle, + ANIM_WorldBowser_Walk, + ANIM_WorldBowser_Talk, + ANIM_WorldBowser_Shock, + ANIM_WorldBowser_RearUpLaugh, + ANIM_WorldBowser_Tantrum, + ANIM_WorldBowser_Jump, + ANIM_WorldBowser_Land, + ANIM_LIST_END +}; + +AnimID N(ExtraAnims_Peach)[] = { + ANIM_Peach_C001D, + ANIM_Peach_A0001, + ANIM_Peach_A0002, + ANIM_Peach_C0000, + ANIM_Peach_C0006, + ANIM_Peach_C001E, + ANIM_Peach_D0009, + ANIM_Peach_D000A, + ANIM_Peach_D000B, + ANIM_Peach_C0026, + ANIM_Peach_D000F, + ANIM_LIST_END +}; + +AnimID N(ExtraAnims_Kammy)[] = { + ANIM_BattleKammy_Anim00, + ANIM_BattleKammy_Anim01, + ANIM_BattleKammy_Anim04, + ANIM_BattleKammy_Anim06, + ANIM_BattleKammy_Anim07, + ANIM_BattleKammy_Anim08, + ANIM_BattleKammy_Anim02, + ANIM_BattleKammy_Anim0C, + ANIM_BattleKammy_Anim03, + ANIM_LIST_END +}; + +AnimID N(ExtraAnims_Twink)[] = { + ANIM_Twink_Idle, + ANIM_Twink_Sad, + ANIM_Twink_Back, + ANIM_Twink_Talk, + ANIM_LIST_END +}; + +NpcData N(NpcData_Bowser) = { + .id = NPC_Bowser_01, + .pos = { 0.0f, 0.0f, 0.0f }, + .yaw = 270, + .init = &N(EVS_NpcInit_Bowser), + .settings = &N(NpcSettings_Bowser), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_NO_DROPS, + .drops = NO_DROPS, + .animations = BOWSER_ANIMS, + .extraAnimations = N(ExtraAnims_Bowser), +}; + +NpcData N(NpcData_Peach) = { + .id = NPC_Peach_01, + .pos = { 0.0f, 0.0f, 0.0f }, + .yaw = 270, + .init = &N(EVS_NpcInit_BattleKooper_01), + .settings = &N(NpcSettings_Dummy), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_20000, + .drops = NO_DROPS, + .animations = PEACH_ANIMS, + .extraAnimations = N(ExtraAnims_Peach), +}; + +NpcData N(NpcData_Kammy)[] = { + { + .id = NPC_Kammy_01, + .pos = { 0.0f, 0.0f, 0.0f }, + .yaw = 270, + .init = &N(EVS_NpcInit_Kammy_Broom), + .settings = &N(NpcSettings_Kammy_Flying), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_NO_DROPS, + .drops = NO_DROPS, + .animations = { + .idle = ANIM_BattleKammy_Anim00, + .walk = ANIM_BattleKammy_Anim00, + .run = ANIM_BattleKammy_Anim00, + .chase = ANIM_BattleKammy_Anim00, + .anim_4 = ANIM_BattleKammy_Anim00, + .anim_5 = ANIM_BattleKammy_Anim00, + .death = ANIM_BattleKammy_Anim00, + .hit = ANIM_BattleKammy_Anim00, + .anim_8 = ANIM_BattleKammy_Anim00, + .anim_9 = ANIM_BattleKammy_Anim00, + .anim_A = ANIM_BattleKammy_Anim00, + .anim_B = ANIM_BattleKammy_Anim00, + .anim_C = ANIM_BattleKammy_Anim00, + .anim_D = ANIM_BattleKammy_Anim00, + .anim_E = ANIM_BattleKammy_Anim00, + .anim_F = ANIM_BattleKammy_Anim00, + }, + .extraAnimations = N(ExtraAnims_Kammy), + }, + { + .id = NPC_Kammy_02, + .pos = { 0.0f, 0.0f, 0.0f }, + .yaw = 270, + .init = &N(EVS_NpcInit_Kammy), + .settings = &N(NpcSettings_Kammy_Flying), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_NO_DROPS, + .drops = NO_DROPS, + .animations = { + .idle = ANIM_BattleKammy_Anim00, + .walk = ANIM_BattleKammy_Anim00, + .run = ANIM_BattleKammy_Anim00, + .chase = ANIM_BattleKammy_Anim00, + .anim_4 = ANIM_BattleKammy_Anim00, + .anim_5 = ANIM_BattleKammy_Anim00, + .death = ANIM_BattleKammy_Anim00, + .hit = ANIM_BattleKammy_Anim00, + .anim_8 = ANIM_BattleKammy_Anim00, + .anim_9 = ANIM_BattleKammy_Anim00, + .anim_A = ANIM_BattleKammy_Anim00, + .anim_B = ANIM_BattleKammy_Anim00, + .anim_C = ANIM_BattleKammy_Anim00, + .anim_D = ANIM_BattleKammy_Anim00, + .anim_E = ANIM_BattleKammy_Anim00, + .anim_F = ANIM_BattleKammy_Anim00, + }, + .extraAnimations = N(ExtraAnims_Kammy), + }, +}; + +NpcData N(NpcData_Twink) = { + .id = NPC_Twink_01, + .pos = { 0.0f, 0.0f, 0.0f }, + .yaw = 270, + .init = &N(EVS_NpcInit_Twink), + .settings = &N(NpcSettings_Dummy), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_NO_DROPS, + .drops = NO_DROPS, + .animations = TWINK_ANIMS, + .extraAnimations = N(ExtraAnims_Twink), +}; + +#define NAME_SUFFIX + +NpcGroupList N(InitialNpcs) = { + NPC_GROUP(N(NpcData_Bowser_Npc1), BTL_KPA2_FORMATION_03), + NPC_GROUP(N(NpcData_Peach_Npc1)), + NPC_GROUP(N(NpcData_Kammy_Npc1), BTL_KKJ_FORMATION_00), + NPC_GROUP(N(NpcData_Twink_Npc1)), + {} +}; diff --git a/src/world/area_kkj/kkj_25/kkj_25_3_npc_midpoint.c b/src/world/area_kkj/kkj_25/kkj_25_3_npc_midpoint.c new file mode 100644 index 0000000000..7bc3308ef7 --- /dev/null +++ b/src/world/area_kkj/kkj_25/kkj_25_3_npc_midpoint.c @@ -0,0 +1,432 @@ +#include "kkj_25.h" + +#define NAME_SUFFIX _Npc2 + +#include "world/common/npc/Bowser.inc.c" +#include "world/common/npc/Dummy.inc.c" +#include "world/common/enemy/Kammy_Flying.inc.c" +#include "world/common/npc/StarSpirit.inc.c" + +#include "world/common/npc/Peach.h" +#include "world/common/npc/Twink.h" + +EvtScript N(EVS_NpcIdle_Bowser) = { + EVT_LABEL(0) + EVT_CALL(SetSelfVar, 0, 0) + EVT_LOOP(0) + EVT_CALL(GetSelfVar, 0, LVar0) + EVT_IF_NE(LVar0, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_WAIT(1) + EVT_END_LOOP + EVT_THREAD + EVT_CALL(GetNpcPos, NPC_Bowser_02, LVar0, LVar1, LVar2) + EVT_ADD(LVar0, -75) + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(4.0)) + EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(17.0), EVT_FLOAT(-7.0)) + EVT_CALL(SetCamDistance, CAM_DEFAULT, 1000) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_END_THREAD + EVT_CALL(StartBossBattle, SONG_FINAL_BOWSER_BATTLE) + EVT_GOTO(0) + EVT_RETURN + EVT_END +}; + +#include "world/common/todo/UnkFunc1.inc.c" + +EvtScript N(EVS_NpcDefeat_Bowser) = { + EVT_CALL(SetEncounterStatusFlags, ENCOUNTER_STATUS_FLAG_2, TRUE) + EVT_CALL(N(UnkFunc1)) + EVT_SET(GF_KKJ25_Defeated_Bowser, TRUE) + // reload the map in the 'final' configuration + EVT_CALL(GotoMap, EVT_PTR("kkj_25"), kkj_25_ENTRY_2) + EVT_WAIT(100) + EVT_RETURN + EVT_END +}; + +s32 N(FlyingKammyHoverOffsets)[] = { + 1, 2, 3, 2, 1, -1, -2, -3, -2, -1, +}; + +EvtScript N(EVS_NpcAux_Kammy_Broom) = { + EVT_LABEL(0) + EVT_USE_BUF(EVT_PTR(N(FlyingKammyHoverOffsets))) + EVT_LOOP(10) + EVT_BUF_READ1(LVar1) + EVT_CALL(GetNpcPos, NPC_Kammy_03, LVar2, LVar3, LVar4) + EVT_ADD(LVar3, LVar1) + EVT_CALL(SetNpcPos, NPC_Kammy_03, LVar2, LVar3, LVar4) + EVT_WAIT(3) + EVT_END_LOOP + EVT_GOTO(0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_Peach) = { + EVT_CALL(SetNpcPos, NPC_Peach_01, 475, 0, 0) + EVT_CALL(SetNpcAnimation, NPC_Peach_01, ANIM_Peach_A0001) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_Bowser) = { + EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(EVS_NpcIdle_Bowser))) + EVT_CALL(BindNpcDefeat, NPC_SELF, EVT_PTR(N(EVS_NpcDefeat_Bowser))) + EVT_CALL(SetNpcScale, NPC_Bowser_02, EVT_FLOAT(1.5), EVT_FLOAT(1.5), EVT_FLOAT(1.5)) + EVT_CALL(SetNpcPos, NPC_Bowser_02, 200, 0, 0) + EVT_CALL(SetNpcAnimation, NPC_Bowser_02, ANIM_WorldBowser_Idle) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_Kammy_Broom) = { + EVT_CALL(BindNpcAux, NPC_SELF, EVT_PTR(N(EVS_NpcAux_Kammy_Broom))) + EVT_CALL(SetNpcPos, NPC_Kammy_03, 540, 10, -50) + EVT_CALL(SetNpcAnimation, NPC_Kammy_03, ANIM_BattleKammy_Anim0C) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_Kammy) = { + EVT_CALL(SetNpcPos, NPC_Kammy_04, 550, 0, -40) + EVT_CALL(SetNpcAnimation, NPC_Kammy_04, ANIM_BattleKammy_Anim03) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_Twink) = { + EVT_CALL(InterpNpcYaw, NPC_Peach_01, 270, 0) + EVT_CALL(SetNpcPos, NPC_Twink_01, 510, 30, 0) + EVT_CALL(InterpNpcYaw, NPC_Twink_01, 270, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_Eldstar) = { + EVT_CALL(func_802CFD30, 8, 7, 0, 0, 0, 0) + EVT_CALL(EnableNpcShadow, NPC_Eldstar, FALSE) + EVT_CALL(SetNpcPos, NPC_Eldstar, 100, 45, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_Mamar) = { + EVT_CALL(func_802CFD30, 9, 7, 0, 0, 0, 0) + EVT_CALL(EnableNpcShadow, NPC_Mamar, FALSE) + EVT_CALL(SetNpcPos, NPC_Mamar, 46, 45, -27) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_Skolar) = { + EVT_CALL(func_802CFD30, 10, 7, 0, 0, 0, 0) + EVT_CALL(EnableNpcShadow, NPC_Skolar, FALSE) + EVT_CALL(SetNpcPos, NPC_Skolar, 33, 45, -95) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_Muskular) = { + EVT_CALL(func_802CFD30, 11, 7, 0, 0, 0, 0) + EVT_CALL(EnableNpcShadow, NPC_Muskular, FALSE) + EVT_CALL(SetNpcPos, NPC_Muskular, 71, 45, -132) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_Misstar) = { + EVT_CALL(func_802CFD30, 12, 7, 0, 0, 0, 0) + EVT_CALL(EnableNpcShadow, NPC_Misstar, FALSE) + EVT_CALL(SetNpcPos, NPC_Misstar, 131, 45, -132) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_Klevar) = { + EVT_CALL(func_802CFD30, 13, 7, 0, 0, 0, 0) + EVT_CALL(EnableNpcShadow, NPC_Klevar, FALSE) + EVT_CALL(SetNpcPos, NPC_Klevar, 169, 45, -95) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_Kalmar) = { + EVT_CALL(func_802CFD30, 14, 7, 0, 0, 0, 0) + EVT_CALL(EnableNpcShadow, NPC_Kalmar, FALSE) + EVT_CALL(SetNpcPos, NPC_Kalmar, 156, 45, -27) + EVT_RETURN + EVT_END +}; + +AnimID N(ExtraAnims_Bowser)[] = { + ANIM_WorldBowser_Idle, + ANIM_WorldBowser_Walk, + ANIM_WorldBowser_Talk, + ANIM_WorldBowser_Shock, + ANIM_WorldBowser_RearUpLaugh, + ANIM_LIST_END +}; + +AnimID N(ExtraAnims_Peach)[] = { + ANIM_Peach_A0001, + ANIM_Peach_A0002, + ANIM_Peach_C0000, + ANIM_Peach_C0006, + ANIM_Peach_C001E, + ANIM_Peach_D0009, + ANIM_Peach_C0026, + ANIM_Peach_D000F, + ANIM_LIST_END +}; + +AnimID N(ExtraAnims_Kammy)[] = { + ANIM_BattleKammy_Anim04, + ANIM_BattleKammy_Anim06, + ANIM_BattleKammy_Anim0C, + ANIM_BattleKammy_Anim03, + ANIM_LIST_END +}; + +AnimID N(ExtraAnims_Twink)[] = { + ANIM_Twink_Idle, + ANIM_Twink_Talk, + ANIM_LIST_END +}; + +AnimID N(ExtraAnims_Eldstar)[] = { + ANIM_WorldEldstar_Idle, + ANIM_WorldEldstar_Wave, + ANIM_LIST_END +}; + +AnimID N(ExtraAnims_Mamar)[] = { + ANIM_WorldMamar_Idle, + ANIM_LIST_END +}; + +AnimID N(ExtraAnims_Skolar)[] = { + ANIM_WorldSkolar_Idle, + ANIM_LIST_END +}; + +AnimID N(ExtraAnims_Muskular)[] = { + ANIM_WorldMuskular_Idle, + ANIM_LIST_END +}; + +AnimID N(ExtraAnims_Misstar)[] = { + ANIM_WorldMisstar_Idle, + ANIM_LIST_END +}; + +AnimID N(ExtraAnims_Klevar)[] = { + ANIM_WorldKlevar_Idle, + ANIM_LIST_END +}; + +AnimID N(ExtraAnims_Kalmar)[] = { + ANIM_WorldKalmar_Idle, + ANIM_LIST_END +}; + +NpcData N(NpcData_Bowser) = { + .id = NPC_Bowser_02, + .pos = { 0.0f, 0.0f, 0.0f }, + .yaw = 270, + .init = &N(EVS_NpcInit_Bowser), + .settings = &N(NpcSettings_Bowser), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_NO_DROPS, + .drops = NO_DROPS, + .animations = BOWSER_ANIMS, + .extraAnimations = N(ExtraAnims_Bowser), +}; + +NpcData N(NpcData_Peach) = { + .id = NPC_Peach_01, + .pos = { 0.0f, 0.0f, 0.0f }, + .yaw = 270, + .init = &N(EVS_NpcInit_Peach), + .settings = &N(NpcSettings_Dummy), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_20000, + .drops = NO_DROPS, + .animations = PEACH_ANIMS, + .extraAnimations = N(ExtraAnims_Peach), +}; + +NpcData N(NpcData_Kammy)[] = { + { + .id = NPC_Kammy_03, + .pos = { 0.0f, 0.0f, 0.0f }, + .yaw = 270, + .init = &N(EVS_NpcInit_Kammy_Broom), + .settings = &N(NpcSettings_Kammy_Flying), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_NO_DROPS, + .drops = NO_DROPS, + .animations = { + .idle = ANIM_BattleKammy_Anim00, + .walk = ANIM_BattleKammy_Anim00, + .run = ANIM_BattleKammy_Anim00, + .chase = ANIM_BattleKammy_Anim00, + .anim_4 = ANIM_BattleKammy_Anim00, + .anim_5 = ANIM_BattleKammy_Anim00, + .death = ANIM_BattleKammy_Anim00, + .hit = ANIM_BattleKammy_Anim00, + .anim_8 = ANIM_BattleKammy_Anim00, + .anim_9 = ANIM_BattleKammy_Anim00, + .anim_A = ANIM_BattleKammy_Anim00, + .anim_B = ANIM_BattleKammy_Anim00, + .anim_C = ANIM_BattleKammy_Anim00, + .anim_D = ANIM_BattleKammy_Anim00, + .anim_E = ANIM_BattleKammy_Anim00, + .anim_F = ANIM_BattleKammy_Anim00, + }, + .extraAnimations = N(ExtraAnims_Kammy), + }, + { + .id = NPC_Kammy_04, + .pos = { 0.0f, 0.0f, 0.0f }, + .yaw = 270, + .init = &N(EVS_NpcInit_Kammy), + .settings = &N(NpcSettings_Kammy_Flying), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = NO_DROPS, + .animations = { + .idle = ANIM_BattleKammy_Anim00, + .walk = ANIM_BattleKammy_Anim00, + .run = ANIM_BattleKammy_Anim00, + .chase = ANIM_BattleKammy_Anim00, + .anim_4 = ANIM_BattleKammy_Anim00, + .anim_5 = ANIM_BattleKammy_Anim00, + .death = ANIM_BattleKammy_Anim00, + .hit = ANIM_BattleKammy_Anim00, + .anim_8 = ANIM_BattleKammy_Anim00, + .anim_9 = ANIM_BattleKammy_Anim00, + .anim_A = ANIM_BattleKammy_Anim00, + .anim_B = ANIM_BattleKammy_Anim00, + .anim_C = ANIM_BattleKammy_Anim00, + .anim_D = ANIM_BattleKammy_Anim00, + .anim_E = ANIM_BattleKammy_Anim00, + .anim_F = ANIM_BattleKammy_Anim00, + }, + .extraAnimations = N(ExtraAnims_Kammy), + }, +}; + +NpcData N(NpcData_Twink) = { + .id = NPC_Twink_01, + .pos = { 0.0f, 0.0f, 0.0f }, + .yaw = 270, + .init = &N(EVS_NpcInit_Twink), + .settings = &N(NpcSettings_Dummy), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = NO_DROPS, + .animations = TWINK_ANIMS, + .extraAnimations = N(ExtraAnims_Twink), +}; + +NpcData N(NpcData_Eldstar) = { + .id = NPC_Eldstar, + .pos = { 0.0f, 0.0f, 0.0f }, + .yaw = 270, + .init = &N(EVS_NpcInit_Eldstar), + .settings = &N(NpcSettings_StarSpirit), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = NO_DROPS, + .animations = ELDSTAR_ANIMS, + .extraAnimations = N(ExtraAnims_Eldstar), +}; + +NpcData N(NpcData_Mamar) = { + .id = NPC_Mamar, + .pos = { 0.0f, 0.0f, 0.0f }, + .yaw = 270, + .init = &N(EVS_NpcInit_Mamar), + .settings = &N(NpcSettings_StarSpirit), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = NO_DROPS, + .animations = MAMAR_ANIMS, + .extraAnimations = N(ExtraAnims_Mamar), +}; + +NpcData N(NpcData_Skolar) = { + .id = NPC_Skolar, + .pos = { 0.0f, 0.0f, 0.0f }, + .yaw = 270, + .init = &N(EVS_NpcInit_Skolar), + .settings = &N(NpcSettings_StarSpirit), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = NO_DROPS, + .animations = SKOLAR_ANIMS, + .extraAnimations = N(ExtraAnims_Skolar), +}; + +NpcData N(NpcData_Muskular) = { + .id = NPC_Muskular, + .pos = { 0.0f, 0.0f, 0.0f }, + .yaw = 270, + .init = &N(EVS_NpcInit_Muskular), + .settings = &N(NpcSettings_StarSpirit), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = NO_DROPS, + .animations = MUSKULAR_ANIMS, + .extraAnimations = N(ExtraAnims_Muskular), +}; + +NpcData N(NpcData_Misstar) = { + .id = NPC_Misstar, + .pos = { 0.0f, 0.0f, 0.0f }, + .yaw = 270, + .init = &N(EVS_NpcInit_Misstar), + .settings = &N(NpcSettings_StarSpirit), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = NO_DROPS, + .animations = MISSTAR_ANIMS, + .extraAnimations = N(ExtraAnims_Misstar), +}; + +NpcData N(NpcData_Klevar) = { + .id = NPC_Klevar, + .pos = { 0.0f, 0.0f, 0.0f }, + .yaw = 270, + .init = &N(EVS_NpcInit_Klevar), + .settings = &N(NpcSettings_StarSpirit), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = NO_DROPS, + .animations = KLEVAR_ANIMS, + .extraAnimations = N(ExtraAnims_Klevar), +}; + +NpcData N(NpcData_Kalmar) = { + .id = NPC_Kalmar, + .pos = { 0.0f, 0.0f, 0.0f }, + .yaw = 270, + .init = &N(EVS_NpcInit_Kalmar), + .settings = &N(NpcSettings_StarSpirit), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = NO_DROPS, + .animations = KALMAR_ANIMS, + .extraAnimations = N(ExtraAnims_Kalmar), +}; + +#define NAME_SUFFIX + +NpcGroupList N(MidpointNpcs) = { + NPC_GROUP(N(NpcData_Bowser_Npc2), BTL_KPA2_FORMATION_04), + NPC_GROUP(N(NpcData_Peach_Npc2)), + NPC_GROUP(N(NpcData_Kammy_Npc2), BTL_KKJ_FORMATION_00), + NPC_GROUP(N(NpcData_Twink_Npc2)), + NPC_GROUP(N(NpcData_Eldstar_Npc2)), + NPC_GROUP(N(NpcData_Mamar_Npc2)), + NPC_GROUP(N(NpcData_Skolar_Npc2)), + NPC_GROUP(N(NpcData_Muskular_Npc2)), + NPC_GROUP(N(NpcData_Misstar_Npc2)), + NPC_GROUP(N(NpcData_Klevar_Npc2)), + NPC_GROUP(N(NpcData_Kalmar_Npc2)), + {} +}; diff --git a/src/world/area_kkj/kkj_25/kkj_25_4_npc_final.c b/src/world/area_kkj/kkj_25/kkj_25_4_npc_final.c new file mode 100644 index 0000000000..587315b10b --- /dev/null +++ b/src/world/area_kkj/kkj_25/kkj_25_4_npc_final.c @@ -0,0 +1,183 @@ +#include "kkj_25.h" + +#define NAME_SUFFIX _Npc3 + +#include "world/common/npc/Bowser.inc.c" +#include "world/common/npc/Dummy.inc.c" +#include "world/common/enemy/Kammy_Flying.inc.c" +#include "world/common/npc/StarRod.inc.c" + +#include "world/common/npc/Peach.h" +#include "world/common/npc/Twink.h" + +s32 N(FlyingKammyHoverOffsets)[] = { + 1, 2, 3, 2, 1, -1, -2, -3, -2, -1, +}; + +EvtScript N(EVS_NpcAux_Kammy_Broom) = { + EVT_LABEL(0) + EVT_USE_BUF(EVT_PTR(N(FlyingKammyHoverOffsets))) + EVT_LOOP(10) + EVT_BUF_READ1(LVar1) + EVT_CALL(GetNpcPos, NPC_Kammy_05, LVar2, LVar3, LVar4) + EVT_ADD(LVar3, LVar1) + EVT_CALL(SetNpcPos, NPC_Kammy_05, LVar2, LVar3, LVar4) + EVT_WAIT(3) + EVT_END_LOOP + EVT_GOTO(0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_StarRod) = { + EVT_CALL(SetNpcPos, NPC_StarRod, 270, 0, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_Bowser_03) = { + EVT_CALL(SetNpcAnimation, NPC_Bowser_03, ANIM_WorldBowser_DefeatedIdle) + EVT_CALL(SetNpcPos, NPC_Bowser_03, 300, 0, 50) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_Peach) = { + EVT_CALL(SetNpcCollisionSize, NPC_Peach_02, 48, 24) + EVT_CALL(SetNpcPos, NPC_Peach_02, 400, 0, 0) + EVT_CALL(SetNpcAnimation, NPC_Peach_02, ANIM_Peach_A0001) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_Kammy_Broom) = { + EVT_CALL(BindNpcAux, NPC_SELF, EVT_PTR(N(EVS_NpcAux_Kammy_Broom))) + EVT_CALL(SetNpcPos, NPC_Kammy_05, 525, 10, 0) + EVT_CALL(SetNpcAnimation, NPC_Kammy_05, ANIM_BattleKammy_Anim04) + EVT_CALL(InterpNpcYaw, NPC_Kammy_05, 270, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_Twink_02) = { + EVT_CALL(SetNpcPos, NPC_Twink_02, 430, 30, 0) + EVT_RETURN + EVT_END +}; + +AnimID N(ExtraAnims_Bowser)[] = { + ANIM_WorldBowser_Idle, + ANIM_WorldBowser_Walk, + ANIM_WorldBowser_Talk, + ANIM_WorldBowser_Shock, + ANIM_WorldBowser_DefeatedIdle, + ANIM_LIST_END +}; + +AnimID N(ExtraAnims_Peach)[] = { + ANIM_Peach_A0001, + ANIM_Peach_A0002, + ANIM_Peach_C0000, + ANIM_Peach_C0006, + ANIM_LIST_END +}; + +AnimID N(ExtraAnims_Kammy)[] = { + ANIM_BattleKammy_Anim04, + ANIM_BattleKammy_Anim06, + ANIM_LIST_END +}; + +AnimID N(ExtraAnims_Twink)[] = { + ANIM_Twink_Idle, + ANIM_Twink_Talk, + ANIM_Twink_Cringe, + ANIM_LIST_END +}; + +NpcData N(NpcData_Bowser) = { + .id = NPC_Bowser_03, + .pos = { 0.0f, 0.0f, 0.0f }, + .yaw = 270, + .init = &N(EVS_NpcInit_Bowser_03), + .settings = &N(NpcSettings_Bowser), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_NO_DROPS, + .drops = NO_DROPS, + .animations = BOWSER_ANIMS, + .extraAnimations = N(ExtraAnims_Bowser), +}; + +NpcData N(NpcData_Peach) = { + .id = NPC_Peach_02, + .pos = { 0.0f, 0.0f, 0.0f }, + .yaw = 270, + .init = &N(EVS_NpcInit_Peach), + .settings = &N(NpcSettings_Dummy), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_20000 | ENEMY_FLAG_40000 | ENEMY_FLAG_NO_DROPS, + .drops = NO_DROPS, + .animations = PEACH_ANIMS, + .extraAnimations = N(ExtraAnims_Peach), +}; + +NpcData N(NpcData_Kammy) = { + .id = NPC_Kammy_05, + .pos = { 0.0f, 0.0f, 0.0f }, + .yaw = 270, + .init = &N(EVS_NpcInit_Kammy_Broom), + .settings = &N(NpcSettings_Kammy_Flying), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_NO_DROPS, + .drops = NO_DROPS, + .animations = { + .idle = ANIM_BattleKammy_Anim00, + .walk = ANIM_BattleKammy_Anim00, + .run = ANIM_BattleKammy_Anim00, + .chase = ANIM_BattleKammy_Anim00, + .anim_4 = ANIM_BattleKammy_Anim00, + .anim_5 = ANIM_BattleKammy_Anim00, + .death = ANIM_BattleKammy_Anim00, + .hit = ANIM_BattleKammy_Anim00, + .anim_8 = ANIM_BattleKammy_Anim00, + .anim_9 = ANIM_BattleKammy_Anim00, + .anim_A = ANIM_BattleKammy_Anim00, + .anim_B = ANIM_BattleKammy_Anim00, + .anim_C = ANIM_BattleKammy_Anim00, + .anim_D = ANIM_BattleKammy_Anim00, + .anim_E = ANIM_BattleKammy_Anim00, + .anim_F = ANIM_BattleKammy_Anim00, + }, + .extraAnimations = N(ExtraAnims_Kammy), +}; + +NpcData N(NpcData_Twink) = { + .id = NPC_Twink_02, + .pos = { 0.0f, 0.0f, 0.0f }, + .yaw = 270, + .init = &N(EVS_NpcInit_Twink_02), + .settings = &N(NpcSettings_Dummy), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = NO_DROPS, + .animations = TWINK_ANIMS, + .extraAnimations = N(ExtraAnims_Twink), +}; + +NpcData N(NpcData_StarRod) = { + .id = NPC_StarRod, + .pos = { NPC_DISPOSE_LOCATION }, + .yaw = 270, + .init = &N(EVS_NpcInit_StarRod), + .settings = &N(NpcSettings_StarRod), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = NO_DROPS, + .animations = STAR_ROD_ANIMS, +}; + +#define NAME_SUFFIX + +NpcGroupList N(FinaleNpcs) = { + NPC_GROUP(N(NpcData_Bowser_Npc3), BTL_KPA2_FORMATION_03), + NPC_GROUP(N(NpcData_Peach_Npc3)), + NPC_GROUP(N(NpcData_Kammy_Npc3), BTL_KKJ_FORMATION_00), + NPC_GROUP(N(NpcData_Twink_Npc3)), + NPC_GROUP(N(NpcData_StarRod_Npc3)), + {} +}; diff --git a/src/world/area_kkj/kkj_25/kkj_25_5_arena.c b/src/world/area_kkj/kkj_25/kkj_25_5_arena.c new file mode 100644 index 0000000000..6b67c903bf --- /dev/null +++ b/src/world/area_kkj/kkj_25/kkj_25_5_arena.c @@ -0,0 +1,611 @@ +#include "kkj_25.h" +#include "effects.h" + +#include "world/common/todo/GetFloorCollider.inc.c" + +#include "world/common/util/SetLightningBoltPurple.inc.c" + +#include "world/common/todo/SetEntityPositionF.inc.c" + +#include "world/common/todo/GetEntityPosition.inc.c" + +API_CALLABLE(N(SpawnLensFlare)) { + Bytecode* args = script->ptrReadPos; + f32 posX = evt_get_float_variable(script, *args++); + f32 posY = evt_get_float_variable(script, *args++); + f32 posZ = evt_get_float_variable(script, *args++); + s32 duration = evt_get_variable(script, *args++); + + fx_lens_flare(0, posX, posY, posZ, duration); + return ApiStatus_DONE2; +} + +#define NAME_SUFFIX _Unused1A +#include "world/common/npc/Bowser.inc.c" +#include "world/common/npc/Dummy.inc.c" +#include "world/common/enemy/Kammy_Flying.inc.c" +#include "world/common/enemy/ShyGuy_Stationary.inc.c" +#define NAME_SUFFIX _Unused1B +#include "world/common/npc/Dummy.inc.c" +#define NAME_SUFFIX + +EvtScript N(EVS_ArenaEyesFlash) = { + EVT_CALL(PlaySoundAt, SOUND_5A, 0, 300, -70, 280) + EVT_CALL(N(SpawnLensFlare), 225, -70, 280, 240) + EVT_CALL(N(SpawnLensFlare), 380, -70, 280, 240) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_BowserActivatesSwitch) = { + EVT_THREAD + EVT_WAIT(20) + EVT_CALL(N(GetEntityPosition), MV_SwitchEntityIdx, LVar7, LVar8, LVar9) + EVT_CALL(MakeLerp, 0, -13, 5, EASING_COS_IN_OUT) + EVT_LABEL(0) + EVT_CALL(UpdateLerp) + EVT_CALL(N(SetEntityPositionF), MV_SwitchEntityIdx, LVar7, LVar0, LVar9) + EVT_IF_EQ(LVar1, 1) + EVT_GOTO(0) + EVT_END_IF + EVT_WAIT(30) + EVT_CALL(N(SetEntityPositionF), MV_SwitchEntityIdx, LVar7, -20, LVar9) + EVT_CALL(SetNpcFlagBits, NPC_Bowser_01, NPC_FLAG_DIRTY_SHADOW, TRUE) + EVT_END_THREAD + EVT_THREAD + EVT_SET(MV_Unk_0A, 0) + EVT_CALL(SetNpcAnimation, NPC_Bowser_01, ANIM_WorldBowser_Jump) + EVT_WAIT(10) + EVT_CALL(SetNpcAnimation, NPC_Bowser_01, ANIM_WorldBowser_Land) + EVT_WAIT(10) + EVT_CALL(SetNpcAnimation, NPC_Bowser_01, ANIM_WorldBowser_RearUpLaugh) + EVT_CALL(PlaySound, SOUND_3BC) + EVT_LOOP(0) + EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 1, EVT_FLOAT(2.0)) + EVT_WAIT(1) + EVT_IF_EQ(MV_Unk_0A, 11) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_CALL(PlaySound, SOUND_3BC | SOUND_ID_TRIGGER_CHANGE_SOUND) + EVT_END_THREAD + EVT_CALL(SetNpcJumpscale, NPC_Bowser_01, EVT_FLOAT(1.0)) + EVT_CALL(NpcJump0, NPC_Bowser_01, 300, 0, 0, 20) + EVT_CALL(PlaySoundAtNpc, NPC_Bowser_01, SOUND_208B, 0) + EVT_CALL(PlaySoundAtNpc, NPC_Bowser_01, SOUND_20A0, 0) + EVT_SET(AF_KKJ_1A, TRUE) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_802459E4) = { + EVT_CALL(GetCurrentPartnerID, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_EQ(PARTNER_GOOMBARIO) + EVT_CASE_EQ(PARTNER_KOOPER) + EVT_CASE_EQ(PARTNER_BOMBETTE) + EVT_CASE_EQ(PARTNER_SUSHIE) + EVT_CASE_DEFAULT + EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_GRAVITY, FALSE) + EVT_CALL(GetNpcPos, NPC_PARTNER, LVar0, LVar1, LVar2) + EVT_SET(LVar1, 19) + EVT_CALL(SetNpcPos, NPC_PARTNER, LVar0, LVar1, LVar2) + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +s32 N(BridgeModels)[] = { + MODEL_g49, + MODEL_g48, + MODEL_g47, + MODEL_g46, + MODEL_g45, + MODEL_g44, + MODEL_g43, + MODEL_g42, + MODEL_g41, + MODEL_g40, + MODEL_g39, + MODEL_g38, + MODEL_g37, + MODEL_g36, + MODEL_g35, + MODEL_g34, +}; + +EvtScript N(EVS_Scene_BowserTrapsMario) = { + EVT_LABEL(0) + EVT_CALL(N(GetFloorCollider), LVar0) + EVT_IF_NE(LVar0, COLLIDER_o128) + EVT_WAIT(1) + EVT_GOTO(0) + EVT_END_IF + EVT_THREAD + EVT_WAIT(1) + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(PlayerFaceNpc, NPC_Bowser_01, FALSE) + EVT_CALL(GetPartnerInUse, LVar0) + EVT_CALL(GetCurrentPartnerID, LVar1) + EVT_IF_EQ(LVar1, PARTNER_BOMBETTE) + EVT_IF_NE(LVar0, PARTNER_NONE) + EVT_GOTO(1) + EVT_END_IF + EVT_END_IF + EVT_IF_NE(LVar0, PARTNER_NONE) + EVT_CALL(GetCurrentPartnerID, LVar1) + EVT_IF_NE(LVar1, PARTNER_LAKILESTER) + EVT_CALL(WaitForPlayerTouchingFloor) + EVT_END_IF + EVT_CALL(InterruptUsePartner) + EVT_WAIT(5) + EVT_END_IF + EVT_CALL(GetNpcPos, NPC_PARTNER, LVar0, LVar1, LVar2) + EVT_IF_LT(LVar0, 20) + EVT_CALL(GetPlayerPos, LVar3, LVar4, LVar5) + EVT_IF_LT(LVar5, 0) + EVT_ADD(LVar5, 25) + EVT_ELSE + EVT_ADD(LVar5, -25) + EVT_END_IF + EVT_ADD(LVar3, -10) + EVT_CALL(DisablePartnerAI, 0) + EVT_CALL(SetNpcJumpscale, NPC_PARTNER, EVT_FLOAT(0.8)) + EVT_CALL(NpcJump0, NPC_PARTNER, LVar3, LVar1, LVar5, 12) + EVT_CALL(EnablePartnerAI) + EVT_END_IF + EVT_LABEL(1) + EVT_END_THREAD + EVT_CALL(SpeakToPlayer, NPC_Bowser_01, ANIM_WorldBowser_Talk, ANIM_WorldBowser_Idle, 0, MSG_CH8_007C) + EVT_WAIT(20) + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, 350, 0, 0) + EVT_CALL(SetPanTarget, CAM_DEFAULT, 350, 0, 0) + EVT_CALL(SetCamDistance, CAM_DEFAULT, 450) + EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(17.0), EVT_FLOAT(-7.0)) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(4.0)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_WAIT(10) + EVT_CALL(SpeakToPlayer, NPC_Bowser_01, ANIM_WorldBowser_Talk, ANIM_WorldBowser_Idle, 0, MSG_CH8_007D) + EVT_EXEC_WAIT(N(EVS_BowserActivatesSwitch)) + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, -150, 0, 0) + EVT_CALL(SetPanTarget, CAM_DEFAULT, -150, 0, 100) + EVT_CALL(SetCamDistance, CAM_DEFAULT, 250) + EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(26.0), EVT_FLOAT(-18.0)) + EVT_CALL(SetCamPosA, CAM_DEFAULT, -480, -480) + EVT_CALL(SetCamPosB, CAM_DEFAULT, 0, 480) + 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_RETURN + EVT_END +}; + +EvtScript N(EVS_WaveBridgeModels) = { + EVT_USE_BUF(EVT_PTR(N(BridgeModels))) + EVT_SETF(LVar1, EVT_FLOAT(1.0)) + EVT_SET(LVar2, 1) + EVT_LOOP(ARRAY_COUNT(N(BridgeModels))) + EVT_BUF_READ1(LVar3) + EVT_SETF(LVar0, 0) + EVT_THREAD + EVT_LOOP(5) + EVT_SUBF(LVar0, LVar1) + EVT_CALL(TranslateGroup, LVar3, 0, LVar0, 0) + EVT_WAIT(1) + EVT_END_LOOP + EVT_LOOP(5) + EVT_ADDF(LVar0, LVar1) + EVT_CALL(TranslateGroup, LVar3, 0, LVar0, 0) + EVT_WAIT(1) + EVT_END_LOOP + EVT_LOOP(5) + EVT_ADDF(LVar0, LVar1) + EVT_CALL(TranslateGroup, LVar3, 0, LVar0, 0) + EVT_WAIT(1) + EVT_END_LOOP + EVT_LOOP(5) + EVT_SUBF(LVar0, LVar1) + EVT_CALL(TranslateGroup, LVar3, 0, LVar0, 0) + EVT_WAIT(1) + EVT_END_LOOP + EVT_END_THREAD + EVT_IF_LT(LVar2, 8) + EVT_ADDF(LVar1, EVT_FLOAT(0.5)) + EVT_ELSE + EVT_SUBF(LVar1, EVT_FLOAT(0.5)) + EVT_END_IF + EVT_ADD(LVar2, 1) + EVT_WAIT(3) + EVT_END_LOOP + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_AnimateBridgeCollapsing) = { + EVT_LOOP(4) + EVT_EXEC(N(EVS_WaveBridgeModels)) + EVT_WAIT(25) + EVT_END_LOOP + EVT_THREAD + EVT_WAIT(15) + EVT_SET(MV_Unk_0A, 11) + EVT_END_THREAD + EVT_USE_BUF(EVT_PTR(N(BridgeModels))) + EVT_SET(LVar2, 35) + EVT_SET(LVar5, -15) + EVT_LOOP(ARRAY_COUNT(N(BridgeModels))) + EVT_CALL(PlaySoundAt, SOUND_B000001B, 0, LVar5, 0, 0) + EVT_ADD(LVar5, -30) + EVT_BUF_READ1(LVar3) + EVT_THREAD + EVT_CALL(MakeLerp, 0, -25, 5, EASING_LINEAR) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_CALL(TranslateGroup, LVar3, 0, LVar0, 0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_SET(LVar4, 0) + EVT_CALL(MakeLerp, -25, -1000, LVar2, EASING_CUBIC_IN) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_CALL(TranslateGroup, LVar3, 0, LVar0, 0) + EVT_ADD(LVar4, -20) + EVT_CALL(RotateGroup, LVar3, LVar4, 0, 0, 1) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_CALL(EnableGroup, LVar3, FALSE) + EVT_END_THREAD + EVT_ADD(LVar2, 2) + EVT_WAIT(5) + EVT_END_LOOP + EVT_RETURN + EVT_END +}; + +Vec3i N(PowerUpBoltOrigins1)[] = { + { 230, 160, 0 }, + { 350, 160, 90 }, + { 420, 160, 10 }, + { 280, 160, -10 }, +}; + +Vec3i N(PowerUpBoltOrigins2)[] = { + { 330, 160, 50 }, + { 360, 160, -50 }, + { 370, 160, 50 }, + { 330, 160, -50 }, +}; + +EvtScript N(EVS_Scene_ActivateMachine) = { + EVT_SET(AF_KKJ_1A, FALSE) + EVT_WAIT(10) + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, -150, 0, 0) + EVT_CALL(SetPanTarget, CAM_DEFAULT, -150, 0, 0) + EVT_CALL(SetCamDistance, CAM_DEFAULT, 1000) + EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(12.0), EVT_FLOAT(-5.0)) + EVT_CALL(SetCamPosA, CAM_DEFAULT, -480, -480) + EVT_CALL(SetCamPosB, CAM_DEFAULT, 0, 480) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(4.0)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_WAIT(1) + EVT_THREAD + EVT_CALL(InterpPlayerYaw, 270, 0) + EVT_WAIT(30) + EVT_CALL(SetPlayerAnimation, ANIM_Mario_8000A) + EVT_END_THREAD + EVT_SET(MV_Unk_0A, 10) + EVT_EXEC_WAIT(N(EVS_AnimateBridgeCollapsing)) + EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_CALL(SetPlayerPos, 100, 0, 0) + EVT_CALL(PartnerIsFlying, LVar0) + EVT_IF_EQ(LVar0, FALSE) + EVT_CALL(SetNpcPos, NPC_PARTNER, 60, 10, 0) + EVT_ELSE + EVT_CALL(SetNpcPos, NPC_PARTNER, 60, 0, 0) + EVT_END_IF + EVT_CALL(SetNpcYaw, NPC_PARTNER, 90) + EVT_CALL(SetNpcAnimation, NPC_PARTNER, PARTNER_ANIM_IDLE) + EVT_CALL(SetNpcPos, NPC_PARTNER, 70, 0, 0) + EVT_CALL(GetNpcPos, NPC_Bowser_01, LVar0, LVar1, LVar2) + EVT_ADD(LVar0, 30) + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_CALL(SetCamDistance, CAM_DEFAULT, 330) + EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(17.0), EVT_FLOAT(-11.0)) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(90.0)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_WAIT(10) + EVT_CALL(SpeakToPlayer, NPC_Bowser_01, ANIM_WorldBowser_RearUpLaugh, ANIM_WorldBowser_RearUpLaugh, 0, MSG_CH8_007E) + EVT_THREAD + EVT_CALL(SetNpcJumpscale, NPC_Peach_01, EVT_FLOAT(1.0)) + EVT_CALL(GetNpcPos, NPC_Peach_01, LVar0, LVar1, LVar2) + EVT_CALL(NpcJump0, NPC_Peach_01, LVar0, LVar1, LVar2, 12) + EVT_WAIT(8) + EVT_CALL(GetNpcPos, NPC_Peach_01, LVar0, LVar1, LVar2) + EVT_CALL(NpcJump0, NPC_Peach_01, LVar0, LVar1, LVar2, 7) + EVT_WAIT(10) + EVT_END_THREAD + EVT_CALL(SpeakToPlayer, NPC_Peach_01, ANIM_Peach_D000A, ANIM_Peach_C001E, 0, MSG_CH8_007F) + EVT_WAIT(15) + EVT_CALL(SpeakToPlayer, NPC_Kammy_01, ANIM_BattleKammy_Anim06, ANIM_BattleKammy_Anim04, 512, MSG_CH8_0080) + EVT_WAIT(15) + EVT_CALL(GetNpcPos, NPC_Kammy_01, LVar0, LVar1, LVar2) + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_CALL(SetCamDistance, CAM_DEFAULT, 250) + EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(17.0), EVT_FLOAT(-8.0)) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(2.0)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_CALL(SetNpcAnimation, NPC_Bowser_01, ANIM_WorldBowser_Idle) + EVT_WAIT(10) + EVT_THREAD + EVT_WAIT(10) + EVT_CALL(InterpNpcYaw, NPC_Peach_01, 90, 0) + EVT_WAIT(30) + EVT_CALL(InterpNpcYaw, NPC_Peach_01, 270, 0) + EVT_END_THREAD + EVT_CALL(SetNpcAnimation, NPC_Kammy_01, ANIM_BattleKammy_Anim07) + EVT_CALL(SpeakToPlayer, NPC_Kammy_01, ANIM_BattleKammy_Anim07, ANIM_BattleKammy_Anim07, 512, MSG_CH8_0081) + EVT_CALL(FadeOutMusic, 0, 1500) + EVT_CALL(SetNpcAnimation, NPC_Kammy_01, ANIM_BattleKammy_Anim08) + EVT_CALL(GetNpcPos, NPC_Kammy_01, LVar0, LVar1, LVar2) + EVT_ADD(LVar0, -30) + EVT_CALL(PlaySoundAt, SOUND_207A, 0, LVar0, 22, 0) + EVT_PLAY_EFFECT(EFFECT_GATHER_ENERGY_PINK, 0, LVar0, 22, 0, 1, 80) + EVT_THREAD + EVT_WAIT(80) + EVT_CALL(SetNpcAnimation, NPC_Kammy_01, ANIM_BattleKammy_Anim04) + EVT_END_THREAD + EVT_WAIT(40) + EVT_CALL(SetCamProperties, CAM_DEFAULT, EVT_FLOAT(4.0), 300, 0, 0, 1100, EVT_FLOAT(7.0), EVT_FLOAT(0.0)) + EVT_WAIT(20) + EVT_CALL(SetMusicTrack, 0, SONG_BOWSER_BATTLE, 0, 8) + EVT_EXEC(N(EVS_ArenaEyesFlash)) + EVT_WAIT(30) + EVT_SET(MV_ArenaState, ARENA_STATE_ACTIVATING) + EVT_LOOP(0) + EVT_WAIT(1) + EVT_IF_NE(MV_ArenaState, ARENA_STATE_ACTIVATING) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_CALL(GetNpcPos, NPC_Bowser_01, LVar0, LVar1, LVar2) + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_CALL(SetCamDistance, CAM_DEFAULT, 400) + EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(17.0), EVT_FLOAT(-10.0)) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(4.0)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_CALL(SetNpcAnimation, NPC_Bowser_01, ANIM_WorldBowser_Shock) + EVT_CALL(GetNpcPos, NPC_Bowser_01, LVar3, LVar4, LVar5) + EVT_THREAD + EVT_USE_BUF(EVT_PTR(N(PowerUpBoltOrigins1))) + EVT_LOOP(ARRAY_COUNT(N(PowerUpBoltOrigins1))) + EVT_BUF_READ3(LVar0, LVar1, LVar2) + EVT_PLAY_EFFECT(EFFECT_LIGHTNING_BOLT, 0, LVar0, LVar1, LVar2, LVar3, LVar4, LVar5, 1, 8) + EVT_WAIT(8) + EVT_END_LOOP + EVT_END_THREAD + EVT_THREAD + EVT_USE_BUF(EVT_PTR(N(PowerUpBoltOrigins2))) + EVT_LOOP(ARRAY_COUNT(N(PowerUpBoltOrigins2))) + EVT_BUF_READ3(LVar0, LVar1, LVar2) + EVT_PLAY_EFFECT(EFFECT_LIGHTNING_BOLT, 0, LVar0, LVar1, LVar2, LVar3, LVar4, LVar5, 1, 8) + EVT_WAIT(12) + EVT_END_LOOP + EVT_CALL(SetNpcDecoration, NPC_Bowser_01, 0, NPC_DECORATION_BOWSER_AURA) + EVT_END_THREAD + EVT_WAIT(15) + EVT_CALL(PlaySoundAtNpc, NPC_Bowser_01, SOUND_223, 0) + EVT_SETF(LVar0, EVT_FLOAT(1.0)) + EVT_LOOP(50) + EVT_ADDF(LVar0, EVT_FLOAT(0.01)) + EVT_CALL(SetNpcScale, NPC_Bowser_01, LVar0, LVar0, LVar0) + EVT_WAIT(1) + EVT_END_LOOP + EVT_CALL(SetNpcAnimation, NPC_Bowser_01, ANIM_WorldBowser_RearUpLaugh) + EVT_WAIT(20) + EVT_CALL(SetNpcAnimation, NPC_Bowser_01, ANIM_WorldBowser_Idle) + EVT_CALL(SpeakToPlayer, NPC_Bowser_01, ANIM_WorldBowser_Talk, ANIM_WorldBowser_Idle, 0, MSG_CH8_0082) + EVT_WAIT(40) + EVT_CALL(SetPlayerAnimation, ANIM_Mario_BeforeJump) + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_ADD(LVar0, 50) + EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_CALL(SetCamDistance, CAM_DEFAULT, 500) + EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(17.0), EVT_FLOAT(-11.0)) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(2.0)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_THREAD + EVT_WAIT(8) + EVT_LOOP(4) + EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 4, EVT_FLOAT(2.0)) + EVT_WAIT(3) + EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 2, EVT_FLOAT(1.0)) + EVT_WAIT(3) + EVT_END_LOOP + EVT_END_THREAD + EVT_CALL(SetNpcAnimation, NPC_Bowser_01, ANIM_WorldBowser_Walk) + EVT_CALL(NpcMoveTo, NPC_Bowser_01, 200, 0, 45) + EVT_CALL(SetNpcAnimation, NPC_Bowser_01, ANIM_WorldBowser_Idle) + EVT_WAIT(10) + EVT_CALL(SpeakToPlayer, NPC_Bowser_01, ANIM_WorldBowser_Talk, ANIM_WorldBowser_Idle, 0, MSG_CH8_0083) + EVT_WAIT(10) + EVT_CALL(SetNpcVar, NPC_Bowser_01, 0, 1) + EVT_RETURN + EVT_END +}; + +Vec3i N(CirculatingBoltPositions)[] = { + { EVT_FLOAT(625.825), EVT_FLOAT(-9.194), EVT_FLOAT(-91.893) }, { EVT_FLOAT(609.671), EVT_FLOAT(-9.194), EVT_FLOAT(136.274) }, + { EVT_FLOAT(609.671), EVT_FLOAT(-9.194), EVT_FLOAT(136.274) }, { EVT_FLOAT(450.634), EVT_FLOAT(-9.194), EVT_FLOAT(300.677) }, + { EVT_FLOAT(450.634), EVT_FLOAT(-9.194), EVT_FLOAT(300.677) }, { EVT_FLOAT(223.128), EVT_FLOAT(-9.194), EVT_FLOAT(324.39) }, + { EVT_FLOAT(223.128), EVT_FLOAT(-9.194), EVT_FLOAT(324.39) }, { EVT_FLOAT(33.606), EVT_FLOAT(-9.194), EVT_FLOAT(196.317) }, + { EVT_FLOAT(33.606), EVT_FLOAT(-9.194), EVT_FLOAT(196.317) }, { EVT_FLOAT(-29.252), EVT_FLOAT(-9.194), EVT_FLOAT(-23.615) }, + { EVT_FLOAT(-29.252), EVT_FLOAT(-9.194), EVT_FLOAT(-23.615) }, { EVT_FLOAT(63.964), EVT_FLOAT(-9.194), EVT_FLOAT(-232.497) }, + { EVT_FLOAT(63.964), EVT_FLOAT(-9.194), EVT_FLOAT(-232.497) }, { EVT_FLOAT(269.64), EVT_FLOAT(-9.194), EVT_FLOAT(-332.591) }, + { EVT_FLOAT(269.64), EVT_FLOAT(-9.194), EVT_FLOAT(-332.591) }, { EVT_FLOAT(491.536), EVT_FLOAT(-9.194), EVT_FLOAT(-277.063) }, + { EVT_FLOAT(491.536), EVT_FLOAT(-9.194), EVT_FLOAT(-277.063) }, { EVT_FLOAT(625.825), EVT_FLOAT(-9.194), EVT_FLOAT(-91.893) }, +}; + +Vec3i N(RandomBoltPositions)[] = { + { 180, 300, -200 }, { 250, 0, -150 }, + { 270, 300, -200 }, { 200, 0, -150 }, + { 350, 300, -240 }, { 500, 0, -160 }, + { 550, 300, -240 }, { 400, 0, -160 }, + { 500, 300, -50 }, { 550, 0, -50 }, + { 585, 300, 100 }, { 535, 0, 100 }, + { 95, 300, -50 }, { 180, 0, -50 }, + { 215, 300, -50 }, { 130, 0, -50 }, +}; + +EvtScript N(EVS_ManageArenaEffects) = { + EVT_CHILD_THREAD + EVT_SET(LVar2, 0) + EVT_SET(LVar3, 0) + EVT_IF_EQ(GF_KKJ25_Defeated_Kammy, FALSE) + EVT_THREAD + EVT_WAIT(50) + EVT_CALL(PlaySound, SOUND_22C) + EVT_END_THREAD + EVT_CALL(MakeLerp, 0, 50, 120, EASING_QUADRATIC_IN) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_DIV(LVar0, 10) + EVT_SUB(LVar2, LVar0) + EVT_CALL(RotateGroup, MODEL_g31, LVar2, 0, 1, 0) + EVT_ADD(LVar3, LVar0) + EVT_CALL(RotateGroup, MODEL_g7, LVar3, 0, 1, 0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_ELSE + EVT_IF_EQ(GF_KKJ25_Defeated_Bowser, FALSE) + EVT_CALL(PlaySound, SOUND_22D) + EVT_END_IF + EVT_SET(LVar0, 5) + EVT_END_IF + EVT_LOOP(0) + EVT_ADDF(LVar2, LVar0) + EVT_IF_GT(LVar2, 360) + EVT_SUBF(LVar2, 360) + EVT_END_IF + EVT_CALL(RotateGroup, MODEL_g31, LVar2, 0, 1, 0) + EVT_SUBF(LVar3, LVar0) + EVT_IF_LT(LVar3, -360) + EVT_ADDF(LVar3, 360) + EVT_END_IF + EVT_CALL(RotateGroup, MODEL_g7, LVar3, 0, 1, 0) + EVT_WAIT(1) + EVT_END_LOOP + EVT_END_CHILD_THREAD + EVT_WAIT(45) + EVT_CHILD_THREAD + EVT_LOOP(0) + EVT_USE_BUF(EVT_PTR(N(CirculatingBoltPositions))) + EVT_LOOP(ARRAY_COUNT(N(CirculatingBoltPositions)) / 2) + EVT_BUF_READ3(LVar0, LVar1, LVar2) + EVT_BUF_READ3(LVar3, LVar4, LVar5) + EVT_PLAY_EFFECT(EFFECT_LIGHTNING_BOLT, 0, LVar0, LVar1, LVar2, LVar3, LVar4, LVar5, 1, 5) + EVT_CALL(N(SetLightningBoltPurple)) + EVT_WAIT(5) + EVT_END_LOOP + EVT_END_LOOP + EVT_END_CHILD_THREAD + EVT_CHILD_THREAD + EVT_LOOP(0) + EVT_USE_BUF(EVT_PTR(N(RandomBoltPositions))) + EVT_CALL(RandInt, 7, LVar6) + EVT_ADD(LVar6, 1) + EVT_LOOP(LVar6) + EVT_BUF_READ3(LVar0, LVar1, LVar2) + EVT_BUF_READ3(LVar3, LVar4, LVar5) + EVT_END_LOOP + EVT_IF_NE(MV_ArenaState, ARENA_STATE_OVERLOADING) + EVT_PLAY_EFFECT(EFFECT_LIGHTNING_BOLT, 0, LVar0, LVar1, LVar2, LVar3, LVar4, LVar5, 1, 10) + EVT_CALL(N(SetLightningBoltPurple)) + EVT_WAIT(30) + EVT_ELSE + EVT_PLAY_EFFECT(EFFECT_LIGHTNING_BOLT, 0, LVar0, LVar1, LVar2, LVar3, LVar4, LVar5, 1, 5) + EVT_CALL(N(SetLightningBoltPurple)) + EVT_WAIT(15) + EVT_END_IF + EVT_END_LOOP + EVT_END_CHILD_THREAD + EVT_CHILD_THREAD + EVT_SET(LVar0, 0) + EVT_LOOP(0) + EVT_ADD(LVar0, 20) + EVT_IF_GE(LVar0, 360) + EVT_SUB(LVar0, 360) + EVT_END_IF + EVT_CALL(RotateGroup, MODEL_g51, LVar0, 0, 1, 0) + EVT_WAIT(1) + EVT_END_LOOP + EVT_END_CHILD_THREAD + EVT_CHILD_THREAD + EVT_IF_EQ(GF_KKJ25_Defeated_Kammy, FALSE) + EVT_CALL(EnableModel, MODEL_o122, TRUE) + EVT_CALL(MakeLerp, 0, 250, 100, EASING_QUADRATIC_IN) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_CALL(ScaleModel, MODEL_o122, LVar0, 1, LVar0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_END_IF + EVT_LOOP(0) + EVT_IF_NE(MV_ArenaState, ARENA_STATE_OVERLOADING) + EVT_SET(LVar2, 250) + EVT_ELSE + EVT_SET(LVar2, 90) + EVT_END_IF + EVT_CALL(MakeLerp, LVar2, 90, 45, EASING_COS_IN_OUT) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_CALL(ScaleModel, MODEL_o122, LVar0, 1, LVar0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_LOOP(15) + EVT_CALL(ScaleModel, MODEL_o122, LVar0, 1, LVar0) + EVT_WAIT(1) + EVT_END_LOOP + EVT_CALL(MakeLerp, 90, LVar2, 30, EASING_COS_IN_OUT) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_CALL(ScaleModel, MODEL_o122, LVar0, 1, LVar0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_END_LOOP + EVT_END_CHILD_THREAD + EVT_WAIT(180) + EVT_SET(MV_ArenaState, ARENA_STATE_FULL_POWER) + EVT_LOOP(0) + EVT_WAIT(1) + EVT_IF_EQ(MV_ArenaState, ARENA_STATE_BROKEN) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_CALL(StopSound, SOUND_22D) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_kkj/kkj_25/kkj_25_6_peach_free.c b/src/world/area_kkj/kkj_25/kkj_25_6_peach_free.c new file mode 100644 index 0000000000..34a89f9195 --- /dev/null +++ b/src/world/area_kkj/kkj_25/kkj_25_6_peach_free.c @@ -0,0 +1,237 @@ +#include "kkj_25.h" +#include "effects.h" + +#define KNOCK_DOWN_MAP_VAR MV_Unk_0A +#include "world/common/complete/KnockDownPlayer.inc.c" + +API_CALLABLE(N(SpawnStarsOrbitingKammy1)) { + EffectInstance* effect; + + fx_stars_orbiting(0, script->varTable[0], script->varTable[1], script->varTable[2], script->varTable[3], script->varTable[4], &effect); + script->varTablePtr[0] = effect; + + return ApiStatus_DONE2; +} + +API_CALLABLE(N(DismissStarsOrbitingKammy1)) { + EffectInstance* effect = (EffectInstance*) script->varTablePtr[0]; + + effect->data.starsOrbiting->enabled = FALSE; + return ApiStatus_DONE2; +} + +API_CALLABLE(N(SetEnergyWaveOrigin)) { + Bytecode* args = script->ptrReadPos; + EffectInstance* effect = (EffectInstance*) evt_get_variable(script, *args++); + s32 posX = evt_get_variable(script, *args++); + s32 posY = evt_get_variable(script, *args++); + s32 posZ = evt_get_variable(script, *args++); + + effect->data.energyInOut->pos.x = posX; + effect->data.energyInOut->pos.y = posY; + effect->data.energyInOut->pos.z = posZ; + + return ApiStatus_DONE2; +} + +Vec3f N(TwinkArrivePath)[] = { + { 445.0, 60.0, 0.0 }, + { 480.0, 40.0, -20.0 }, + { 510.0, 25.0, 0.0 }, +}; + +EvtScript N(EVS_SpawnBowserStarEnergyWaves) = { + EVT_CALL(GetNpcPos, LVar8, LVar0, LVar1, LVar2) + EVT_ADD(LVar1, EVT_FLOAT(54.0)) + EVT_PLAY_EFFECT(EFFECT_ENERGY_IN_OUT, 4, LVar0, LVar1, LVar2, EVT_FLOAT(1.5), -1) + EVT_LOOP(0) + EVT_WAIT(1) + EVT_CALL(GetNpcPos, LVar8, LVar0, LVar1, LVar2) + EVT_ADD(LVar1, EVT_FLOAT(54.0)) + EVT_CALL(N(SetEnergyWaveOrigin), LVarF, LVar0, LVar1, LVar2) + EVT_END_LOOP + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Scene_PeachBreaksFree) = { + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(DisablePartnerAI, 0) + EVT_CALL(SetPlayerAnimation, ANIM_Mario_BeforeJump) + EVT_CALL(SetPlayerPos, 100, 0, 0) + EVT_CALL(PartnerIsFlying, LVar0) + EVT_IF_EQ(LVar0, FALSE) + EVT_CALL(SetNpcPos, NPC_PARTNER, 60, 10, 0) + EVT_ELSE + EVT_CALL(SetNpcPos, NPC_PARTNER, 60, 0, 0) + EVT_END_IF + EVT_CALL(SetNpcYaw, NPC_PARTNER, 90) + EVT_CALL(SetNpcAnimation, NPC_PARTNER, PARTNER_ANIM_IDLE) + EVT_CALL(SetNpcPos, NPC_Bowser_01, 200, 0, 0) + EVT_CALL(SetNpcAnimation, NPC_Bowser_01, ANIM_WorldBowser_Idle) + EVT_CALL(SetNpcPos, NPC_Peach_01, 475, 0, 0) + EVT_CALL(SetNpcAnimation, NPC_Peach_01, ANIM_Peach_C001E) + EVT_CALL(SetNpcPos, NPC_Kammy_01, 550, 10, -50) + EVT_CALL(SetNpcAnimation, NPC_Kammy_01, ANIM_BattleKammy_Anim04) + EVT_CALL(SetNpcDecoration, NPC_Bowser_01, 0, NPC_DECORATION_BOWSER_AURA) + EVT_CALL(SetNpcDecoration, NPC_Bowser_01, 1, NPC_DECORATION_CHARGED) + EVT_SET(LVar8, NPC_Bowser_01) + EVT_EXEC(N(EVS_SpawnBowserStarEnergyWaves)) + EVT_CALL(SetCamType, CAM_DEFAULT, 0, FALSE) + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_CALL(SetCamDistance, CAM_DEFAULT, 400) + EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(17.0), EVT_FLOAT(-10.0)) + EVT_CALL(SetCamPosA, CAM_DEFAULT, 0, 30) + EVT_CALL(SetCamPosB, CAM_DEFAULT, 0, 20) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(90.0)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_WAIT(30) + EVT_CALL(GetNpcPos, NPC_Peach_01, 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(4.0)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_WAIT(15) + EVT_CALL(SetCamDistance, CAM_DEFAULT, 250) + EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(17.0), EVT_FLOAT(-9.5)) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(4.0)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_WAIT(10) + EVT_CALL(SpeakToPlayer, NPC_Peach_01, ANIM_Peach_D000A, ANIM_Peach_C001E, 0, MSG_CH8_008E) + EVT_WAIT(10) + EVT_CALL(GetNpcPos, NPC_Peach_01, LVar0, LVar1, LVar2) + EVT_ADD(LVar0, 20) + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_CALL(SetCamDistance, CAM_DEFAULT, 350) + EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(17.0), EVT_FLOAT(-9.0)) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(4.0)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_CALL(NpcMoveTo, NPC_Kammy_01, 520, -50, 15) + EVT_THREAD + EVT_WAIT(10) + EVT_CALL(InterpNpcYaw, NPC_Peach_01, 90, 0) + EVT_END_THREAD + EVT_CALL(SetNpcAnimation, NPC_Kammy_01, ANIM_BattleKammy_Anim0B) + EVT_CALL(SpeakToPlayer, NPC_Kammy_01, ANIM_BattleKammy_Anim07, ANIM_BattleKammy_Anim0B, 0, MSG_CH8_008F) + EVT_WAIT(10) + EVT_CALL(SetNpcAnimation, NPC_Twink_01, ANIM_Twink_Sad) + EVT_CALL(SetNpcPos, NPC_Twink_01, 850, 400, 0) + EVT_CALL(SetNpcJumpscale, NPC_Twink_01, EVT_FLOAT(0.0)) + EVT_CALL(NpcJump0, NPC_Twink_01, 530, 45, -50, 30) + EVT_CALL(PlaySoundAtNpc, NPC_Kammy_01, SOUND_HIT_NORMAL, 0) + EVT_PLAY_EFFECT(EFFECT_DAMAGE_STARS, 3, 530, 45, -50, -1, -1, 0, 3) + EVT_THREAD + EVT_CALL(SetNpcAnimation, NPC_Kammy_01, ANIM_BattleKammy_Anim0C) + EVT_CALL(SetNpcPos, NPC_Kammy_02, 530, 15, -50) + EVT_CALL(SetNpcJumpscale, NPC_Kammy_01, EVT_FLOAT(0.0)) + EVT_CALL(NpcJump1, NPC_Kammy_01, 540, 10, -50, 30) + EVT_END_THREAD + EVT_THREAD + EVT_CALL(SetNpcJumpscale, NPC_Kammy_02, EVT_FLOAT(0.4)) + EVT_CALL(NpcJump0, NPC_Kammy_02, 545, 0, -30, 25) + EVT_CALL(GetNpcPos, NPC_Kammy_02, LVar0, LVar1, LVar2) + EVT_ADD(LVar1, 30) + EVT_SET(LVar3, 20) + EVT_SET(LVar4, 3) + EVT_CALL(N(SpawnStarsOrbitingKammy1)) + EVT_SET(MV_OrbitingEffectAIdx, LVar0) + EVT_CALL(PlaySound, SOUND_20E5) + EVT_WAIT(5) + EVT_CALL(SetNpcAnimation, NPC_Kammy_02, ANIM_BattleKammy_Anim03) + EVT_END_THREAD + EVT_THREAD + EVT_CALL(SetNpcJumpscale, NPC_Twink_01, EVT_FLOAT(0.5)) + EVT_CALL(NpcJump0, NPC_Twink_01, 445, 60, 0, 30) + EVT_CALL(InterpNpcYaw, NPC_Twink_01, 90, 0) + EVT_END_THREAD + EVT_WAIT(50) + EVT_CALL(LoadPath, 30, EVT_PTR(N(TwinkArrivePath)), ARRAY_COUNT(N(TwinkArrivePath)), EASING_QUADRATIC_IN) + EVT_LOOP(0) + EVT_CALL(GetNextPathPos) + EVT_CALL(SetNpcPos, NPC_Twink_01, LVar1, LVar2, LVar3) + EVT_WAIT(1) + EVT_IF_EQ(LVar0, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_CALL(SetNpcAnimation, NPC_Twink_01, ANIM_Twink_Idle) + EVT_CALL(InterpNpcYaw, NPC_Twink_01, 270, 0) + EVT_WAIT(10) + EVT_CALL(SpeakToPlayer, NPC_Twink_01, ANIM_Twink_Talk, ANIM_Twink_Idle, 0, MSG_CH8_0090) + EVT_WAIT(10) + EVT_CALL(SetNpcJumpscale, NPC_Twink_01, EVT_FLOAT(0.0)) + EVT_CALL(NpcJump0, NPC_Twink_01, 490, 18, 0, 20) + EVT_WAIT(10) + EVT_CALL(SetNpcAnimation, NPC_Twink_01, ANIM_Twink_Back) + EVT_CALL(GetNpcPos, NPC_Peach_01, LVar3, LVar4, LVar5) + EVT_ADD(LVar4, 20) + EVT_THREAD + EVT_CALL(GetNpcPos, NPC_Twink_01, LVar0, LVar1, LVar2) + EVT_LOOP(2) + EVT_LOOP(6) + EVT_ADD(LVar1, -1) + EVT_CALL(SetNpcPos, NPC_Twink_01, LVar0, LVar1, LVar2) + EVT_WAIT(1) + EVT_END_LOOP + EVT_PLAY_EFFECT(EFFECT_LANDING_DUST, 1, LVar3, LVar4, LVar5, 0) + EVT_WAIT(3) + EVT_LOOP(6) + EVT_ADD(LVar1, 1) + EVT_CALL(SetNpcPos, NPC_Twink_01, LVar0, LVar1, LVar2) + EVT_WAIT(1) + EVT_END_LOOP + EVT_PLAY_EFFECT(EFFECT_LANDING_DUST, 1, LVar3, LVar4, LVar5, 0) + EVT_WAIT(3) + EVT_END_LOOP + EVT_END_THREAD + EVT_CALL(SpeakToPlayer, NPC_Peach_01, ANIM_Peach_D0009, ANIM_Peach_D000B, 5, MSG_CH8_0091) + EVT_CALL(SetNpcAnimation, NPC_Peach_01, ANIM_Peach_D000B) + EVT_SET(LVar2, 12) + EVT_LOOP(4) + EVT_CALL(MakeLerp, 90, 450, LVar2, EASING_LINEAR) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_ADD(LVar0, 90) + EVT_IF_GT(LVar0, 359) + EVT_SUB(LVar0, 360) + EVT_END_IF + EVT_CALL(InterpNpcYaw, NPC_Peach_01, LVar0, 1) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_SUB(LVar2, 2) + EVT_PLAY_EFFECT(EFFECT_LANDING_DUST, 1, LVar3, LVar4, LVar5, 0) + EVT_END_LOOP + EVT_CALL(SetNpcAnimation, NPC_Peach_01, ANIM_Peach_A0001) + EVT_CALL(SetNpcAnimation, NPC_Twink_01, ANIM_Twink_Idle) + EVT_WAIT(20) + EVT_SET(LVar0, MV_OrbitingEffectAIdx) + EVT_CALL(N(DismissStarsOrbitingKammy1)) + EVT_CALL(SetNpcAnimation, NPC_Kammy_02, ANIM_BattleKammy_Anim00) + EVT_WAIT(5) + EVT_CALL(InterpNpcYaw, NPC_Twink_01, 90, 0) + EVT_CALL(NpcFaceNpc, NPC_Kammy_02, NPC_Kammy_01, 0) + EVT_WAIT(10) + EVT_CALL(SetNpcAnimation, NPC_Twink_01, ANIM_Twink_Sad) + EVT_CALL(SetNpcAnimation, NPC_Kammy_02, ANIM_BattleKammy_Anim02) + EVT_CALL(SetNpcJumpscale, NPC_Kammy_02, EVT_FLOAT(1.0)) + EVT_CALL(GetNpcPos, NPC_Kammy_01, LVar0, LVar1, LVar2) + EVT_ADD(LVar1, 10) + EVT_SUB(LVar2, 5) + EVT_CALL(NpcJump0, NPC_Kammy_02, LVar0, LVar1, LVar2, 20) + EVT_CALL(SetNpcPos, NPC_Kammy_02, 300, -100, 0) + EVT_CALL(SetNpcAnimation, NPC_Kammy_01, ANIM_BattleKammy_Anim04) + EVT_WAIT(10) + EVT_CALL(SpeakToPlayer, NPC_Kammy_01, ANIM_BattleKammy_Anim06, ANIM_BattleKammy_Anim04, 0, MSG_CH8_0092) + EVT_WAIT(10) + EVT_CALL(SetNpcVar, NPC_Kammy_01, 0, 1) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_kkj/kkj_25/kkj_25_7_kammy_defeated.c b/src/world/area_kkj/kkj_25/kkj_25_7_kammy_defeated.c new file mode 100644 index 0000000000..cc643ac143 --- /dev/null +++ b/src/world/area_kkj/kkj_25/kkj_25_7_kammy_defeated.c @@ -0,0 +1,407 @@ +#include "kkj_25.h" +#include "effects.h" + +API_CALLABLE(N(SpawnStarsOrbitingKammy2)) { + EffectInstance* effect; + + fx_stars_orbiting(0, script->varTable[0], script->varTable[1], script->varTable[2], script->varTable[3], script->varTable[4], &effect); + script->varTablePtr[0] = effect; + + return ApiStatus_DONE2; +} + +API_CALLABLE(N(DismissStarsOrbitingKammy2)) { + EffectInstance* effect = (EffectInstance*) script->varTablePtr[0]; + + effect->data.starsOrbiting->enabled = FALSE; + return ApiStatus_DONE2; +} + +API_CALLABLE(N(UpgradeStarBeam)) { + gPlayerData.starBeamLevel = 2; + gPlayerData.curHP = gPlayerData.curMaxHP; + gPlayerData.curFP = gPlayerData.curMaxFP; + gPlayerData.specialBarsFilled = gPlayerData.maxStarPower * 256; + + sync_status_menu(); + return ApiStatus_DONE2; +} + +Vec3f N(TwinkStrikeBowserPath)[] = { + { 510.0, 30.0, 0.0 }, + { 430.0, 15.0, 15.0 }, + { 350.0, 20.0, 0.0 }, +}; + +EvtScript N(AddStarSpiritHovering) = { + EVT_LOOP(0) + EVT_LOOP(5) + EVT_CALL(GetNpcPos, LVar0, LVar1, LVar2, LVar3) + EVT_ADD(LVar2, 1) + EVT_CALL(SetNpcPos, LVar0, LVar1, LVar2, LVar3) + EVT_WAIT(2) + EVT_END_LOOP + EVT_LOOP(5) + EVT_CALL(GetNpcPos, LVar0, LVar1, LVar2, LVar3) + EVT_ADD(LVar2, -1) + EVT_CALL(SetNpcPos, LVar0, LVar1, LVar2, LVar3) + EVT_WAIT(2) + EVT_END_LOOP + EVT_END_LOOP + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Scene_KammyDefeated) = { + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(DisablePartnerAI, 0) + EVT_CALL(SetPlayerAnimation, ANIM_Mario_BeforeJump) + EVT_CALL(SetPlayerPos, 100, 0, 0) + EVT_CALL(PartnerIsFlying, LVar0) + EVT_IF_EQ(LVar0, FALSE) + EVT_CALL(SetNpcPos, NPC_PARTNER, 60, 10, 0) + EVT_ELSE + EVT_CALL(SetNpcPos, NPC_PARTNER, 60, 0, 0) + EVT_END_IF + EVT_CALL(SetNpcYaw, NPC_PARTNER, 90) + EVT_CALL(SetNpcAnimation, NPC_PARTNER, PARTNER_ANIM_IDLE) + EVT_CALL(GetNpcPos, NPC_Peach_01, LVar0, LVar1, LVar2) + EVT_ADD(LVar0, 20) + 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(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(17.0), EVT_FLOAT(-8.5)) + EVT_CALL(SetCamDistance, CAM_DEFAULT, 300) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_CALL(GetNpcPos, NPC_Kammy_04, LVar0, LVar1, LVar2) + EVT_ADD(LVar1, 30) + EVT_SET(LVar3, 20) + EVT_SET(LVar4, 3) + EVT_CALL(N(SpawnStarsOrbitingKammy2)) + EVT_SET(MV_OrbitingEffectBIdx, LVar0) + EVT_WAIT(20) + EVT_CALL(InterpNpcYaw, NPC_Peach_01, 90, 0) + EVT_WAIT(20) + EVT_CALL(InterpNpcYaw, NPC_Peach_01, 270, 0) + EVT_WAIT(10) + EVT_CALL(SetNpcAnimation, NPC_Peach_01, ANIM_Peach_C0000) + EVT_WAIT(10) + EVT_CALL(SetNpcAnimation, NPC_Peach_01, ANIM_Peach_C0026) + EVT_CALL(SpeakToPlayer, NPC_Peach_01, ANIM_Peach_C0001, ANIM_Peach_C0026, 5, MSG_CH8_009C) + EVT_WAIT(10) + EVT_CALL(InterpNpcYaw, NPC_Peach_01, 90, 0) + EVT_CALL(SpeakToPlayer, NPC_Twink_01, ANIM_Twink_Talk, ANIM_Twink_Idle, 0, MSG_CH8_009D) + EVT_WAIT(10) + EVT_CALL(StopSound, SOUND_22D) + EVT_CALL(SetMusicTrack, 0, SONG_PEACH_WISHES, 0, 8) + EVT_CALL(InterpNpcYaw, NPC_Peach_01, 270, 0) + EVT_WAIT(10) + EVT_CALL(SpeakToPlayer, NPC_Peach_01, ANIM_Peach_C0001, ANIM_Peach_C0026, 5, MSG_CH8_009E) + EVT_WAIT(10) + EVT_CALL(SpeakToPlayer, NPC_Twink_01, ANIM_Twink_Talk, ANIM_Twink_Idle, 5, MSG_CH8_009F) + EVT_WAIT(10) + EVT_CALL(SetNpcAnimation, NPC_Peach_01, ANIM_Peach_C0002) + EVT_WAIT(10) + EVT_CALL(SetNpcAnimation, NPC_Peach_01, ANIM_Peach_D000F) + EVT_WAIT(10) + EVT_CALL(LoadPath, 20, EVT_PTR(N(TwinkStrikeBowserPath)), ARRAY_COUNT(N(TwinkStrikeBowserPath)), EASING_QUADRATIC_IN) + EVT_LOOP(0) + EVT_CALL(GetNextPathPos) + EVT_CALL(SetNpcPos, NPC_Twink_01, LVar1, LVar2, LVar3) + EVT_WAIT(1) + EVT_IF_EQ(LVar0, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_WAIT(20) + EVT_CALL(GetNpcPos, NPC_Peach_01, LVar0, LVar1, LVar2) + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_CALL(SetCamDistance, CAM_DEFAULT, 245) + EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(17.0), EVT_FLOAT(-11.0)) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(0.6)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_CALL(GetNpcPos, NPC_Peach_01, LVar0, LVar1, LVar2) + EVT_ADD(LVar1, 10) + EVT_CALL(PlaySoundAt, SOUND_2051, 0, LVar0, LVar1, LVar2) + EVT_PLAY_EFFECT(EFFECT_STARS_SHIMMER, 5, LVar0, LVar1, LVar2, 40, 120, 45, 150) + EVT_WAIT(150) + EVT_CALL(SetNpcAnimation, NPC_Bowser_02, ANIM_WorldBowser_RearUpLaugh) + EVT_CALL(SetNpcDecoration, NPC_Bowser_02, 0, NPC_DECORATION_BOWSER_AURA) + EVT_CALL(SetNpcDecoration, NPC_Bowser_02, 1, NPC_DECORATION_CHARGED) + EVT_SET(LVar8, NPC_Bowser_02) + EVT_EXEC(N(EVS_SpawnBowserStarEnergyWaves)) + EVT_WAIT(5) + EVT_CALL(GetNpcPos, NPC_Bowser_02, LVar0, LVar1, LVar2) + EVT_ADD(LVar0, -50) + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_CALL(SetCamDistance, CAM_DEFAULT, 400) + EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(16.0), EVT_FLOAT(-10.0)) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(90.0)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_SET(LVar0, MV_OrbitingEffectBIdx) + EVT_CALL(N(DismissStarsOrbitingKammy2)) + EVT_WAIT(20) + EVT_CALL(SpeakToPlayer, NPC_Bowser_02, ANIM_WorldBowser_RearUpLaugh, ANIM_WorldBowser_RearUpLaugh, 0, MSG_CH8_00A0) + EVT_WAIT(10) + EVT_CALL(SetNpcPos, NPC_Twink_01, 500, 200, 0) + EVT_CALL(SetNpcJumpscale, NPC_Twink_01, EVT_FLOAT(0.0)) + EVT_CALL(NpcJump0, NPC_Twink_01, 205, 90, 0, 20) + EVT_CALL(PlaySoundAtNpc, NPC_Twink_01, SOUND_HIT_NORMAL, 0) + EVT_CALL(SetNpcAnimation, NPC_Bowser_02, ANIM_WorldBowser_Shock) + EVT_PLAY_EFFECT(EFFECT_DAMAGE_STARS, 3, 205, 90, 0, -1, -1, 0, 3) + EVT_THREAD + EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 8, EVT_FLOAT(1.5)) + EVT_END_THREAD + EVT_CALL(SetNpcJumpscale, NPC_Twink_01, EVT_FLOAT(0.3)) + EVT_CALL(NpcJump0, NPC_Twink_01, 195, 200, 0, 20) + EVT_WAIT(10) + EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_CALL(SetNpcAnimation, NPC_PARTNER, PARTNER_ANIM_IDLE) + EVT_THREAD + EVT_CALL(SetNpcAnimation, NPC_Bowser_02, ANIM_WorldBowser_Idle) + EVT_CALL(InterpNpcYaw, NPC_Bowser_02, 90, 0) + EVT_WAIT(15) + EVT_CALL(InterpNpcYaw, NPC_Bowser_02, 270, 0) + EVT_WAIT(15) + EVT_CALL(InterpNpcYaw, NPC_Bowser_02, 90, 0) + EVT_WAIT(20) + EVT_CALL(SetNpcAnimation, NPC_Bowser_02, ANIM_WorldBowser_Walk) + EVT_CALL(GetNpcPos, NPC_Bowser_02, LVar0, LVar1, LVar2) + EVT_ADD(LVar0, 50) + EVT_CALL(NpcMoveTo, NPC_Bowser_02, LVar0, LVar2, 50) + EVT_CALL(SetNpcAnimation, NPC_Bowser_02, ANIM_WorldBowser_Idle) + EVT_END_THREAD + EVT_WAIT(15) + EVT_CALL(AdjustCam, CAM_DEFAULT, EVT_FLOAT(2.0), 0, 300, EVT_FLOAT(17.0), EVT_FLOAT(-13.0)) + EVT_PLAY_EFFECT(EFFECT_STARS_SHIMMER, 5, 100, 45, -66, 40, 50, 45, 80) + EVT_CALL(PlaySound, SOUND_2051) + EVT_WAIT(30) + EVT_SET(LVar0, NPC_Eldstar) + EVT_EXEC(N(AddStarSpiritHovering)) + EVT_SET(LVar0, NPC_Mamar) + EVT_EXEC(N(AddStarSpiritHovering)) + EVT_SET(LVar0, NPC_Skolar) + EVT_EXEC(N(AddStarSpiritHovering)) + EVT_SET(LVar0, NPC_Muskular) + EVT_EXEC(N(AddStarSpiritHovering)) + EVT_SET(LVar0, NPC_Misstar) + EVT_EXEC(N(AddStarSpiritHovering)) + EVT_SET(LVar0, NPC_Klevar) + EVT_EXEC(N(AddStarSpiritHovering)) + EVT_SET(LVar0, NPC_Kalmar) + EVT_EXEC(N(AddStarSpiritHovering)) + EVT_CALL(GetNpcPos, NPC_Eldstar, LVar0, LVar1, LVar2) + EVT_ADD(LVar1, 15) + EVT_CALL(PlaySoundAt, SOUND_B000001E, 0, LVar0, LVar1, LVar2) + EVT_PLAY_EFFECT(EFFECT_SPARKLES, 0, LVar0, LVar1, LVar2, 10) + EVT_SETF(LVar0, 0) + EVT_LOOP(20) + EVT_ADDF(LVar0, EVT_FLOAT(12.0)) + EVT_CALL(func_802CFD30, 8, 7, LVar0, 0, 0, 0) + EVT_WAIT(1) + EVT_END_LOOP + EVT_WAIT(10) + EVT_THREAD + EVT_WAIT(15) + EVT_CALL(InterpPlayerYaw, 270, 0) + EVT_WAIT(15) + EVT_CALL(InterpPlayerYaw, 90, 0) + EVT_WAIT(10) + EVT_CALL(SetPlayerAnimation, ANIM_Mario_1002A) + EVT_END_THREAD + EVT_CALL(SpeakToPlayer, NPC_Eldstar, ANIM_WorldEldstar_Wave, ANIM_WorldEldstar_Idle, 512, MSG_CH8_00A1) + EVT_WAIT(10) + EVT_CALL(PlaySoundAt, SOUND_64, 0, LVar0, LVar1, LVar2) + EVT_CALL(GetNpcPos, NPC_Mamar, LVar0, LVar1, LVar2) + EVT_ADD(LVar1, 15) + EVT_PLAY_EFFECT(EFFECT_SPARKLES, 0, LVar0, LVar1, LVar2, 10) + EVT_CALL(GetNpcPos, NPC_Skolar, LVar0, LVar1, LVar2) + EVT_ADD(LVar1, 15) + EVT_PLAY_EFFECT(EFFECT_SPARKLES, 0, LVar0, LVar1, LVar2, 10) + EVT_CALL(GetNpcPos, NPC_Muskular, LVar0, LVar1, LVar2) + EVT_ADD(LVar1, 15) + EVT_PLAY_EFFECT(EFFECT_SPARKLES, 0, LVar0, LVar1, LVar2, 10) + EVT_CALL(GetNpcPos, NPC_Misstar, LVar0, LVar1, LVar2) + EVT_ADD(LVar1, 15) + EVT_PLAY_EFFECT(EFFECT_SPARKLES, 0, LVar0, LVar1, LVar2, 10) + EVT_CALL(GetNpcPos, NPC_Klevar, LVar0, LVar1, LVar2) + EVT_ADD(LVar1, 15) + EVT_PLAY_EFFECT(EFFECT_SPARKLES, 0, LVar0, LVar1, LVar2, 10) + EVT_CALL(GetNpcPos, NPC_Kalmar, LVar0, LVar1, LVar2) + EVT_ADD(LVar1, 15) + EVT_PLAY_EFFECT(EFFECT_SPARKLES, 0, LVar0, LVar1, LVar2, 10) + EVT_SETF(LVar0, 0) + EVT_LOOP(20) + EVT_ADDF(LVar0, EVT_FLOAT(12.0)) + EVT_CALL(func_802CFD30, NPC_Mamar, FOLD_TYPE_7, LVar0, 0, 0, 0) + EVT_CALL(func_802CFD30, NPC_Skolar, FOLD_TYPE_7, LVar0, 0, 0, 0) + EVT_CALL(func_802CFD30, NPC_Muskular, FOLD_TYPE_7, LVar0, 0, 0, 0) + EVT_CALL(func_802CFD30, NPC_Misstar, FOLD_TYPE_7, LVar0, 0, 0, 0) + EVT_CALL(func_802CFD30, NPC_Klevar, FOLD_TYPE_7, LVar0, 0, 0, 0) + EVT_CALL(func_802CFD30, NPC_Kalmar, FOLD_TYPE_7, LVar0, 0, 0, 0) + EVT_WAIT(1) + EVT_END_LOOP + EVT_CALL(func_802CFD30, NPC_Eldstar, FOLD_TYPE_NONE, 0, 0, 0, 0) + EVT_CALL(func_802CFD30, NPC_Mamar, FOLD_TYPE_NONE, 0, 0, 0, 0) + EVT_CALL(func_802CFD30, NPC_Skolar, FOLD_TYPE_NONE, 0, 0, 0, 0) + EVT_CALL(func_802CFD30, NPC_Muskular, FOLD_TYPE_NONE, 0, 0, 0, 0) + EVT_CALL(func_802CFD30, NPC_Misstar, FOLD_TYPE_NONE, 0, 0, 0, 0) + EVT_CALL(func_802CFD30, NPC_Klevar, FOLD_TYPE_NONE, 0, 0, 0, 0) + EVT_CALL(func_802CFD30, NPC_Kalmar, FOLD_TYPE_NONE, 0, 0, 0, 0) + EVT_CALL(SetNpcJumpscale, NPC_Twink_01, EVT_FLOAT(0.0)) + EVT_CALL(NpcJump0, NPC_Twink_01, 140, 65, 30, 20) + EVT_CALL(GetNpcPos, NPC_Eldstar, LVar0, LVar1, LVar2) + EVT_ADD(LVar0, 15) + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_CALL(SetCamDistance, CAM_DEFAULT, 250) + EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(17.0), EVT_FLOAT(-8.5)) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(0.8)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_WAIT(10) + EVT_CALL(SpeakToPlayer, NPC_Twink_01, ANIM_Twink_Talk, ANIM_Twink_Idle, 0, MSG_CH8_00A2) + EVT_WAIT(10) + EVT_CALL(SpeakToPlayer, NPC_Eldstar, ANIM_WorldEldstar_Wave, ANIM_WorldEldstar_Idle, 512, MSG_CH8_00A3) + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_CALL(SetCamDistance, CAM_DEFAULT, 350) + EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(17.0), EVT_FLOAT(-10.0)) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(4.0)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_WAIT(10) + EVT_CALL(SpeakToPlayer, NPC_Eldstar, ANIM_WorldEldstar_Wave, ANIM_WorldEldstar_Idle, 512, MSG_CH8_00A4) + EVT_CALL(SetPlayerAnimation, ANIM_Mario_NodYes) + EVT_WAIT(15) + EVT_CALL(SetPlayerAnimation, ANIM_Mario_1002A) + EVT_WAIT(5) + EVT_THREAD + EVT_CALL(SetNpcFlagBits, NPC_Eldstar, NPC_FLAG_400000, FALSE) + EVT_CALL(SetNpcJumpscale, NPC_Eldstar, EVT_FLOAT(3.2)) + EVT_CALL(GetNpcPos, NPC_Eldstar, LVar6, LVar7, LVar8) + EVT_CALL(NpcJump0, NPC_Eldstar, LVar6, LVar7, LVar8, 5) + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_ADD(LVar1, 20) + EVT_CALL(PlaySoundAt, SOUND_B000001F, 0, LVar0, LVar1, LVar2) + EVT_PLAY_EFFECT(EFFECT_SPARKLES, 0, LVar0, LVar1, LVar2, 10) + EVT_END_THREAD + EVT_THREAD + EVT_WAIT(20) + EVT_CALL(SetNpcFlagBits, NPC_Mamar, NPC_FLAG_400000, FALSE) + EVT_CALL(SetNpcJumpscale, NPC_Mamar, EVT_FLOAT(3.2)) + EVT_CALL(GetNpcPos, NPC_Mamar, LVar6, LVar7, LVar8) + EVT_CALL(NpcJump0, NPC_Mamar, LVar6, LVar7, LVar8, 5) + EVT_END_THREAD + EVT_THREAD + EVT_WAIT(21) + EVT_CALL(SetNpcFlagBits, NPC_Skolar, NPC_FLAG_400000, FALSE) + EVT_CALL(SetNpcJumpscale, NPC_Skolar, EVT_FLOAT(3.2)) + EVT_CALL(GetNpcPos, NPC_Skolar, LVar6, LVar7, LVar8) + EVT_CALL(NpcJump0, NPC_Skolar, LVar6, LVar7, LVar8, 5) + EVT_END_THREAD + EVT_THREAD + EVT_WAIT(22) + EVT_CALL(SetNpcFlagBits, NPC_Muskular, NPC_FLAG_400000, FALSE) + EVT_CALL(SetNpcJumpscale, NPC_Muskular, EVT_FLOAT(3.2)) + EVT_CALL(GetNpcPos, NPC_Muskular, LVar6, LVar7, LVar8) + EVT_CALL(NpcJump0, NPC_Muskular, LVar6, LVar7, LVar8, 5) + EVT_END_THREAD + EVT_THREAD + EVT_WAIT(20) + EVT_CALL(SetNpcFlagBits, NPC_Misstar, NPC_FLAG_400000, FALSE) + EVT_CALL(SetNpcJumpscale, NPC_Misstar, EVT_FLOAT(3.2)) + EVT_CALL(GetNpcPos, NPC_Misstar, LVar6, LVar7, LVar8) + EVT_CALL(NpcJump0, NPC_Misstar, LVar6, LVar7, LVar8, 5) + EVT_END_THREAD + EVT_THREAD + EVT_WAIT(21) + EVT_CALL(SetNpcFlagBits, NPC_Klevar, NPC_FLAG_400000, FALSE) + EVT_CALL(SetNpcJumpscale, NPC_Klevar, EVT_FLOAT(3.2)) + EVT_CALL(GetNpcPos, NPC_Klevar, LVar6, LVar7, LVar8) + EVT_CALL(NpcJump0, NPC_Klevar, LVar6, LVar7, LVar8, 5) + EVT_END_THREAD + EVT_THREAD + EVT_WAIT(22) + EVT_CALL(SetNpcFlagBits, NPC_Kalmar, NPC_FLAG_400000, FALSE) + EVT_CALL(SetNpcJumpscale, NPC_Kalmar, EVT_FLOAT(3.2)) + EVT_CALL(GetNpcPos, NPC_Kalmar, LVar6, LVar7, LVar8) + EVT_CALL(NpcJump0, NPC_Kalmar, LVar6, LVar7, LVar8, 5) + EVT_END_THREAD + EVT_THREAD + EVT_WAIT(23) + EVT_CALL(SetNpcFlagBits, NPC_Twink_01, NPC_FLAG_400000, FALSE) + EVT_CALL(SetNpcJumpscale, NPC_Twink_01, EVT_FLOAT(3.2)) + EVT_CALL(GetNpcPos, NPC_Twink_01, LVar6, LVar7, LVar8) + EVT_CALL(NpcJump0, NPC_Twink_01, LVar6, LVar7, LVar8, 5) + EVT_END_THREAD + EVT_THREAD + EVT_PLAY_EFFECT(EFFECT_RADIAL_SHIMMER, 2, 100, 28, 10, EVT_FLOAT(2.8), 100) + EVT_CALL(PlaySound, SOUND_212D) + EVT_WAIT(115) + EVT_ADD(LVar1, 20) + EVT_CALL(PlaySoundAt, SOUND_188, 0, LVar0, LVar1, LVar2) + EVT_PLAY_EFFECT(EFFECT_ENERGY_ORB_WAVE, 4, LVar0, LVar1, LVar2, EVT_FLOAT(0.3), 30) + EVT_END_THREAD + EVT_WAIT(40) + EVT_CALL(PlaySoundAt, SOUND_B000001F, 0, 110, 20, 3) + EVT_PLAY_EFFECT(EFFECT_SPARKLES, 0, 110, 20, 3, 10) + EVT_WAIT(6) + EVT_CALL(PlaySoundAt, SOUND_B000001F, 0, 100, 20, 3) + EVT_PLAY_EFFECT(EFFECT_SPARKLES, 0, 100, 20, 3, 15) + EVT_WAIT(6) + EVT_CALL(PlaySoundAt, SOUND_B000001F, 0, 90, 20, 3) + EVT_PLAY_EFFECT(EFFECT_SPARKLES, 0, 90, 20, 3, 20) + EVT_WAIT(6) + EVT_CALL(PlaySoundAt, SOUND_B000001F, 0, 110, 20, 3) + EVT_PLAY_EFFECT(EFFECT_SPARKLES, 0, 110, 20, 3, 25) + EVT_WAIT(6) + EVT_CALL(SetPlayerAnimation, ANIM_Mario_GotItem) + EVT_LOOP(3) + EVT_CALL(PlaySoundAt, SOUND_B000001F, 0, 100, 20, 3) + EVT_PLAY_EFFECT(EFFECT_SPARKLES, 0, 100, 20, 3, 30) + EVT_WAIT(6) + EVT_CALL(PlaySoundAt, SOUND_B000001F, 0, 90, 20, 3) + EVT_PLAY_EFFECT(EFFECT_SPARKLES, 0, 90, 20, 3, 30) + EVT_WAIT(6) + EVT_CALL(PlaySoundAt, SOUND_B000001F, 0, 110, 20, 3) + EVT_PLAY_EFFECT(EFFECT_SPARKLES, 0, 110, 20, 3, 30) + EVT_WAIT(6) + EVT_END_LOOP + EVT_CALL(N(UpgradeStarBeam)) + EVT_WAIT(30) + EVT_CALL(ShowMessageAtScreenPos, MSG_Menus_0199, 160, 40) + EVT_WAIT(30) + EVT_CALL(SetPlayerAnimation, ANIM_Mario_BeforeJump) + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_ADD(LVar0, 45) + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_CALL(SetCamDistance, CAM_DEFAULT, 450) + EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(17.0), EVT_FLOAT(-10.0)) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(5.0)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_THREAD + EVT_CALL(SpeakToPlayer, NPC_Bowser_02, ANIM_WorldBowser_Talk, ANIM_WorldBowser_Idle, 0, MSG_CH8_00A5) + EVT_END_THREAD + EVT_WAIT(5) + EVT_CALL(InterpNpcYaw, NPC_Bowser_02, 270, 0) + EVT_WAIT(25) + EVT_CALL(FadeOutMusic, 0, 500) + EVT_WAIT(20) + EVT_THREAD + EVT_CALL(SetPlayerJumpscale, EVT_FLOAT(0.5)) + EVT_CALL(PlayerJump, 100, 0, 0, 20) + EVT_END_THREAD + EVT_THREAD + EVT_CALL(SetNpcJumpscale, NPC_PARTNER, EVT_FLOAT(0.5)) + EVT_CALL(GetNpcPos, NPC_PARTNER, LVar0, LVar1, LVar2) + EVT_CALL(NpcJump0, NPC_PARTNER, LVar0, LVar1, LVar2, 20) + EVT_END_THREAD + EVT_CALL(SetNpcVar, NPC_Bowser_02, 0, 1) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_kkj/kkj_25/kkj_25_8_bowser_defeated.c b/src/world/area_kkj/kkj_25/kkj_25_8_bowser_defeated.c new file mode 100644 index 0000000000..cdbde49a75 --- /dev/null +++ b/src/world/area_kkj/kkj_25/kkj_25_8_bowser_defeated.c @@ -0,0 +1,514 @@ +#include "kkj_25.h" +#include "effects.h" + +#include "sprite/npc/WorldGoombario.h" +#include "sprite/npc/WorldKooper.h" +#include "sprite/npc/WorldBombette.h" +#include "sprite/npc/WorldParakarry.h" +#include "sprite/npc/WorldWatt.h" +#include "sprite/npc/WorldSushie.h" +#include "sprite/npc/WorldLakilester.h" +#include "sprite/npc/WorldBow.h" + +#define NAME_SUFFIX _Unused2A +#include "world/common/npc/Bowser.inc.c" +#include "world/common/npc/Dummy.inc.c" +#include "world/common/enemy/Kammy_Flying.inc.c" +#include "world/common/enemy/ShyGuy_Stationary.inc.c" +#define NAME_SUFFIX _Unused2B +#include "world/common/npc/Dummy.inc.c" +#define NAME_SUFFIX _Unused2A +#include "world/common/npc/StarSpirit.inc.c" +#include "world/common/npc/StarRod.inc.c" +#define NAME_SUFFIX + +API_CALLABLE(N(FadeScreenToRedAndWhite)) { + enum FT_states { + TEMP_FADE_TO_RED = 0, + TEMP_FADE_TO_WHITE = 1, + TEMP_FADE_COMPLETE = 2, + }; + #define FT_state functionTemp[2] + #define FT_alpha functionTemp[1] + + if (isInitialCall) { + script->FT_alpha = 0; + script->FT_state = 0; + } + + switch (script->FT_state) { + case TEMP_FADE_TO_RED: + set_screen_overlay_color(0, 208, 0, 0); + set_screen_overlay_params_front(1, script->FT_alpha); + if (script->FT_alpha == 255) { + script->FT_alpha = 0; + script->FT_state = TEMP_FADE_TO_WHITE; + } else { + script->FT_alpha += 7; + if (script->FT_alpha > 255) { + script->FT_alpha = 255; + } + } + break; + case TEMP_FADE_TO_WHITE: + set_screen_overlay_color( + 0, + 208, + (script->FT_alpha * 208) / 255, + (script->FT_alpha * 208) / 255 + ); + set_screen_overlay_params_front(1, 255.0f); + if (script->FT_alpha == 255) { + script->FT_state = TEMP_FADE_COMPLETE; + } + script->FT_alpha += 14; + if (script->FT_alpha > 255) { + script->FT_alpha = 255; + } + } + + if (script->FT_state == TEMP_FADE_COMPLETE) { + return ApiStatus_DONE2; + } else { + return ApiStatus_BLOCK; + } + + #undef FT_state + #undef FT_alpha +} + +API_CALLABLE(N(FadeScreenFromWhite)) { + if (isInitialCall) { + script->functionTemp[1] = 255; + } + + set_screen_overlay_params_front(1, script->functionTemp[1]); + + if (script->functionTemp[1] == 0) { + return ApiStatus_DONE2; + } + + script->functionTemp[1] -= 16; + if (script->functionTemp[1] <= 0) { + script->functionTemp[1] = 0; + } + + return ApiStatus_BLOCK; +} + +API_CALLABLE(N(SpawnStarsOrbitingBowser)) { + EffectInstance* effect; + + fx_stars_orbiting(0, script->varTable[0], script->varTable[1], script->varTable[2], script->varTable[3], script->varTable[4], &effect); + script->varTablePtr[0] = effect; + + return ApiStatus_DONE2; +} + +API_CALLABLE(N(DismissStarsOrbitingBowser)) { + EffectInstance* effect = (EffectInstance*) script->varTablePtr[0]; + + effect->data.starsOrbiting->enabled = FALSE; + return ApiStatus_DONE2; +} + +s32 N(ArenaExplosions)[][6] = { + { 0, 0, 0, 30, EVT_FLOAT(3.0), EVT_FLOAT(1.0) }, + { 450, -50, 330, 40, EVT_FLOAT(4.0), EVT_FLOAT(2.0) }, + { 280, -100, 350, 50, EVT_FLOAT(5.0), EVT_FLOAT(2.0) }, + { 80, -200, -60, 30, EVT_FLOAT(3.0), EVT_FLOAT(1.0) }, + { 500, -200, 20, 30, EVT_FLOAT(3.0), EVT_FLOAT(1.0) }, + { 350, -120, 350, 50, EVT_FLOAT(5.0), EVT_FLOAT(2.0) }, +}; + +EvtScript N(EVS_ManageShaking) = { + EVT_LOOP(0) + EVT_IF_GT(MV_DestructState, DESTRUCT_STATE_NONE) + EVT_SET(MV_PrevDestructState, MV_DestructState) + EVT_END_IF + EVT_SWITCH(MV_DestructState) + EVT_CASE_EQ(DESTRUCT_STATE_NONE) + EVT_CASE_EQ(DESTRUCT_STATE_1) + EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 20, EVT_FLOAT(2.0)) + EVT_SET(MV_DestructState, DESTRUCT_STATE_TREMBLE) + EVT_CASE_EQ(DESTRUCT_STATE_2) + EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 50, EVT_FLOAT(2.0)) + EVT_SET(MV_DestructState, DESTRUCT_STATE_TREMBLE) + EVT_CASE_EQ(DESTRUCT_STATE_3) + EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 20, EVT_FLOAT(2.0)) + EVT_SET(MV_DestructState, DESTRUCT_STATE_TREMBLE) + EVT_CASE_EQ(DESTRUCT_STATE_4) + EVT_USE_BUF(EVT_PTR(N(ArenaExplosions))) + EVT_LOOP(1 + ARRAY_COUNT(N(ArenaExplosions))) //@bug extra iteration reads garbage + EVT_BUF_READ4(LVar0, LVar1, LVar2, LVar3) + EVT_FBUF_READ2(LVar4, LVar5) + EVT_CALL(PlaySoundAt, SOUND_B000001C, 0, LVar0, LVar1, LVar2) + EVT_PLAY_EFFECT(EFFECT_RING_BLAST, 0, LVar0, LVar1, LVar2, LVar4, LVar3) + EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 20, LVar5) + EVT_END_LOOP + EVT_SET(MV_DestructState, DESTRUCT_STATE_TREMBLE) + EVT_CASE_EQ(DESTRUCT_STATE_5) + EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 20, EVT_FLOAT(1.0)) + EVT_SET(MV_DestructState, DESTRUCT_STATE_TREMBLE) + EVT_CASE_EQ(DESTRUCT_STATE_6) + EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 20, EVT_FLOAT(1.0)) + EVT_SET(MV_DestructState, DESTRUCT_STATE_TREMBLE) + EVT_CASE_EQ(DESTRUCT_STATE_7) + EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 30, EVT_FLOAT(3.0)) + EVT_SET(MV_DestructState, DESTRUCT_STATE_TREMBLE) + EVT_CASE_EQ(DESTRUCT_STATE_10) + EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 100, EVT_FLOAT(2.0)) + EVT_CASE_EQ(DESTRUCT_STATE_TREMBLE) + EVT_THREAD + EVT_SET(LVar0, MV_PrevDestructState) + EVT_LOOP(0) + EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 30, EVT_FLOAT(0.7)) + EVT_WAIT(1) + // wait for the state to change + EVT_IF_NE(LVar0, MV_PrevDestructState) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_END_THREAD + EVT_SET(MV_DestructState, DESTRUCT_STATE_NONE) + EVT_END_SWITCH + EVT_WAIT(1) + EVT_END_LOOP + EVT_RETURN + EVT_END +}; + +// x, y, z, delay +s32 N(ChainExplosionLocations)[][4] = { + { 400, -10, 400, 20 }, + { 350, -50, 370, 25 }, + { 300, -30, 340, 25 }, + { 350, -40, 310, 20 }, + { 300, -80, 280, 20 }, + { 280, -60, 250, 20 }, + { 300, -50, 220, 20 }, + { 250, -100, 190, 20 }, + { 280, -70, 160, 20 }, + { 250, -50, 130, 20 }, + { 230, -100, 100, 20 }, +}; + +EvtScript N(EVS_BowserAndKammyBlownAway) = { + EVT_THREAD + EVT_CALL(SetNpcJumpscale, NPC_Bowser_03, EVT_FLOAT(0.1)) + EVT_CALL(NpcJump0, NPC_Bowser_03, 700, -50, 1000, 100) + EVT_END_THREAD + EVT_THREAD + EVT_CALL(MakeLerp, 0, -1800, 100, EASING_LINEAR) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_CALL(SetNpcRotation, NPC_Bowser_03, 0, 0, LVar0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_END_THREAD + EVT_THREAD + EVT_CALL(SetNpcJumpscale, NPC_Kammy_05, EVT_FLOAT(0.1)) + EVT_CALL(NpcJump0, NPC_Kammy_05, 600, -250, 1000, 100) + EVT_END_THREAD + EVT_THREAD + EVT_CALL(MakeLerp, 0, -2160, 100, EASING_LINEAR) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_CALL(SetNpcRotation, NPC_Kammy_05, 0, 0, LVar0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_END_THREAD + EVT_SET(MV_DestructState, DESTRUCT_STATE_10) + EVT_THREAD + EVT_CALL(MakeLerp, -150, -430, 100, EASING_LINEAR) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_SET(LVar2, LVar0) + EVT_ADD(LVar2, 150) + EVT_DIV(LVar2, 2) + EVT_CALL(TranslateGroup, MODEL_g2, LVar0, LVar2, 0) + EVT_CALL(TranslateGroup, MODEL_g31, LVar0, LVar2, 0) + EVT_CALL(TranslateGroup, MODEL_g7, LVar0, LVar2, 0) + EVT_CALL(TranslateGroup, MODEL_g54, LVar0, LVar2, 0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_END_THREAD + EVT_THREAD + EVT_USE_BUF(EVT_PTR(N(ChainExplosionLocations))) + EVT_LOOP(ARRAY_COUNT(N(ChainExplosionLocations))) + EVT_BUF_READ4(LVar0, LVar1, LVar2, LVar3) + EVT_CALL(PlaySoundAt, SOUND_B000001C, 0, LVar0, LVar1, LVar2) + EVT_PLAY_EFFECT(EFFECT_RING_BLAST, 0, LVar0, LVar1, LVar2, EVT_FLOAT(2.0), 30) + EVT_WAIT(LVar3) + EVT_END_LOOP + EVT_END_THREAD + EVT_WAIT(120) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Scene_BowserDefeated) = { + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(DisablePartnerAI, 0) + EVT_EXEC(N(EVS_ManageShaking)) + EVT_CALL(SetPlayerPos, 150, 0, 0) + EVT_CALL(InterpPlayerYaw, 90, 0) + EVT_CALL(PartnerIsFlying, LVar0) + EVT_IF_EQ(LVar0, FALSE) + EVT_CALL(SetNpcPos, NPC_PARTNER, 110, 10, 0) + EVT_ELSE + EVT_CALL(SetNpcPos, NPC_PARTNER, 110, 0, 0) + EVT_END_IF + EVT_CALL(SetNpcYaw, NPC_PARTNER, 90) + EVT_CALL(SetNpcAnimation, NPC_PARTNER, PARTNER_ANIM_IDLE) + EVT_CALL(GetNpcPos, NPC_Bowser_03, LVar0, LVar1, LVar2) + EVT_ADD(LVar0, -40) + EVT_ADD(LVar1, 60) + EVT_SET(LVar3, 20) + EVT_SET(LVar4, 3) + EVT_CALL(N(SpawnStarsOrbitingBowser)) + EVT_SET(MV_OrbitingEffectAIdx, LVar0) + EVT_CALL(SetCamType, CAM_DEFAULT, 0, FALSE) + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, 300, 0, 50) + EVT_CALL(SetPanTarget, CAM_DEFAULT, 300, 0, 50) + EVT_CALL(SetCamDistance, CAM_DEFAULT, 375) + EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(17.0), EVT_FLOAT(-9.0)) + EVT_CALL(SetCamPosA, CAM_DEFAULT, 0, 30) + EVT_CALL(SetCamPosB, CAM_DEFAULT, 0, 20) + 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(30) + EVT_THREAD + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(0.5)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_SET(LVar0, MV_OrbitingEffectAIdx) + EVT_CALL(N(DismissStarsOrbitingBowser)) + EVT_END_THREAD + EVT_CALL(FadeOutMusic, 0, 150) + EVT_CALL(ClearAmbientSounds, 150) + EVT_WAIT(10) + EVT_CALL(SetMusicTrack, 0, SONG_RECOVERED_STAR_ROD, 0, 8) + EVT_CALL(NpcJump0, NPC_StarRod, 230, 18, 0, 25) + EVT_CALL(NpcJump0, NPC_StarRod, 190, 18, 0, 20) + EVT_THREAD + EVT_WAIT(10) + EVT_CALL(SetPlayerAnimation, ANIM_Mario_6000C) + EVT_END_THREAD + EVT_CALL(NpcJump0, NPC_StarRod, 150, 60, 0, 15) + EVT_PLAY_EFFECT(EFFECT_RADIAL_SHIMMER, 14, 150, 60, 0, 1, 330) + EVT_WAIT(310) + EVT_CALL(ShowMessageAtScreenPos, MSG_CH8_00AA, 160, 40) + EVT_CALL(PlaySound, SOUND_22D) + EVT_CALL(RemoveNpc, NPC_StarRod) + EVT_CALL(SetPlayerAnimation, ANIM_Mario_ThumbsUp) + EVT_CALL(GetCurrentPartnerID, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_EQ(PARTNER_GOOMBARIO) + EVT_SET(LVar1, ANIM_WorldGoombario_Celebrate) + EVT_CASE_EQ(PARTNER_KOOPER) + EVT_SET(LVar1, ANIM_WorldKooper_Celebrate) + EVT_CASE_EQ(PARTNER_BOMBETTE) + EVT_SET(LVar1, ANIM_WorldBombette_Celebrate) + EVT_CASE_EQ(PARTNER_PARAKARRY) + EVT_SET(LVar1, ANIM_WorldParakarry_Celebrate) + EVT_CASE_EQ(PARTNER_BOW) + EVT_SET(LVar1, ANIM_WorldBow_CelebrateSlow) + EVT_CASE_EQ(PARTNER_WATT) + EVT_SET(LVar1, ANIM_WorldWatt_Celebrate) + EVT_CASE_EQ(PARTNER_SUSHIE) + EVT_SET(LVar1, ANIM_WorldSushie_Celebrate) + EVT_CASE_EQ(PARTNER_LAKILESTER) + EVT_SET(LVar1, ANIM_WorldLakilester_Celebrate) + EVT_END_SWITCH + EVT_CALL(SetNpcAnimation, NPC_PARTNER, LVar1) + EVT_SWITCH(LVar0) + EVT_CASE_OR_EQ(PARTNER_SUSHIE) + EVT_CASE_OR_EQ(PARTNER_BOW) + EVT_WAIT(30) + EVT_END_CASE_GROUP + EVT_CASE_DEFAULT + EVT_LOOP(3) + EVT_CALL(GetNpcPos, NPC_PARTNER, LVar1, LVar2, LVar3) + EVT_CALL(NpcJump0, NPC_PARTNER, LVar1, LVar2, LVar3, 10) + EVT_END_LOOP + EVT_END_SWITCH + EVT_CALL(SetNpcAnimation, NPC_PARTNER, PARTNER_ANIM_IDLE) + EVT_WAIT(20) + EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_WAIT(20) + EVT_CALL(SpeakToPlayer, NPC_Peach_02, ANIM_Peach_C0000, ANIM_Peach_A0001, 0, MSG_CH8_00AB) + EVT_THREAD + EVT_CALL(SetNpcAnimation, NPC_Peach_02, ANIM_Peach_A0002) + EVT_CALL(NpcMoveTo, NPC_Peach_02, 200, 0, 85) + EVT_CALL(SetNpcAnimation, NPC_Peach_02, ANIM_Peach_A0001) + EVT_END_THREAD + EVT_THREAD + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_ADD(LVar0, 25) + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_CALL(SetCamDistance, CAM_DEFAULT, 275) + EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(17.0), EVT_FLOAT(-9.5)) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(1.2)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_END_THREAD + EVT_CALL(NpcMoveTo, NPC_Twink_02, 230, 30, 85) + EVT_WAIT(10) + EVT_CALL(SpeakToPlayer, NPC_Peach_02, ANIM_Peach_C0000, ANIM_Peach_A0001, 0, MSG_CH8_00AC) + EVT_WAIT(20) + EVT_CALL(PlaySound, SOUND_8000006B) + EVT_SET(MV_DestructState, DESTRUCT_STATE_1) + EVT_CALL(PlaySoundAtPlayer, SOUND_262, 0) + EVT_CALL(ShowEmote, NPC_Bowser_01, EMOTE_EXCLAMATION, 0, 20, FALSE, 0, 0, 0, 0) + EVT_CALL(PlaySoundAtNpc, NPC_Peach_02, SOUND_262, 0) + EVT_CALL(ShowEmote, NPC_Peach_02, EMOTE_EXCLAMATION, 0, 20, TRUE, 0, 0, 0, 0) + EVT_WAIT(20) + EVT_CALL(InterpPlayerYaw, 270, 0) + EVT_CALL(InterpNpcYaw, NPC_Peach_02, 90, 0) + EVT_WAIT(15) + EVT_CALL(InterpPlayerYaw, 90, 0) + EVT_CALL(InterpNpcYaw, NPC_Peach_02, 270, 0) + EVT_WAIT(10) + EVT_CALL(GetNpcPos, NPC_Bowser_03, 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(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(3.0), EVT_FLOAT(-1.5)) + EVT_CALL(SetCamDistance, CAM_DEFAULT, 750) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_WAIT(40) + EVT_CALL(PlaySoundAt, SOUND_203C, 0, 220, -43, 350) + EVT_PLAY_EFFECT(EFFECT_RING_BLAST, 0, 220, -43, 350, EVT_FLOAT(8.0), 40) + EVT_SET(MV_DestructState, DESTRUCT_STATE_2) + EVT_WAIT(50) + EVT_SET(MV_ArenaState, ARENA_STATE_OVERLOADING) + EVT_CALL(GetNpcPos, NPC_Bowser_03, 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(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(17.0), EVT_FLOAT(-10.5)) + EVT_CALL(SetCamDistance, CAM_DEFAULT, 300) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_CALL(SetNpcAnimation, NPC_Peach_02, ANIM_Peach_C0006) + EVT_CALL(SetNpcAnimation, NPC_Twink_02, ANIM_Twink_Cringe) + EVT_CALL(SetNpcAnimation, NPC_Bowser_03, ANIM_WorldBowser_Shock) + EVT_CALL(SetNpcJumpscale, NPC_Bowser_03, EVT_FLOAT(1.0)) + EVT_CALL(NpcJump0, NPC_Bowser_03, 300, 0, 40, 20) + EVT_CALL(SetNpcAnimation, NPC_Bowser_03, ANIM_WorldBowser_Idle) + EVT_CALL(SetNpcRotation, NPC_Bowser_03, 0, 0, 0) + EVT_WAIT(10) + EVT_CALL(InterpNpcYaw, NPC_Bowser_03, 90, 0) + EVT_WAIT(10) + EVT_CALL(InterpNpcYaw, NPC_Bowser_03, 270, 0) + EVT_WAIT(10) + EVT_CALL(InterpNpcYaw, NPC_Bowser_03, 90, 0) + EVT_WAIT(20) + EVT_CALL(SpeakToPlayer, NPC_Bowser_03, ANIM_WorldBowser_Talk, ANIM_WorldBowser_Idle, 512, MSG_CH8_00AD) + EVT_CALL(PlaySoundAt, SOUND_203C, 0, 370, -10, 180) + EVT_PLAY_EFFECT(EFFECT_RING_BLAST, 0, 370, -10, 180, EVT_FLOAT(6.0), 40) + EVT_SET(MV_DestructState, DESTRUCT_STATE_3) + EVT_WAIT(20) + EVT_CALL(InterpNpcYaw, NPC_Peach_02, 90, 0) + EVT_CALL(InterpNpcYaw, NPC_Twink_02, 90, 0) + EVT_WAIT(30) + EVT_CALL(GetNpcPos, NPC_Bowser_03, 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(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(6.0), EVT_FLOAT(5.0)) + EVT_CALL(SetCamDistance, CAM_DEFAULT, 1100) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_THREAD + EVT_WAIT(10) + EVT_CALL(SetNpcAnimation, NPC_Bowser_03, ANIM_WorldBowser_Walk) + EVT_CALL(NpcMoveTo, NPC_Bowser_03, 450, 0, 140) + EVT_CALL(SetNpcAnimation, NPC_Bowser_03, ANIM_WorldBowser_Idle) + EVT_END_THREAD + EVT_SET(MV_DestructState, DESTRUCT_STATE_4) + EVT_WAIT(155) + EVT_CALL(GetNpcPos, NPC_Bowser_03, LVar0, LVar1, LVar2) + EVT_ADD(LVar0, 50) + 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(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(17.0), EVT_FLOAT(-10.5)) + EVT_CALL(SetCamDistance, CAM_DEFAULT, 350) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_CALL(SpeakToNpc, NPC_Bowser_03, ANIM_WorldBowser_Talk, ANIM_WorldBowser_Idle, 512, NPC_Kammy_05, MSG_CH8_00AE) + EVT_WAIT(5) + EVT_CALL(PlaySoundAt, SOUND_203C, 0, 350, 50, -100) + EVT_PLAY_EFFECT(EFFECT_RING_BLAST, 0, 350, 50, -100, EVT_FLOAT(4.0), 20) + EVT_SET(MV_DestructState, DESTRUCT_STATE_5) + EVT_WAIT(25) + EVT_CALL(SpeakToNpc, NPC_Kammy_05, ANIM_BattleKammy_Anim06, ANIM_BattleKammy_Anim04, 512, NPC_Bowser_03, MSG_CH8_00AF) + EVT_WAIT(10) + EVT_THREAD + EVT_CALL(SetNpcAnimation, NPC_Bowser_03, ANIM_WorldBowser_Shock) + EVT_WAIT(20) + EVT_CALL(SetNpcAnimation, NPC_Bowser_03, ANIM_WorldBowser_Idle) + EVT_END_THREAD + EVT_THREAD + EVT_CALL(PlaySoundAt, SOUND_203C, 0, 570, 0, 100) + EVT_PLAY_EFFECT(EFFECT_RING_BLAST, 0, 570, 0, 100, EVT_FLOAT(4.0), 20) + EVT_SET(MV_DestructState, DESTRUCT_STATE_6) + EVT_END_THREAD + EVT_WAIT(30) + EVT_CALL(SpeakToNpc, NPC_Bowser_03, ANIM_WorldBowser_Talk, ANIM_WorldBowser_Idle, 512, NPC_Kammy_05, MSG_CH8_00B0) + EVT_SET(MV_ArenaState, ARENA_STATE_BROKEN) + EVT_WAIT(20) + EVT_CALL(StopSound, SOUND_3BC) + EVT_CALL(PlaySoundAt, SOUND_230, 0, 500, 0, 100) + EVT_PLAY_EFFECT(EFFECT_RING_BLAST, 0, 500, 0, 100, EVT_FLOAT(8.0), 90) + EVT_SET(MV_DestructState, DESTRUCT_STATE_7) + EVT_CALL(SetNpcAnimation, NPC_Bowser_03, ANIM_WorldBowser_Shock) + EVT_CALL(ShowMessageAtScreenPos, MSG_CH8_00B1, 160, 40) + EVT_CALL(N(FadeScreenToRedAndWhite)) + EVT_CALL(TranslateGroup, MODEL_Root, -200, 0, 0) + EVT_CALL(UpdateColliderTransform, COLLIDER_o128) + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_ADD(LVar0, -200) + EVT_CALL(SetPlayerPos, LVar0, LVar1, LVar2) + EVT_CALL(GetNpcPos, NPC_Peach_02, LVar0, LVar1, LVar2) + EVT_ADD(LVar0, -200) + EVT_CALL(SetNpcPos, NPC_Peach_02, LVar0, LVar1, LVar2) + EVT_CALL(GetNpcPos, NPC_Twink_02, LVar0, LVar1, LVar2) + EVT_ADD(LVar0, -200) + EVT_CALL(SetNpcPos, NPC_Twink_02, LVar0, LVar1, LVar2) + EVT_SET(LVar0, 500) + EVT_SET(LVar1, 0) + EVT_SET(LVar2, 0) + 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(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(0.0), EVT_FLOAT(-7.0)) + EVT_CALL(SetCamDistance, CAM_DEFAULT, 1100) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_CALL(SetNpcAnimation, NPC_Bowser_03, ANIM_WorldBowser_Idle) + EVT_CALL(InterpNpcYaw, NPC_Kammy_05, 90, 0) + EVT_WAIT(5) + EVT_CALL(SetNpcRotationPivot, NPC_Bowser_03, 34) + EVT_CALL(SetNpcRotationPivot, NPC_Kammy_05, 12) + EVT_WAIT(10) + EVT_THREAD + EVT_CALL(N(FadeScreenFromWhite)) + EVT_END_THREAD + EVT_EXEC_WAIT(N(EVS_BowserAndKammyBlownAway)) + EVT_CALL(GotoMap, EVT_PTR("osr_03"), osr_03_ENTRY_5) + EVT_WAIT(100) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_kkj/kkj_25/kkj_25_9_entity.c b/src/world/area_kkj/kkj_25/kkj_25_9_entity.c new file mode 100644 index 0000000000..f73eec645f --- /dev/null +++ b/src/world/area_kkj/kkj_25/kkj_25_9_entity.c @@ -0,0 +1,13 @@ +#include "kkj_25.h" +#include "entity.h" + +EvtScript N(EVS_MakeEntities) = { + EVT_IF_EQ(GF_KKJ25_Defeated_Kammy, FALSE) + EVT_CALL(MakeEntity, EVT_PTR(Entity_GreenStompSwitch), 300, 0, 0, 0, MAKE_ENTITY_END) + EVT_SET(MV_SwitchEntityIdx, LVar0) + EVT_CALL(AssignSwitchFlag, EVT_INDEX_OF_AREA_FLAG(AF_KKJ_1A)) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_Scene_ActivateMachine)), TRIGGER_AREA_FLAG_SET, AF_KKJ_1A, 1, 0) + EVT_END_IF + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_kkj/kkj_26/B13120.c b/src/world/area_kkj/kkj_26/B13120.c deleted file mode 100644 index fcadb787c1..0000000000 --- a/src/world/area_kkj/kkj_26/B13120.c +++ /dev/null @@ -1,13 +0,0 @@ -#include "kkj_26.h" - -static char* N(exit_str_0) = "hos_00"; -static char* N(exit_str_1) = "kkj_14"; -static char* N(exit_str_2) = "kkj_14\0"; -static char* N(exit_str_3) = "kkj_26"; - -ApiStatus func_80240000_B13120(Evt* script, s32 isInitialCall) { - gGameStatusPtr->peachFlags &= ~PEACH_STATUS_FLAG_IS_PEACH; - gPlayerData.currentPartner = script->varTable[0]; - - return ApiStatus_DONE2; -} diff --git a/src/world/area_kkj/kkj_26/kkj_26.h b/src/world/area_kkj/kkj_26/kkj_26.h index 16bcb3b65a..c3fcad44b5 100644 --- a/src/world/area_kkj/kkj_26/kkj_26.h +++ b/src/world/area_kkj/kkj_26/kkj_26.h @@ -2,8 +2,19 @@ /// @brief Peach's Castle - Balcony (2F) #include "common.h" -#include "../kkj.h" #include "message_ids.h" #include "map.h" +#include "../kkj.h" +#include "mapfs/kkj_26_shape.h" +#include "mapfs/kkj_26_hit.h" + +#include "sprite/npc/Twink.h" + #define NAMESPACE kkj_26 + +extern EvtScript N(EVS_Main); +extern EvtScript N(EVS_GotoMap_hos_00_1); +extern EvtScript N(EVS_Scene_WhereIsMario); +extern EvtScript N(EVS_Scene_AfterAllSpiritsRescued); +extern EvtScript N(EVS_PlayDemoScene); diff --git a/src/world/area_kkj/kkj_26/kkj_26_0_header.c b/src/world/area_kkj/kkj_26/kkj_26_0_header.c new file mode 100644 index 0000000000..1a2756ead7 --- /dev/null +++ b/src/world/area_kkj/kkj_26/kkj_26_0_header.c @@ -0,0 +1,16 @@ +#include "kkj_26.h" + +EntryList N(Entrances) = { + [kkj_26_ENTRY_0] { 472.0, 30.0, -26.0, 90.0 }, + [kkj_26_ENTRY_1] { 540.0, 30.0, -20.0, 90.0 }, + [kkj_26_ENTRY_2] { 400.0, 30.0, -20.0, 90.0 }, + [kkj_26_ENTRY_3] { 483.0, 30.0, 8.0, 90.0 }, +}; + +MapSettings N(settings) = { + .main = &N(EVS_Main), + .entryList = &N(Entrances), + .entryCount = ENTRY_COUNT(N(Entrances)), + .background = &gBackgroundImage, + .tattle = { MSG_MapTattle_kkj_26 }, +}; diff --git a/src/world/area_kkj/kkj_26/kkj_26_1_main.c b/src/world/area_kkj/kkj_26/kkj_26_1_main.c new file mode 100644 index 0000000000..49443bf5ca --- /dev/null +++ b/src/world/area_kkj/kkj_26/kkj_26_1_main.c @@ -0,0 +1,73 @@ +#include "kkj_26.h" + +#include "../common/RestoreFromPeachState.inc.c" + +EvtScript N(EVS_GotoMap_hos_00_1) = { + EVT_SET(LVar0, GB_KKJ_LastPartner) + EVT_CALL(N(RestoreFromPeachState)) + EVT_CALL(PlaySound, SOUND_DC) + EVT_CALL(GotoMapSpecial, EVT_PTR("hos_00"), hos_00_ENTRY_1, TRANSITION_12) + EVT_WAIT(100) +}; + +EvtScript N(EVS_ExitDoors_kkj_14_1) = { + EVT_SET_GROUP(EVT_GROUP_1B) + EVT_CALL(DisablePlayerInput, TRUE) + EVT_SET(LVar0, kkj_26_ENTRY_0) + EVT_SET(LVar1, COLLIDER_ttw) + EVT_SET(LVar2, MODEL_o85) + EVT_SET(LVar3, MODEL_o83) + EVT_SET(LVar4, MODEL_o86) + EVT_SET(LVar5, MODEL_o84) + EVT_EXEC(ExitSplitDoubleDoor) + EVT_WAIT(17) + EVT_CALL(GotoMap, EVT_PTR("kkj_14"), kkj_14_ENTRY_1) + EVT_WAIT(100) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_BindExitTriggers) = { + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitDoors_kkj_14_1)), TRIGGER_WALL_PRESS_A, COLLIDER_ttw, 1, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_EnterMap) = { + EVT_CALL(GetEntryID, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_EQ(kkj_26_ENTRY_0) + EVT_SET(LVar2, MODEL_o85) + EVT_SET(LVar3, MODEL_o83) + EVT_SET(LVar4, MODEL_o86) + EVT_SET(LVar5, MODEL_o84) + EVT_EXEC_WAIT(EnterSplitDoubleDoor) + EVT_EXEC(N(EVS_BindExitTriggers)) + EVT_CASE_EQ(kkj_26_ENTRY_1) + EVT_EXEC(N(EVS_Scene_AfterAllSpiritsRescued)) + EVT_CASE_EQ(kkj_26_ENTRY_2) + EVT_EXEC(N(EVS_Scene_WhereIsMario)) + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Main) = { + EVT_SET(GB_WorldLocation, LOCATION_PEACHS_CASTLE) + EVT_CALL(SetSpriteShading, SHADING_KKJ_26) + EVT_SETUP_CAMERA_DEFAULT() + EVT_CALL(GetEntryID, LVar0) + EVT_IF_EQ(LVar0, kkj_26_ENTRY_1) + EVT_SET(GB_StoryProgress, STORY_CH7_BEGAN_PEACH_MISSION) + EVT_END_IF + EVT_CALL(UseDoorSounds, DOOR_SOUNDS_DOOR) + EVT_CALL(GetDemoState, LVar0) + EVT_IF_NE(LVar0, DEMO_STATE_NONE) + EVT_EXEC_WAIT(N(EVS_PlayDemoScene)) + EVT_RETURN + EVT_END_IF + EVT_EXEC(N(EVS_EnterMap)) + EVT_WAIT(1) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_kkj/kkj_26/kkj_26_2_scenes.c b/src/world/area_kkj/kkj_26/kkj_26_2_scenes.c new file mode 100644 index 0000000000..624c742714 --- /dev/null +++ b/src/world/area_kkj/kkj_26/kkj_26_2_scenes.c @@ -0,0 +1,77 @@ +#include "kkj_26.h" + +EvtScript N(EVS_Scene_WhereIsMario) = { + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(DisablePlayerPhysics, TRUE) + EVT_CALL(SetMusicTrack, 0, SONG_PRISONER_PEACH_THEME, 1, 8) + EVT_CALL(DisablePartnerAI, 0) + EVT_CALL(SetNpcPos, NPC_PARTNER, 0, -500, 0) + EVT_CALL(RotateModel, MODEL_o85, 80, 0, -1, 0) + EVT_CALL(RotateModel, MODEL_o83, 80, 0, 1, 0) + EVT_CALL(RotateModel, MODEL_o86, 80, 0, -1, 0) + EVT_CALL(RotateModel, MODEL_o84, 80, 0, 1, 0) + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, 550, 30, -20) + EVT_CALL(SetCamDistance, CAM_DEFAULT, EVT_FLOAT(200.0)) + EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(17.5), EVT_FLOAT(-10.0)) + EVT_CALL(SetCamPosB, CAM_DEFAULT, EVT_FLOAT(570.0), 0) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(90.0)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_WAIT(50) + EVT_CALL(func_802D1270, 550, -20, EVT_FLOAT(2.0)) + EVT_WAIT(30) + EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0000) + EVT_WAIT(10) + EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0026) + EVT_CALL(SpeakToPlayer, NPC_PLAYER, ANIM_Peach_C0001, ANIM_Peach_C0026, 5, MSG_Peach_0032) + EVT_CALL(FadeOutMusic, 0, 4000) + EVT_CALL(ResetCam, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_EXEC_WAIT(N(EVS_GotoMap_hos_00_1)) + EVT_CALL(EnablePartnerAI) + EVT_CALL(DisablePlayerPhysics, FALSE) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Scene_AfterAllSpiritsRescued) = { + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(DisablePartnerAI, 0) + EVT_CALL(SetMusicTrack, 0, SONG_PRISONER_PEACH_THEME, 1, 8) + EVT_CALL(InterpPlayerYaw, 90, 0) + EVT_CALL(SetNpcPos, NPC_PARTNER, 500, 50, 0) + EVT_CALL(SetNpcYaw, NPC_PARTNER, 90) + EVT_WAIT(30) + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, 500, 30, -20) + EVT_CALL(SetCamDistance, CAM_DEFAULT, EVT_FLOAT(300.0)) + EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(15.0), EVT_FLOAT(-7.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_CALL(SetPlayerAnimation, ANIM_Peach_C0000) + EVT_WAIT(10) + EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0026) + EVT_CALL(SpeakToPlayer, NPC_PLAYER, ANIM_Peach_C0001, ANIM_Peach_C0026, 5, MSG_Peach_015E) + EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0002) + EVT_WAIT(10) + EVT_CALL(SetPlayerAnimation, ANIM_Peach_A0001) + EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_Twink_Talk, ANIM_Twink_Idle, 5, MSG_Peach_015F) + EVT_CALL(PlayerFaceNpc, NPC_PARTNER, 5) + EVT_CALL(SpeakToPlayer, NPC_PLAYER, ANIM_Peach_D0004, ANIM_Peach_A0001, 5, MSG_Peach_0160) + EVT_WAIT(10) + EVT_CALL(EnablePartnerAI) + EVT_CALL(func_802D1270, 480, -20, EVT_FLOAT(2.0)) + EVT_CALL(SetPlayerAnimation, ANIM_Peach_C000B) + EVT_SET(LVar0, kkj_26_ENTRY_0) + EVT_SET(LVar1, COLLIDER_ttw) + EVT_SET(LVar2, MODEL_o85) + EVT_SET(LVar3, MODEL_o83) + EVT_SET(LVar4, MODEL_o86) + EVT_SET(LVar5, MODEL_o84) + EVT_EXEC(ExitSplitDoubleDoor) + EVT_WAIT(17) + EVT_CALL(GotoMap, EVT_PTR("kkj_14"), kkj_14_ENTRY_A) + EVT_WAIT(100) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_kkj/kkj_26/kkj_26_3_demo.c b/src/world/area_kkj/kkj_26/kkj_26_3_demo.c new file mode 100644 index 0000000000..5dd1210f88 --- /dev/null +++ b/src/world/area_kkj/kkj_26/kkj_26_3_demo.c @@ -0,0 +1,60 @@ +#include "kkj_26.h" + +EvtScript N(EVS_ProvideDemoInputs) = { + EVT_CALL(EnableStatusMenu, FALSE) + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, 550, 30, -20) + EVT_CALL(SetCamDistance, CAM_DEFAULT, EVT_FLOAT(200.0)) + EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(17.5), EVT_FLOAT(-10.0)) + EVT_CALL(SetCamPosB, CAM_DEFAULT, EVT_FLOAT(570.0), 0) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(90.0)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_WAIT(60) + EVT_CALL(DemoJoystickXY, 10, 0) + EVT_WAIT(40) + EVT_CALL(DemoJoystickXY, 0, 0) + EVT_WAIT(10) + EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0000) + EVT_WAIT(10) + EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0026) + EVT_WAIT(20) + EVT_CALL(ResetCam, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_IF_EQ(GF_DemoSceneDone, TRUE) + EVT_RETURN + EVT_END_IF + EVT_SET(GF_DemoSceneDone, TRUE) + EVT_CALL(GotoMapSpecial, EVT_PTR("kkj_26"), kkj_26_ENTRY_2, TRANSITION_7) + EVT_WAIT(110) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_MonitorDemoState) = { + EVT_WAIT(10) + EVT_LOOP(0) + EVT_CALL(GetDemoState, LVar0) + EVT_IF_EQ(LVar0, DEMO_STATE_CHANGE_MAP) + EVT_BREAK_LOOP + EVT_END_IF + EVT_WAIT(1) + EVT_END_LOOP + EVT_IF_EQ(GF_DemoSceneDone, TRUE) + EVT_RETURN + EVT_END_IF + EVT_SET(GF_DemoSceneDone, TRUE) + EVT_CALL(GotoMapSpecial, EVT_PTR("kkj_26"), kkj_26_ENTRY_2, TRANSITION_7) + EVT_WAIT(100) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_PlayDemoScene) = { + EVT_CALL(RotateModel, MODEL_o85, 80, 0, -1, 0) + EVT_CALL(RotateModel, MODEL_o83, 80, 0, 1, 0) + EVT_CALL(RotateModel, MODEL_o86, 80, 0, -1, 0) + EVT_CALL(RotateModel, MODEL_o84, 80, 0, 1, 0) + EVT_SET(GF_DemoSceneDone, FALSE) + EVT_EXEC(N(EVS_MonitorDemoState)) + EVT_EXEC(N(EVS_ProvideDemoInputs)) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_kkj/kkj_27/B13D70.c b/src/world/area_kkj/kkj_27/B13D70.c deleted file mode 100644 index 472e7bc3ec..0000000000 --- a/src/world/area_kkj/kkj_27/B13D70.c +++ /dev/null @@ -1,7 +0,0 @@ -#include "kkj_27.h" - -static char* N(exit_str_0) = "kkj_14"; -static char* N(exit_str_1) = "kkj_15"; - -#include "world/common/atomic/TexturePan.inc.c" - diff --git a/src/world/area_kkj/kkj_27/B14080.c b/src/world/area_kkj/kkj_27/B14080.c deleted file mode 100644 index 151de69523..0000000000 --- a/src/world/area_kkj/kkj_27/B14080.c +++ /dev/null @@ -1,32 +0,0 @@ -#include "kkj_27.h" - -extern s32 D_80240B00_B14870; - -ApiStatus func_80240310_B14080(Evt* script, s32 isInitialCall) { - f32 var = EVT_FIXED_TO_FLOAT(script->varTable[2]); - f32 angle; - f32 mag; - - mag = dist2D(-250.0f, 0.0f, script->varTable[9], script->varTable[10]); - angle = atan2(-250.0f, 0.0f, script->varTable[9], script->varTable[10]); - angle = clamp_angle(angle - var); - - gPlayerStatus.position.x = -250.0f + mag * sin_deg(angle); - gPlayerStatus.position.z = 0.0f - mag * cos_deg(angle); - - return ApiStatus_DONE2; -} - -ApiStatus func_8024041C_B1418C(Evt* script, s32 isInitialCall) { - Bytecode* args = script->ptrReadPos; - - D_80240B00_B14870 = evt_get_variable(script, *args++); - return ApiStatus_DONE2; -} - -void func_80240448_B141B8(void) { - if (D_80240B00_B14870 > 0) { - gDPSetCombineLERP(gMasterGfxPos++, TEXEL0, 0, SHADE, 0, 0, 0, 0, PRIMITIVE, TEXEL0, 0, SHADE, 0, 0, 0, 0, PRIMITIVE); - gDPSetPrimColor(gMasterGfxPos++, 0, 0, 0, 0, 0, D_80240B00_B14870); - } -} diff --git a/src/world/area_kkj/kkj_27/kkj_27.h b/src/world/area_kkj/kkj_27/kkj_27.h index 9ae59b1b56..a5a5e18636 100644 --- a/src/world/area_kkj/kkj_27/kkj_27.h +++ b/src/world/area_kkj/kkj_27/kkj_27.h @@ -2,8 +2,17 @@ /// @brief Peach's Castle - Secret Passage (2F) #include "common.h" -#include "../kkj.h" #include "message_ids.h" #include "map.h" +#include "../kkj.h" +#include "mapfs/kkj_27_shape.h" +#include "mapfs/kkj_27_hit.h" + +#include "sprite/npc/Twink.h" + #define NAMESPACE kkj_27 + +extern EvtScript N(EVS_Main); +extern EvtScript N(EVS_SetupMusic); +extern EvtScript N(EVS_SetupRotatingWall); diff --git a/src/world/area_kkj/kkj_27/kkj_27_0_header.c b/src/world/area_kkj/kkj_27/kkj_27_0_header.c new file mode 100644 index 0000000000..fde26c3296 --- /dev/null +++ b/src/world/area_kkj/kkj_27/kkj_27_0_header.c @@ -0,0 +1,12 @@ +#include "kkj_27.h" + +EntryList N(Entrances) = { + [kkj_27_ENTRY_0] { 425.0, 0.0, 40.0, 0.0 }, + [kkj_27_ENTRY_1] { -250.0, 10.0, 0.0, 0.0 }, +}; + +MapSettings N(settings) = { + .main = &N(EVS_Main), + .entryList = &N(Entrances), + .entryCount = ENTRY_COUNT(N(Entrances)), +}; diff --git a/src/world/area_kkj/kkj_27/kkj_27_1_music.c b/src/world/area_kkj/kkj_27/kkj_27_1_music.c new file mode 100644 index 0000000000..5b779c486b --- /dev/null +++ b/src/world/area_kkj/kkj_27/kkj_27_1_music.c @@ -0,0 +1,20 @@ +#include "kkj_27.h" + +EvtScript N(EVS_SetupMusic) = { + EVT_SWITCH(GB_StoryProgress) + EVT_CASE_OR_EQ(STORY_CH0_BEGAN_PEACH_MISSION) + EVT_CASE_OR_EQ(STORY_CH1_BEGAN_PEACH_MISSION) + EVT_CASE_OR_EQ(STORY_CH3_BEGAN_PEACH_MISSION) + EVT_CASE_OR_EQ(STORY_CH7_BEGAN_PEACH_MISSION) + EVT_CALL(SetMusicTrack, 0, SONG_PRISONER_PEACH_THEME, 0, 6) + EVT_END_CASE_GROUP + EVT_CASE_OR_EQ(STORY_CH2_BEGAN_PEACH_MISSION) + EVT_CASE_OR_EQ(STORY_CH4_BEGAN_PEACH_MISSION) + EVT_CASE_OR_EQ(STORY_CH5_BEGAN_PEACH_MISSION) + EVT_CASE_OR_EQ(STORY_CH6_BEGAN_PEACH_MISSION) + EVT_CALL(SetMusicTrack, 0, SONG_PEACH_MISSION, 0, 6) + EVT_END_CASE_GROUP + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_kkj/kkj_27/kkj_27_2_main.c b/src/world/area_kkj/kkj_27/kkj_27_2_main.c new file mode 100644 index 0000000000..c287c61fb9 --- /dev/null +++ b/src/world/area_kkj/kkj_27/kkj_27_2_main.c @@ -0,0 +1,73 @@ +#include "kkj_27.h" + +#include "world/common/atomic/TexturePan.inc.c" + +Gfx N(setup_gfx_candle_lights)[] = { + gsDPPipeSync(), + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), + gsDPSetCycleType(G_CYC_2CYCLE), + gsDPSetTexturePersp(G_TP_PERSP), + gsDPSetTextureDetail(G_TD_CLAMP), + gsDPSetTextureLOD(G_TL_TILE), + gsDPSetTextureLUT(G_TT_NONE), + gsDPSetTextureFilter(G_TF_BILERP), + gsDPSetTextureConvert(G_TC_FILT), + gsDPSetPrimColor(0, 0, 75, 31, 19, 255), + gsDPSetEnvColor(255, 118, 77, 0), + gsDPSetCombineLERP(TEXEL0, TEXEL1, TEXEL0, 1, 1, TEXEL0, TEXEL1, 1, 0, PRIMITIVE, COMBINED, ENVIRONMENT, COMBINED, TEXEL1, TEXEL1, TEXEL1), + gsDPSetRenderMode(G_RM_PASS, G_RM_ZB_CLD_SURF2), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_SHADE | G_CULL_BACK | G_SHADING_SMOOTH), + gsSPEndDisplayList(), +}; + +EvtScript N(EVS_ExitWalk_kkj_14_2) = EVT_EXIT_WALK(60, kkj_27_ENTRY_0, "kkj_14", kkj_14_ENTRY_2); + +EvtScript N(EVS_BindExitTriggers) = { + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_kkj_14_2)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilis, 1, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(D_80240778_B144E8) = { + EVT_CALL(GetEntryID, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_EQ(kkj_27_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_PEACHS_CASTLE) + EVT_CALL(SetSpriteShading, SHADING_KKJ_27) + EVT_SETUP_CAMERA_NO_LEAD() + EVT_EXEC(N(EVS_SetupRotatingWall)) + EVT_EXEC(N(EVS_SetupMusic)) + EVT_EXEC(N(D_80240778_B144E8)) + EVT_CALL(SetTexPanner, MODEL_o207, 0) + EVT_THREAD + TEX_PAN_PARAMS_ID(TEX_PANNER_0) + TEX_PAN_PARAMS_STEP( 0, 0, 40, 900) + 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_CALL(SetModelCustomGfx, MODEL_o207, CUSTOM_GFX_0, FOG_MODE_UNCHANGED) + EVT_CALL(SetCustomGfx, CUSTOM_GFX_0, EVT_PTR(N(setup_gfx_candle_lights)), NULL) + EVT_CALL(SetTexPanner, MODEL_o209, 0) + EVT_THREAD + TEX_PAN_PARAMS_ID(TEX_PANNER_0) + TEX_PAN_PARAMS_STEP( 0, 0, 40, 900) + 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_CALL(SetModelCustomGfx, MODEL_o209, CUSTOM_GFX_0, FOG_MODE_UNCHANGED) + EVT_CALL(SetCustomGfx, CUSTOM_GFX_0, EVT_PTR(N(setup_gfx_candle_lights)), NULL) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(3.0)) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_kkj/kkj_27/kkj_27_3_rotating_wall.c b/src/world/area_kkj/kkj_27/kkj_27_3_rotating_wall.c new file mode 100644 index 0000000000..153e9c37aa --- /dev/null +++ b/src/world/area_kkj/kkj_27/kkj_27_3_rotating_wall.c @@ -0,0 +1,141 @@ +#include "kkj_27.h" + +s32 N(SpillLightAmount) = 0; + +API_CALLABLE(N(UpdateRotatingPlayerPosition)) { + f32 var = EVT_FIXED_TO_FLOAT(script->varTable[2]); + f32 angle; + f32 mag; + + mag = dist2D(-250.0f, 0.0f, script->varTable[9], script->varTable[10]); + angle = atan2(-250.0f, 0.0f, script->varTable[9], script->varTable[10]); + angle = clamp_angle(angle - var); + gPlayerStatus.position.x = -250.0f + mag * sin_deg(angle); + gPlayerStatus.position.z = 0.0f - mag * cos_deg(angle); + + return ApiStatus_DONE2; +} + +API_CALLABLE(N(SetSpillLightAmount)) { + Bytecode* args = script->ptrReadPos; + + N(SpillLightAmount) = evt_get_variable(script, *args++); + return ApiStatus_DONE2; +} + +void N(setup_gfx_spill_light)(void) { + if (N(SpillLightAmount) > 0) { + gDPSetCombineLERP(gMasterGfxPos++, TEXEL0, 0, SHADE, 0, 0, 0, 0, PRIMITIVE, TEXEL0, 0, SHADE, 0, 0, 0, 0, PRIMITIVE); + gDPSetPrimColor(gMasterGfxPos++, 0, 0, 0, 0, 0, N(SpillLightAmount)); + } +} + +EvtScript N(EVS_Scene_RotatingWall) = { + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_g29, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_CLEAR_BITS, COLLIDER_o124, COLLIDER_FLAGS_UPPER_MASK) + EVT_THREAD + EVT_CALL(PlaySoundAt, SOUND_93, 0, -250, 5, 0) + EVT_CALL(GetPlayerPos, LVar9, LVar0, LVarA) + EVT_CALL(MakeLerp, 0, -450, 120, EASING_LINEAR) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_SETF(LVar2, LVar0) + EVT_DIVF(LVar2, 10) + EVT_CALL(RotateGroup, MODEL_g29, LVar2, 0, 1, 0) + EVT_CALL(N(UpdateRotatingPlayerPosition)) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_END_THREAD + EVT_THREAD + EVT_CALL(EnableModel, MODEL_o182, TRUE) + EVT_CALL(EnableModel, MODEL_o184, TRUE) + EVT_CALL(EnableModel, MODEL_o186, TRUE) + EVT_CALL(MakeLerp, 8, 255, 40, EASING_LINEAR) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_CALL(N(SetSpillLightAmount), LVar0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_END_THREAD + EVT_WAIT(80) + EVT_SET(GF_KKJ14_SkipSecretPassage, TRUE) + EVT_CALL(GotoMap, EVT_PTR("kkj_15"), kkj_15_ENTRY_1) + EVT_WAIT(100) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_UseRotatingWall) = { + EVT_SET_GROUP(EVT_GROUP_1B) + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(PlayerMoveTo, -205, -10, 15) + EVT_CALL(InterpPlayerYaw, 270, 5) + EVT_WAIT(10) + EVT_CALL(SetPlayerAnimation, ANIM_Peach_D0013) + EVT_WAIT(10) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o193, SOUND_FA, 0) + EVT_CALL(SetPlayerAnimation, ANIM_Peach_D0014) + EVT_WAIT(10) + EVT_CALL(SetPlayerAnimation, ANIM_Peach_D0015) + EVT_WAIT(10) + EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 10, EVT_FLOAT(1.0)) + EVT_EXEC_WAIT(N(EVS_Scene_RotatingWall)) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_UseRotatingWall_FirstTime) = { + EVT_SET_GROUP(EVT_GROUP_1B) + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(FacePlayerTowardPoint, -222, 0, 5) + EVT_WAIT(10) + EVT_CALL(SetPlayerAnimation, ANIM_Peach_D0013) + EVT_WAIT(10) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o193, SOUND_FA, 0) + EVT_CALL(SetPlayerAnimation, ANIM_Peach_D0014) + EVT_WAIT(10) + EVT_CALL(SetPlayerAnimation, ANIM_Peach_D0015) + EVT_WAIT(10) + EVT_THREAD + EVT_CALL(DisablePartnerAI, 0) + EVT_CALL(SetNpcAnimation, NPC_PARTNER, ANIM_Twink_Cringe) + EVT_CALL(GetNpcPos, NPC_PARTNER, LVar0, LVar1, LVar2) + EVT_CALL(NpcJump0, NPC_PARTNER, LVar0, LVar1, LVar2, 10) + EVT_CALL(EnablePartnerAI) + EVT_END_THREAD + EVT_THREAD + EVT_CALL(InterpPlayerYaw, 270, 0) + EVT_WAIT(10) + EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0011) + EVT_CALL(SpeakToPlayer, NPC_PLAYER, ANIM_Peach_C0005, ANIM_Peach_C0006, 5, MSG_Peach_0048) + EVT_END_THREAD + EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 5, EVT_FLOAT(1.0)) + EVT_EXEC_WAIT(N(EVS_Scene_RotatingWall)) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_SetupRotatingWall) = { + EVT_CALL(EnableModel, MODEL_o182, FALSE) + EVT_CALL(EnableModel, MODEL_o184, FALSE) + EVT_CALL(EnableModel, MODEL_o186, FALSE) + EVT_CALL(SetModelCustomGfx, MODEL_o182, CUSTOM_GFX_1, FOG_MODE_UNCHANGED) + EVT_CALL(SetModelCustomGfx, MODEL_o184, CUSTOM_GFX_1, FOG_MODE_UNCHANGED) + EVT_CALL(SetModelCustomGfx, MODEL_o186, CUSTOM_GFX_1, FOG_MODE_UNCHANGED) + EVT_CALL(SetCustomGfxBuilders, CUSTOM_GFX_1, EVT_PTR(N(setup_gfx_spill_light)), NULL) + EVT_IF_EQ(GB_StoryProgress, STORY_CH1_BEGAN_PEACH_MISSION) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_UseRotatingWall_FirstTime)), TRIGGER_WALL_PRESS_A, COLLIDER_o193, 1, 0) + EVT_ELSE + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_UseRotatingWall)), TRIGGER_WALL_PRESS_A, COLLIDER_o193, 1, 0) + EVT_END_IF + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_kkj/kkj_28/B14EA0.c b/src/world/area_kkj/kkj_28/B14EA0.c deleted file mode 100644 index 5b2644bc48..0000000000 --- a/src/world/area_kkj/kkj_28/B14EA0.c +++ /dev/null @@ -1,3 +0,0 @@ -#include "kkj_28.h" - -static char* N(exit_str_0) = "kkj_10"; diff --git a/src/world/area_kkj/kkj_28/kkj_28.h b/src/world/area_kkj/kkj_28/kkj_28.h index 0829e96763..58519c7e12 100644 --- a/src/world/area_kkj/kkj_28/kkj_28.h +++ b/src/world/area_kkj/kkj_28/kkj_28.h @@ -2,8 +2,13 @@ /// @brief Peach's Castle - Darkened Quiz-Off (1F) #include "common.h" -#include "../kkj.h" #include "message_ids.h" #include "map.h" +#include "../kkj.h" +#include "mapfs/kkj_28_shape.h" +#include "mapfs/kkj_28_hit.h" + #define NAMESPACE kkj_28 + +extern EvtScript N(EVS_Main); diff --git a/src/world/area_kkj/kkj_28/kkj_28_0_header.c b/src/world/area_kkj/kkj_28/kkj_28_0_header.c new file mode 100644 index 0000000000..fb9959282a --- /dev/null +++ b/src/world/area_kkj/kkj_28/kkj_28_0_header.c @@ -0,0 +1,11 @@ +#include "kkj_28.h" + +EntryList N(Entrances) = { + [kkj_28_ENTRY_0] { 325.0, 0.0, -30.0, 270.0 }, +}; + +MapSettings N(settings) = { + .main = &N(EVS_Main), + .entryList = &N(Entrances), + .entryCount = ENTRY_COUNT(N(Entrances)), +}; diff --git a/src/world/area_kkj/kkj_28/kkj_28_1_main.c b/src/world/area_kkj/kkj_28/kkj_28_1_main.c new file mode 100644 index 0000000000..55d3dbe721 --- /dev/null +++ b/src/world/area_kkj/kkj_28/kkj_28_1_main.c @@ -0,0 +1,36 @@ +#include "kkj_28.h" + +EvtScript N(EVS_ExitDoor_kkj_10_2) = { + EVT_SET_GROUP(EVT_GROUP_1B) + EVT_CALL(DisablePlayerInput, TRUE) + EVT_SET(LVar0, kkj_28_ENTRY_0) + EVT_SET(LVar1, COLLIDER_tte) + EVT_SET(LVar2, MODEL_o162) + EVT_SET(LVar3, DOOR_SWING_IN) + EVT_EXEC(ExitSingleDoor) + EVT_WAIT(17) + EVT_CALL(GotoMap, EVT_PTR("kkj_10"), kkj_10_ENTRY_2) + EVT_WAIT(100) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_EnterMap) = { + EVT_SET(LVar2, MODEL_o162) + EVT_SET(LVar3, DOOR_SWING_IN) + EVT_EXEC_WAIT(EnterSingleDoor) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Main) = { + EVT_SET(GB_WorldLocation, LOCATION_PEACHS_CASTLE) + EVT_CALL(SetSpriteShading, SHADING_NONE) + EVT_SETUP_CAMERA_DEFAULT() + EVT_CALL(EnableGroup, MODEL_g40, FALSE) + EVT_CALL(UseDoorSounds, DOOR_SOUNDS_BASIC) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitDoor_kkj_10_2)), TRIGGER_WALL_PRESS_A, COLLIDER_tte, 1, 0) + EVT_EXEC(N(EVS_EnterMap)) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_kkj/kkj_29/B150B0.c b/src/world/area_kkj/kkj_29/B150B0.c deleted file mode 100644 index b30f674d9c..0000000000 --- a/src/world/area_kkj/kkj_29/B150B0.c +++ /dev/null @@ -1,11 +0,0 @@ -#include "kkj_29.h" - -static char* N(exit_str_0) = "jan_22"; -static char* N(exit_str_1) = "kkj_10"; - -ApiStatus func_80240000_B150B0(Evt* script, s32 isInitialCall) { - gGameStatusPtr->peachFlags &= ~PEACH_STATUS_FLAG_IS_PEACH; - gPlayerData.currentPartner = script->varTable[0]; - - return ApiStatus_DONE2; -} diff --git a/src/world/area_kkj/kkj_29/B150E0.c b/src/world/area_kkj/kkj_29/B150E0.c deleted file mode 100644 index 9cd4ca508f..0000000000 --- a/src/world/area_kkj/kkj_29/B150E0.c +++ /dev/null @@ -1,15 +0,0 @@ -#include "kkj_29.h" - -ApiStatus func_80240030_B150E0(Evt* script, s32 isInitialCall) { - if (gGameStatusPtr->pressedButtons[0] & BUTTON_A) { - script->varTable[0] = 1; - return ApiStatus_DONE2; - } - - script->varTable[0]--; - if (script->varTable[0] == 0) { - return ApiStatus_DONE2; - } - - return ApiStatus_BLOCK; -} diff --git a/src/world/area_kkj/kkj_29/kkj_29.h b/src/world/area_kkj/kkj_29/kkj_29.h index 12e23574ee..69030d2ba3 100644 --- a/src/world/area_kkj/kkj_29/kkj_29.h +++ b/src/world/area_kkj/kkj_29/kkj_29.h @@ -2,8 +2,30 @@ /// @brief Peach's Castle - Quiz-Off Room (1F) #include "common.h" -#include "../kkj.h" #include "message_ids.h" #include "map.h" +#include "../kkj.h" +#include "mapfs/kkj_29_shape.h" +#include "mapfs/kkj_29_hit.h" + +#include "sprite/npc/WorldKoopatrol.h" +#include "sprite/npc/WorldBowser.h" +#include "sprite/npc/HammerBros.h" +#include "sprite/npc/Twink.h" + +enum { + NPC_Bowser = 0, + NPC_Koopatrol_01 = 1, + NPC_Koopatrol_02 = 2, + NPC_HammerBros = 3, +}; + #define NAMESPACE kkj_29 + +extern EvtScript N(EVS_Main); +extern EvtScript N(EVS_ManageStageEffects); +extern EvtScript N(EVS_ManageQuizGame); +extern EvtScript N(EVS_EndPeachChapter5); + +extern NpcGroupList N(DefaultNPCs); diff --git a/src/world/area_kkj/kkj_29/kkj_29_0_header.c b/src/world/area_kkj/kkj_29/kkj_29_0_header.c new file mode 100644 index 0000000000..2083a778b4 --- /dev/null +++ b/src/world/area_kkj/kkj_29/kkj_29_0_header.c @@ -0,0 +1,11 @@ +#include "kkj_29.h" + +EntryList N(Entrances) = { + [kkj_29_ENTRY_0] { 325.0, 0.0, -30.0, 270.0 }, +}; + +MapSettings N(settings) = { + .main = &N(EVS_Main), + .entryList = &N(Entrances), + .entryCount = ENTRY_COUNT(N(Entrances)), +}; diff --git a/src/world/area_kkj/kkj_29/kkj_29_1_main.c b/src/world/area_kkj/kkj_29/kkj_29_1_main.c new file mode 100644 index 0000000000..b65c858f36 --- /dev/null +++ b/src/world/area_kkj/kkj_29/kkj_29_1_main.c @@ -0,0 +1,57 @@ +#include "kkj_29.h" + +#include "../common/RestoreFromPeachState.inc.c" + +EvtScript N(EVS_EndPeachChapter5) = { + EVT_SET(LVar0, GB_KKJ_LastPartner) + EVT_CALL(N(RestoreFromPeachState)) + EVT_CALL(PlaySound, SOUND_DC) + EVT_CALL(GotoMapSpecial, EVT_PTR("jan_22"), jan_22_ENTRY_3, TRANSITION_12) + EVT_WAIT(100) +}; //@bug script not properly terminated + +EvtScript N(EVS_ExitDoor_kkj_10_2) = { + EVT_SET_GROUP(EVT_GROUP_1B) + EVT_CALL(DisablePlayerInput, TRUE) + EVT_SET(LVar0, kkj_29_ENTRY_0) + EVT_SET(LVar1, COLLIDER_tte) + EVT_SET(LVar2, MODEL_o57) + EVT_SET(LVar3, DOOR_SWING_IN) + EVT_EXEC(ExitSingleDoor) + EVT_WAIT(17) + EVT_CALL(GotoMap, EVT_PTR("kkj_10"), kkj_10_ENTRY_2) + EVT_WAIT(100) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_EnterMap) = { + EVT_IF_EQ(GB_StoryProgress, STORY_CH5_BEGAN_PEACH_MISSION) + EVT_EXEC(N(EVS_ManageQuizGame)) + EVT_ELSE + EVT_SET(LVar0, kkj_29_ENTRY_0) + EVT_SET(LVar2, MODEL_o57) + EVT_SET(LVar3, DOOR_SWING_IN) + EVT_EXEC_WAIT(EnterSingleDoor) + EVT_END_IF + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Main) = { + EVT_SET(GB_WorldLocation, LOCATION_PEACHS_CASTLE) + EVT_CALL(SetSpriteShading, SHADING_NONE) + EVT_SETUP_CAMERA_NO_LEAD() + EVT_IF_EQ(GB_StoryProgress, STORY_CH5_BEGAN_PEACH_MISSION) + EVT_CALL(MakeNpcs, FALSE, EVT_PTR(N(DefaultNPCs))) + EVT_END_IF + EVT_EXEC(N(EVS_ManageStageEffects)) + EVT_IF_LT(GB_StoryProgress, STORY_CH8_REACHED_PEACHS_CASTLE) + EVT_CALL(FadeOutMusic, 0, 500) + EVT_END_IF + EVT_CALL(UseDoorSounds, DOOR_SOUNDS_BASIC) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitDoor_kkj_10_2)), TRIGGER_WALL_PRESS_A, COLLIDER_tte, 1, 0) + EVT_EXEC(N(EVS_EnterMap)) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_kkj/kkj_29/kkj_29_2_npc.c b/src/world/area_kkj/kkj_29/kkj_29_2_npc.c new file mode 100644 index 0000000000..1ca133d111 --- /dev/null +++ b/src/world/area_kkj/kkj_29/kkj_29_2_npc.c @@ -0,0 +1,114 @@ +#include "kkj_29.h" + +#include "world/common/npc/Bowser.inc.c" +#include "world/common/enemy/Koopatrol_Stationary.inc.c" +#include "world/common/enemy/HammerBros.inc.c" + +EvtScript N(EVS_NpcInit_HammerBros) = { + EVT_CALL(SetNpcPos, NPC_SELF, 0, 0, -25) + EVT_CALL(SetNpcYaw, NPC_SELF, 90) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_Koopatrol_01) = { + EVT_CALL(SetNpcPos, NPC_SELF, 175, 0, -25) + EVT_CALL(SetNpcYaw, NPC_SELF, 270) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_Koopatrol_02) = { + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_WorldKoopatrol_Anim03) + EVT_CALL(SetNpcPos, NPC_SELF, -140, 30, -140) + EVT_RETURN + EVT_END +}; + +AnimID N(ExtraAnims_Bowser)[] = { + ANIM_WorldBowser_Still, + ANIM_WorldBowser_Idle, + ANIM_WorldBowser_Walk, + ANIM_WorldBowser_Talk, + ANIM_WorldBowser_TalkEyesClosed, + ANIM_WorldBowser_AngryTalk, + ANIM_WorldBowser_Shock, + ANIM_WorldBowser_RearUpMock, + ANIM_LIST_END +}; + +AnimID N(ExtraAnims_HammerBros)[] = { + ANIM_HammerBros_Anim01, + ANIM_HammerBros_Anim03, + ANIM_HammerBros_Anim06, + ANIM_HammerBros_Anim08, + ANIM_HammerBros_Anim09, + ANIM_HammerBros_Anim0B, + ANIM_HammerBros_Anim13, + ANIM_LIST_END +}; + +AnimID N(ExtraAnims_Koopatrol)[] = { + ANIM_WorldKoopatrol_Anim00, + ANIM_WorldKoopatrol_Anim01, + ANIM_WorldKoopatrol_Anim03, + ANIM_WorldKoopatrol_Anim04, + ANIM_WorldKoopatrol_Anim08, + ANIM_WorldKoopatrol_Anim17, + ANIM_WorldKoopatrol_Anim19, + ANIM_WorldKoopatrol_Anim1A, + ANIM_WorldKoopatrol_Anim12, + ANIM_WorldKoopatrol_Anim14, + ANIM_LIST_END +}; + +NpcData N(NpcData_Characters)[] = { + { + .id = NPC_Bowser, + .pos = { 0.0f, -500.0f, 0.0f }, + .yaw = 270, + .settings = &N(NpcSettings_Bowser), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = NO_DROPS, + .animations = BOWSER_ANIMS, + .extraAnimations = N(ExtraAnims_Bowser), + }, + { + .id = NPC_Koopatrol_01, + .pos = { 0.0f, -500.0f, 0.0f }, + .yaw = 0, + .init = &N(EVS_NpcInit_Koopatrol_01), + .settings = &N(NpcSettings_Koopatrol_Stationary), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400, + .drops = NO_DROPS, + .animations = KOOPATROL_ANIMS, + .extraAnimations = N(ExtraAnims_Koopatrol), + }, + { + .id = NPC_Koopatrol_02, + .pos = { 0.0f, -500.0f, 0.0f }, + .yaw = 0, + .init = &N(EVS_NpcInit_Koopatrol_02), + .settings = &N(NpcSettings_Koopatrol_Stationary), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400, + .drops = NO_DROPS, + .animations = KOOPATROL_ANIMS, + .extraAnimations = N(ExtraAnims_Koopatrol), + }, + { + .id = NPC_HammerBros, + .pos = { 0.0f, -500.0f, 0.0f }, + .yaw = 0, + .init = &N(EVS_NpcInit_HammerBros), + .settings = &N(NpcSettings_HammerBros), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400, + .drops = NO_DROPS, + .animations = HAMMER_BROS_ANIMS, + .extraAnimations = N(ExtraAnims_HammerBros), + }, +}; + +NpcGroupList N(DefaultNPCs) = { + NPC_GROUP(N(NpcData_Characters)), + {} +}; diff --git a/src/world/area_kkj/kkj_29/kkj_29_3_quiz.c b/src/world/area_kkj/kkj_29/kkj_29_3_quiz.c new file mode 100644 index 0000000000..998716882d --- /dev/null +++ b/src/world/area_kkj/kkj_29/kkj_29_3_quiz.c @@ -0,0 +1,1297 @@ +#include "kkj_29.h" + +enum { + CONTESTANT_LEFT = 0, + CONTESTANT_PEACH = 1, + CONTESTANT_RIGHT = 2, +}; + +enum { + ANSWER_NONE = 0, + ANSWER_PENDING = 1, + ANSWER_RIGHT = 2, + ANSWER_WRONG = 3, +}; + +API_CALLABLE(N(AwaitPlayerBuzzIn)) { + if (gGameStatusPtr->pressedButtons[0] & BUTTON_A) { + script->varTable[0] = 1; + return ApiStatus_DONE2; + } + + script->varTable[0]--; + if (script->varTable[0] == 0) { + return ApiStatus_DONE2; + } + + return ApiStatus_BLOCK; +} + +EvtScript N(EVS_GiveItemToKoopatrol) = { + EVT_CALL(SetNpcAnimation, LVar1, ANIM_WorldKoopatrol_Anim1B) + EVT_SET(LVarA, LVar0) + EVT_CALL(GetNpcPos, LVar1, LVar5, LVar6, LVar7) + EVT_ADD(LVar6, 40) + EVT_CALL(MakeItemEntity, LVarA, LVar5, LVar6, LVar7, ITEM_SPAWN_MODE_DECORATION, 0) + EVT_SET(LVarB, LVar0) + EVT_CALL(PlaySound, SOUND_D2) + EVT_CALL(ShowMessageAtScreenPos, LVar2, 160, 40) + EVT_CALL(RemoveItemEntity, LVarB) + EVT_CALL(SetNpcAnimation, LVar1, ANIM_WorldKoopatrol_Anim03) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_SetCam_Contestants) = { + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, -265, 0, -140) + EVT_CALL(SetPanTarget, CAM_DEFAULT, -265, 0, -140) + EVT_CALL(SetCamDistance, CAM_DEFAULT, EVT_FLOAT(400.0)) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(90.0)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_UpdateScores) = { + EVT_SWITCH(AB_KKJ29_AnsweringContestant) + EVT_CASE_EQ(CONTESTANT_LEFT) + EVT_IF_EQ(AB_KKJ29_AnswerScore, ANSWER_RIGHT) + EVT_ADD(AB_KKJ29_LeftKoopatrolScore, 1) + EVT_ELSE + EVT_IF_GT(AB_KKJ29_LeftKoopatrolScore, 0) + EVT_SUB(AB_KKJ29_LeftKoopatrolScore, 1) + EVT_END_IF + EVT_END_IF + EVT_CASE_EQ(CONTESTANT_PEACH) + EVT_IF_EQ(AB_KKJ29_AnswerScore, ANSWER_RIGHT) + EVT_ADD(AB_KKJ29_PeachScore, 1) + EVT_ELSE + EVT_IF_GT(AB_KKJ29_PeachScore, 0) + EVT_SUB(AB_KKJ29_PeachScore, 1) + EVT_END_IF + EVT_END_IF + EVT_CASE_EQ(CONTESTANT_RIGHT) + EVT_IF_EQ(AB_KKJ29_AnswerScore, ANSWER_RIGHT) + EVT_ADD(AB_KKJ29_RightKoopatrolScore, 1) + EVT_ELSE + EVT_IF_GT(AB_KKJ29_RightKoopatrolScore, 0) + EVT_SUB(AB_KKJ29_RightKoopatrolScore, 1) + EVT_END_IF + EVT_END_IF + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_WaitForBuzzIn) = { + EVT_CALL(PlaySound, SOUND_8E) + EVT_CALL(N(AwaitPlayerBuzzIn)) + EVT_IF_EQ(LVar0, 0) // time's up + // player took too long, decide who will answer based on score + EVT_IF_LE(AB_KKJ29_LeftKoopatrolScore, AB_KKJ29_PeachScore) + EVT_SET(AB_KKJ29_AnsweringContestant, CONTESTANT_LEFT) + EVT_ELSE + EVT_SET(LVar0, AB_KKJ29_LeftKoopatrolScore) + EVT_SUB(LVar0, 1) + EVT_IF_LT(AB_KKJ29_RightKoopatrolScore, LVar0) + EVT_SET(AB_KKJ29_AnsweringContestant, CONTESTANT_RIGHT) + EVT_ELSE + EVT_SET(AB_KKJ29_AnsweringContestant, CONTESTANT_LEFT) + EVT_END_IF + EVT_END_IF + EVT_ELSE + // player will answer + EVT_SET(AB_KKJ29_AnsweringContestant, CONTESTANT_PEACH) + EVT_END_IF + EVT_CALL(StopSound, SOUND_8E) + EVT_SET(AB_KKJ29_AnswerScore, ANSWER_PENDING) + EVT_SWITCH(AB_KKJ29_AnsweringContestant) + EVT_CASE_EQ(CONTESTANT_LEFT) + EVT_CALL(PlaySoundAtNpc, NPC_Koopatrol_01, SOUND_8D, 0) + EVT_CALL(EndSpeech, NPC_HammerBros, ANIM_HammerBros_Anim0B, ANIM_HammerBros_Anim03, 5) + EVT_CALL(SpeakToPlayer, NPC_HammerBros, ANIM_HammerBros_Anim0B, ANIM_HammerBros_Anim03, 5, MSG_Peach_00FA) + EVT_CALL(GetNpcPos, NPC_Koopatrol_01, LVar0, LVar1, LVar2) + EVT_CASE_EQ(CONTESTANT_PEACH) + EVT_CALL(PlaySoundAtPlayer, SOUND_8D, 0) + EVT_CALL(EndSpeech, NPC_HammerBros, ANIM_HammerBros_Anim0B, ANIM_HammerBros_Anim03, 5) + EVT_CALL(SpeakToPlayer, NPC_HammerBros, ANIM_HammerBros_Anim0B, ANIM_HammerBros_Anim03, 5, MSG_Peach_00F9) + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_CASE_EQ(CONTESTANT_RIGHT) + EVT_CALL(PlaySoundAtNpc, NPC_Koopatrol_02, SOUND_8D, 0) + EVT_CALL(EndSpeech, NPC_HammerBros, ANIM_HammerBros_Anim0B, ANIM_HammerBros_Anim03, 5) + EVT_CALL(SpeakToPlayer, NPC_HammerBros, ANIM_HammerBros_Anim0B, ANIM_HammerBros_Anim03, 5, MSG_Peach_00FB) + EVT_CALL(GetNpcPos, NPC_Koopatrol_02, LVar0, LVar1, LVar2) + EVT_END_SWITCH + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_CALL(SetCamDistance, CAM_DEFAULT, EVT_FLOAT(250.0)) + EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(17.0), EVT_FLOAT(-12.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_RETURN + EVT_END +}; + +// LVar1 question +// LVar2 time +// LVar3 rival giving answer +// LVar4 choice message +// LVar5 rival choice selection +// LVar6 host response to wrong answer +EvtScript N(Script_DoRound) = { + EVT_CALL(PlaySound, SOUND_8C) + EVT_CALL(SpeakToPlayer, NPC_HammerBros, ANIM_HammerBros_Anim0B, ANIM_HammerBros_Anim03, 5, LVar1) + EVT_SET(LVar0, LVar2) + // wait for input + EVT_EXEC_WAIT(N(EVS_WaitForBuzzIn)) + // get an answer + EVT_SWITCH(AB_KKJ29_AnsweringContestant) + EVT_CASE_EQ(CONTESTANT_LEFT) + EVT_CALL(SpeakToPlayer, NPC_Koopatrol_01, ANIM_WorldKoopatrol_Anim03, ANIM_WorldKoopatrol_Anim03, 5, LVar3) + EVT_SET(LVar0, LVar5) + EVT_CASE_EQ(CONTESTANT_PEACH) + EVT_CALL(ShowChoice, LVar4) + EVT_CASE_EQ(CONTESTANT_RIGHT) + EVT_CALL(SpeakToPlayer, NPC_Koopatrol_02, ANIM_WorldKoopatrol_Anim03, ANIM_WorldKoopatrol_Anim03, 5, LVar3) + EVT_SET(LVar0, LVar5) + EVT_END_SWITCH + // handle the choice + EVT_IF_EQ(LVar0, LVar5) + EVT_CALL(PlaySound, SOUND_21C) + EVT_CALL(PlaySound, SOUND_8A) + EVT_SET(AB_KKJ29_AnswerScore, ANSWER_RIGHT) + EVT_EXEC_WAIT(N(EVS_UpdateScores)) + EVT_CALL(SpeakToPlayer, NPC_HammerBros, ANIM_HammerBros_Anim0B, ANIM_HammerBros_Anim03, 5, MSG_Peach_0110) + EVT_ELSE + EVT_CALL(PlaySound, SOUND_MENU_ERROR) + EVT_CALL(PlaySound, SOUND_8B) + EVT_SET(AB_KKJ29_AnswerScore, ANSWER_WRONG) + EVT_EXEC_WAIT(N(EVS_UpdateScores)) + EVT_CALL(SpeakToPlayer, NPC_HammerBros, ANIM_HammerBros_Anim0B, ANIM_HammerBros_Anim03, 5, LVar6) + EVT_END_IF + EVT_WAIT(30) + EVT_SET(AB_KKJ29_AnswerScore, ANSWER_NONE) + EVT_WAIT(10) + EVT_EXEC_WAIT(N(EVS_SetCam_Contestants)) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_TexPan_Podiums) = { + EVT_CALL(SetTexPanner, MODEL_o19, TEX_PANNER_1) + EVT_CALL(SetTexPanner, MODEL_o62, TEX_PANNER_1) + EVT_CALL(SetTexPanner, MODEL_o88, TEX_PANNER_1) + EVT_SET(LVar0, 0) + EVT_LOOP(0) + EVT_ADD(LVar0, 0x8000) + EVT_CALL(SetTexPanOffset, TEX_PANNER_1, TEX_PANNER_MAIN, LVar0, 0) + EVT_WAIT(3) + EVT_END_LOOP + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_TexPan_VerticalStrips) = { + EVT_CALL(SetTexPanner, MODEL_o22, TEX_PANNER_2) + EVT_CALL(EnableTexPanning, MODEL_o22, FALSE) + EVT_CALL(SetTexPanner, MODEL_o63, TEX_PANNER_2) + EVT_CALL(EnableTexPanning, MODEL_o63, FALSE) + EVT_CALL(SetTexPanner, MODEL_o89, TEX_PANNER_2) + EVT_CALL(EnableTexPanning, MODEL_o89, FALSE) + EVT_SET(LVar0, 0) + EVT_LOOP(0) + EVT_ADD(LVar0, 0x8000) + EVT_CALL(SetTexPanOffset, TEX_PANNER_2, TEX_PANNER_MAIN, LVar0, 0) + EVT_WAIT(3) + EVT_END_LOOP + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_TexPan_Screens) = { + EVT_CALL(SetTexPanner, MODEL_o27, TEX_PANNER_3) + EVT_CALL(EnableTexPanning, MODEL_o27, FALSE) + EVT_CALL(SetTexPanner, MODEL_o64, TEX_PANNER_3) + EVT_CALL(EnableTexPanning, MODEL_o64, FALSE) + EVT_CALL(SetTexPanner, MODEL_o90, TEX_PANNER_3) + EVT_CALL(EnableTexPanning, MODEL_o90, FALSE) + EVT_SET(LVar0, 0) + EVT_LOOP(0) + EVT_ADD(LVar0, 0x4000) + EVT_CALL(SetTexPanOffset, TEX_PANNER_3, TEX_PANNER_MAIN, LVar0, 0) + EVT_WAIT(4) + EVT_END_LOOP + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_TexPan_Stars) = { + EVT_CALL(SetTexPanner, MODEL_o25, TEX_PANNER_4) + EVT_CALL(EnableTexPanning, MODEL_o25, FALSE) + EVT_CALL(SetTexPanner, MODEL_o65, TEX_PANNER_4) + EVT_CALL(EnableTexPanning, MODEL_o65, FALSE) + EVT_CALL(SetTexPanner, MODEL_o91, TEX_PANNER_4) + EVT_CALL(EnableTexPanning, MODEL_o91, FALSE) + EVT_SET(LVar0, 0) + EVT_LOOP(0) + EVT_ADD(LVar0, 0x4000) + EVT_CALL(SetTexPanOffset, TEX_PANNER_4, TEX_PANNER_MAIN, LVar0, 0) + EVT_WAIT(2) + EVT_END_LOOP + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_TexPan_FloorTrim) = { + EVT_CALL(SetTexPanner, MODEL_o32, TEX_PANNER_5) + EVT_CALL(EnableTexPanning, MODEL_o32, FALSE) + EVT_CALL(SetTexPanner, MODEL_o69, TEX_PANNER_5) + EVT_CALL(EnableTexPanning, MODEL_o69, FALSE) + EVT_CALL(SetTexPanner, MODEL_o95, TEX_PANNER_5) + EVT_CALL(EnableTexPanning, MODEL_o95, FALSE) + EVT_SET(LVar0, 0) + EVT_LOOP(0) + EVT_ADD(LVar0, 0x8000) + EVT_CALL(SetTexPanOffset, TEX_PANNER_5, TEX_PANNER_MAIN, LVar0, 0) + EVT_WAIT(4) + EVT_END_LOOP + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_TexPan_StarTrim) = { + EVT_CALL(SetTexPanner, MODEL_o31, TEX_PANNER_6) + EVT_CALL(EnableTexPanning, MODEL_o31, FALSE) + EVT_CALL(SetTexPanner, MODEL_o67, TEX_PANNER_6) + EVT_CALL(EnableTexPanning, MODEL_o67, FALSE) + EVT_CALL(SetTexPanner, MODEL_o93, TEX_PANNER_6) + EVT_CALL(EnableTexPanning, MODEL_o93, FALSE) + EVT_SET(LVar0, 0) + EVT_LOOP(0) + EVT_ADD(LVar0, -0x4800) + EVT_CALL(SetTexPanOffset, TEX_PANNER_6, TEX_PANNER_MAIN, LVar0, 0) + EVT_WAIT(3) + EVT_END_LOOP + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_SetNoAnswerEffects) = { + EVT_SWITCH(AB_KKJ29_AnsweringContestant) + EVT_CASE_EQ(CONTESTANT_LEFT) + EVT_CALL(SetNpcAnimation, NPC_Koopatrol_01, ANIM_WorldKoopatrol_Anim03) + EVT_CALL(EnableTexPanning, MODEL_o25, FALSE) + EVT_CALL(EnableTexPanning, MODEL_o32, FALSE) + EVT_CALL(EnableModel, MODEL_o32, FALSE) + EVT_CALL(EnableModel, MODEL_o28, TRUE) + EVT_CALL(EnableTexPanning, MODEL_o31, FALSE) + EVT_CALL(EnableModel, MODEL_o31, FALSE) + EVT_CALL(EnableModel, MODEL_o24, TRUE) + EVT_CALL(EnableTexPanning, MODEL_o22, FALSE) + EVT_CALL(EnableTexPanning, MODEL_o27, FALSE) + EVT_CALL(EnableModel, MODEL_o36, FALSE) + EVT_CALL(EnableModel, MODEL_o37, FALSE) + EVT_CALL(EnableModel, MODEL_o20, TRUE) + EVT_SET(LVar2, MODEL_g8) + EVT_CASE_EQ(CONTESTANT_PEACH) + EVT_CALL(SetNpcAnimation, NPC_PARTNER, ANIM_Twink_Idle) + EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0014) + EVT_CALL(EnableTexPanning, MODEL_o65, FALSE) + EVT_CALL(EnableTexPanning, MODEL_o69, FALSE) + EVT_CALL(EnableModel, MODEL_o69, FALSE) + EVT_CALL(EnableModel, MODEL_o68, TRUE) + EVT_CALL(EnableTexPanning, MODEL_o67, FALSE) + EVT_CALL(EnableModel, MODEL_o67, FALSE) + EVT_CALL(EnableModel, MODEL_o66, TRUE) + EVT_CALL(EnableTexPanning, MODEL_o63, FALSE) + EVT_CALL(EnableTexPanning, MODEL_o64, FALSE) + EVT_CALL(EnableModel, MODEL_o117, FALSE) + EVT_CALL(EnableModel, MODEL_o116, FALSE) + EVT_CALL(EnableModel, MODEL_o118, TRUE) + EVT_SET(LVar2, MODEL_g18) + EVT_CASE_EQ(CONTESTANT_RIGHT) + EVT_CALL(SetNpcAnimation, NPC_Koopatrol_02, ANIM_WorldKoopatrol_Anim03) + EVT_CALL(EnableTexPanning, MODEL_o91, FALSE) + EVT_CALL(EnableTexPanning, MODEL_o95, FALSE) + EVT_CALL(EnableModel, MODEL_o95, FALSE) + EVT_CALL(EnableModel, MODEL_o94, TRUE) + EVT_CALL(EnableTexPanning, MODEL_o93, FALSE) + EVT_CALL(EnableModel, MODEL_o93, FALSE) + EVT_CALL(EnableModel, MODEL_o92, TRUE) + EVT_CALL(EnableTexPanning, MODEL_o89, FALSE) + EVT_CALL(EnableTexPanning, MODEL_o90, FALSE) + EVT_CALL(EnableModel, MODEL_o120, FALSE) + EVT_CALL(EnableModel, MODEL_o121, FALSE) + EVT_CALL(EnableModel, MODEL_o119, TRUE) + EVT_SET(LVar2, MODEL_g25) + EVT_END_SWITCH + EVT_CALL(MakeLerp, 90, 0, 4, EASING_LINEAR) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_CALL(RotateGroup, LVar2, LVar0, 1, 0, 0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_SetPendingAnswerEffects) = { + EVT_SWITCH(AB_KKJ29_AnsweringContestant) + EVT_CASE_EQ(CONTESTANT_LEFT) + EVT_SET(LVar0, MODEL_o22) + EVT_SET(LVar1, MODEL_o27) + EVT_SET(LVar2, MODEL_g8) + EVT_CASE_EQ(CONTESTANT_PEACH) + EVT_SET(LVar0, MODEL_o63) + EVT_SET(LVar1, MODEL_o64) + EVT_SET(LVar2, MODEL_g18) + EVT_CASE_EQ(CONTESTANT_RIGHT) + EVT_SET(LVar0, MODEL_o89) + EVT_SET(LVar1, MODEL_o90) + EVT_SET(LVar2, MODEL_g25) + EVT_END_SWITCH + EVT_CALL(EnableTexPanning, LVar0, TRUE) + EVT_CALL(EnableTexPanning, LVar1, TRUE) + EVT_CALL(MakeLerp, 0, 90, 4, EASING_LINEAR) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_CALL(RotateGroup, LVar2, LVar0, 1, 0, 0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_SetRightAnswerEffects) = { + EVT_SWITCH(AB_KKJ29_AnsweringContestant) + EVT_CASE_EQ(CONTESTANT_LEFT) + EVT_CALL(EnableTexPanning, MODEL_o25, TRUE) + EVT_CALL(EnableModel, MODEL_o28, FALSE) + EVT_CALL(EnableModel, MODEL_o32, TRUE) + EVT_CALL(EnableTexPanning, MODEL_o32, TRUE) + EVT_CALL(EnableModel, MODEL_o24, FALSE) + EVT_CALL(EnableModel, MODEL_o31, TRUE) + EVT_CALL(EnableTexPanning, MODEL_o31, TRUE) + EVT_CALL(EnableModel, MODEL_o20, FALSE) + EVT_CALL(EnableModel, MODEL_o36, TRUE) + EVT_CALL(SetNpcAnimation, NPC_Koopatrol_01, ANIM_WorldKoopatrol_Anim19) + EVT_CASE_EQ(CONTESTANT_PEACH) + EVT_CALL(EnableTexPanning, MODEL_o65, TRUE) + EVT_CALL(EnableModel, MODEL_o68, FALSE) + EVT_CALL(EnableModel, MODEL_o69, TRUE) + EVT_CALL(EnableTexPanning, MODEL_o69, TRUE) + EVT_CALL(EnableModel, MODEL_o66, FALSE) + EVT_CALL(EnableModel, MODEL_o67, TRUE) + EVT_CALL(EnableTexPanning, MODEL_o67, TRUE) + EVT_CALL(EnableModel, MODEL_o118, FALSE) + EVT_CALL(EnableModel, MODEL_o117, TRUE) + EVT_THREAD + EVT_CALL(SetNpcAnimation, NPC_PARTNER, ANIM_Twink_ShoutJoy) + EVT_CALL(GetNpcPos, NPC_PARTNER, LVar0, LVar1, LVar2) + EVT_LOOP(3) + EVT_CALL(NpcJump0, NPC_PARTNER, LVar0, LVar1, LVar2, 10) + EVT_END_LOOP + EVT_END_THREAD + EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0016) + EVT_CASE_EQ(CONTESTANT_RIGHT) + EVT_CALL(EnableTexPanning, MODEL_o91, TRUE) + EVT_CALL(EnableModel, MODEL_o94, FALSE) + EVT_CALL(EnableModel, MODEL_o95, TRUE) + EVT_CALL(EnableTexPanning, MODEL_o95, TRUE) + EVT_CALL(EnableModel, MODEL_o92, FALSE) + EVT_CALL(EnableModel, MODEL_o93, TRUE) + EVT_CALL(EnableTexPanning, MODEL_o93, TRUE) + EVT_CALL(EnableModel, MODEL_o119, FALSE) + EVT_CALL(EnableModel, MODEL_o120, TRUE) + EVT_CALL(SetNpcAnimation, NPC_Koopatrol_02, ANIM_WorldKoopatrol_Anim19) + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_SetWrongAnswerEffects) = { + EVT_SWITCH(AB_KKJ29_AnsweringContestant) + EVT_CASE_EQ(CONTESTANT_LEFT) + EVT_CALL(EnableTexPanning, MODEL_o22, FALSE) + EVT_CALL(EnableTexPanning, MODEL_o27, FALSE) + EVT_CALL(EnableModel, MODEL_o20, FALSE) + EVT_CALL(EnableModel, MODEL_o37, TRUE) + EVT_CALL(SetNpcAnimation, NPC_Koopatrol_01, ANIM_WorldKoopatrol_Anim1A) + EVT_CASE_EQ(CONTESTANT_PEACH) + EVT_CALL(EnableTexPanning, MODEL_o63, FALSE) + EVT_CALL(EnableTexPanning, MODEL_o64, FALSE) + EVT_CALL(EnableModel, MODEL_o118, FALSE) + EVT_CALL(EnableModel, MODEL_o116, TRUE) + EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0017) + EVT_CALL(SetNpcAnimation, NPC_PARTNER, ANIM_Twink_TalkSad) + EVT_CASE_EQ(CONTESTANT_RIGHT) + EVT_CALL(EnableTexPanning, MODEL_o89, FALSE) + EVT_CALL(EnableTexPanning, MODEL_o90, FALSE) + EVT_CALL(EnableModel, MODEL_o119, FALSE) + EVT_CALL(EnableModel, MODEL_o121, TRUE) + EVT_CALL(SetNpcAnimation, NPC_Koopatrol_02, ANIM_WorldKoopatrol_Anim1A) + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_InitScoreBar) = { + EVT_SET(LVar0, MODEL_o38) + EVT_LOOP(10) + EVT_CALL(SetModelTexVariant, LVar0, 2) + EVT_ADD(LVar0, 1) + EVT_END_LOOP + EVT_SET(LVar0, MODEL_o76) + EVT_LOOP(10) + EVT_CALL(SetModelTexVariant, LVar0, 2) + EVT_ADD(LVar0, 1) + EVT_END_LOOP + EVT_SET(LVar0, MODEL_o102) + EVT_LOOP(10) + EVT_CALL(SetModelTexVariant, LVar0, 2) + EVT_ADD(LVar0, 1) + EVT_END_LOOP + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_UpdateScoreBar) = { + EVT_SWITCH(AB_KKJ29_AnsweringContestant) + EVT_CASE_EQ(CONTESTANT_LEFT) + EVT_SET(LVar0, MODEL_o38) + EVT_SET(LVar1, AB_KKJ29_LeftKoopatrolScore) + EVT_CASE_EQ(CONTESTANT_PEACH) + EVT_SET(LVar0, MODEL_o76) + EVT_SET(LVar1, AB_KKJ29_PeachScore) + EVT_CASE_EQ(CONTESTANT_RIGHT) + EVT_SET(LVar0, MODEL_o102) + EVT_SET(LVar1, AB_KKJ29_RightKoopatrolScore) + EVT_END_SWITCH + EVT_SET(LVar2, 10) + EVT_SUB(LVar2, LVar1) + EVT_IF_NE(LVar1, 0) + EVT_LOOP(LVar1) + EVT_CALL(SetModelTexVariant, LVar0, 0) + EVT_ADD(LVar0, 1) + EVT_END_LOOP + EVT_END_IF + EVT_IF_NE(LVar2, 0) + EVT_LOOP(LVar2) + EVT_CALL(SetModelTexVariant, LVar0, 2) + EVT_ADD(LVar0, 1) + EVT_END_LOOP + EVT_END_IF + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_DoScoreBarCycling) = { + EVT_SET(LVar0, 0) + EVT_SET(LVar1, 1) + EVT_SET(LVar2, 2) + EVT_SET(LVar3, 1) + EVT_SET(LVar4, 0) + EVT_LOOP(0) + EVT_SWITCH(AB_KKJ29_AnsweringContestant) + EVT_CASE_EQ(CONTESTANT_LEFT) + EVT_CALL(SetModelTexVariant, MODEL_o47, LVar4) + EVT_CALL(SetModelTexVariant, MODEL_o46, LVar3) + EVT_CALL(SetModelTexVariant, MODEL_o45, LVar2) + EVT_CALL(SetModelTexVariant, MODEL_o44, LVar1) + EVT_CALL(SetModelTexVariant, MODEL_o43, LVar0) + EVT_CALL(SetModelTexVariant, MODEL_o42, LVar4) + EVT_CALL(SetModelTexVariant, MODEL_o41, LVar3) + EVT_CALL(SetModelTexVariant, MODEL_o40, LVar2) + EVT_CALL(SetModelTexVariant, MODEL_o39, LVar1) + EVT_CALL(SetModelTexVariant, MODEL_o38, LVar0) + EVT_CASE_EQ(CONTESTANT_PEACH) + EVT_CALL(SetModelTexVariant, MODEL_o85, LVar4) + EVT_CALL(SetModelTexVariant, MODEL_o84, LVar3) + EVT_CALL(SetModelTexVariant, MODEL_o83, LVar2) + EVT_CALL(SetModelTexVariant, MODEL_o82, LVar1) + EVT_CALL(SetModelTexVariant, MODEL_o81, LVar0) + EVT_CALL(SetModelTexVariant, MODEL_o80, LVar4) + EVT_CALL(SetModelTexVariant, MODEL_o79, LVar3) + EVT_CALL(SetModelTexVariant, MODEL_o78, LVar2) + EVT_CALL(SetModelTexVariant, MODEL_o77, LVar1) + EVT_CALL(SetModelTexVariant, MODEL_o76, LVar0) + EVT_CASE_EQ(CONTESTANT_RIGHT) + EVT_CALL(SetModelTexVariant, MODEL_o111, LVar4) + EVT_CALL(SetModelTexVariant, MODEL_o110, LVar3) + EVT_CALL(SetModelTexVariant, MODEL_o109, LVar2) + EVT_CALL(SetModelTexVariant, MODEL_o108, LVar1) + EVT_CALL(SetModelTexVariant, MODEL_o107, LVar0) + EVT_CALL(SetModelTexVariant, MODEL_o106, LVar4) + EVT_CALL(SetModelTexVariant, MODEL_o105, LVar3) + EVT_CALL(SetModelTexVariant, MODEL_o104, LVar2) + EVT_CALL(SetModelTexVariant, MODEL_o103, LVar1) + EVT_CALL(SetModelTexVariant, MODEL_o102, LVar0) + EVT_END_SWITCH + EVT_WAIT(1) + EVT_IF_EQ(AB_KKJ29_AnswerScore, ANSWER_NONE) + EVT_BREAK_LOOP + EVT_END_IF + EVT_IF_EQ(AB_KKJ29_AnswerScore, ANSWER_WRONG) + EVT_BREAK_LOOP + EVT_END_IF + EVT_SET(LVar5, LVar4) + EVT_SET(LVar4, LVar3) + EVT_SET(LVar3, LVar2) + EVT_SET(LVar2, LVar1) + EVT_SET(LVar1, LVar0) + EVT_SET(LVar0, LVar5) + EVT_END_LOOP + EVT_EXEC(N(EVS_UpdateScoreBar)) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_ManageStageEffects) = { + EVT_EXEC(N(EVS_TexPan_Podiums)) + EVT_EXEC(N(EVS_TexPan_VerticalStrips)) + EVT_EXEC(N(EVS_TexPan_Screens)) + EVT_EXEC(N(EVS_TexPan_Stars)) + EVT_EXEC(N(EVS_TexPan_FloorTrim)) + EVT_EXEC(N(EVS_TexPan_StarTrim)) + EVT_CALL(EnableModel, MODEL_o31, FALSE) + EVT_CALL(EnableModel, MODEL_o32, FALSE) + EVT_CALL(EnableModel, MODEL_o36, FALSE) + EVT_CALL(EnableModel, MODEL_o37, FALSE) + EVT_CALL(EnableModel, MODEL_o67, FALSE) + EVT_CALL(EnableModel, MODEL_o69, FALSE) + EVT_CALL(EnableModel, MODEL_o116, FALSE) + EVT_CALL(EnableModel, MODEL_o117, FALSE) + EVT_CALL(EnableModel, MODEL_o93, FALSE) + EVT_CALL(EnableModel, MODEL_o95, FALSE) + EVT_CALL(EnableModel, MODEL_o120, FALSE) + EVT_CALL(EnableModel, MODEL_o121, FALSE) + EVT_EXEC(N(EVS_InitScoreBar)) + EVT_LABEL(0) + EVT_SET(LVar0, AB_KKJ29_AnswerScore) + EVT_LOOP(0) + EVT_WAIT(1) + EVT_IF_NE(LVar0, AB_KKJ29_AnswerScore) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_SWITCH(AB_KKJ29_AnswerScore) + EVT_CASE_EQ(ANSWER_NONE) + EVT_EXEC_WAIT(N(EVS_SetNoAnswerEffects)) + EVT_CASE_EQ(ANSWER_PENDING) + EVT_EXEC(N(EVS_DoScoreBarCycling)) + EVT_EXEC_WAIT(N(EVS_SetPendingAnswerEffects)) + EVT_CASE_EQ(ANSWER_RIGHT) + EVT_EXEC_WAIT(N(EVS_SetRightAnswerEffects)) + EVT_CASE_EQ(ANSWER_WRONG) + EVT_EXEC_WAIT(N(EVS_SetWrongAnswerEffects)) + EVT_END_SWITCH + EVT_GOTO(0) + EVT_RETURN + EVT_END +}; + +enum { + OUTCOME_PEACH_WON = -2, + OUTCOME_LEFT_WON = 1, + OUTCOME_RIGHT_WON = 2, + OUTCOME_TIE = 3, +}; + +EvtScript N(EVS_DeclareWinner) = { + EVT_SET(LVar0, OUTCOME_LEFT_WON) + EVT_SET(LVar1, AB_KKJ29_LeftKoopatrolScore) + EVT_SWITCH(AB_KKJ29_PeachScore) + EVT_CASE_GT(LVar1) + // peach beat left koopatrol + EVT_SET(LVar0, OUTCOME_PEACH_WON) + EVT_SET(LVar1, AB_KKJ29_PeachScore) + EVT_CASE_EQ(LVar1) + // peach tied + EVT_SET(LVar0, OUTCOME_TIE) + EVT_END_SWITCH + EVT_SWITCH(AB_KKJ29_RightKoopatrolScore) + EVT_CASE_GT(LVar1) + // peach lost to right koopatrol + EVT_SET(LVar0, OUTCOME_RIGHT_WON) + EVT_CASE_EQ(LVar1) + // all tied + EVT_SET(LVar0, OUTCOME_TIE) + EVT_END_SWITCH + EVT_SWITCH(LVar0) + EVT_CASE_EQ(OUTCOME_LEFT_WON) + EVT_SET(LVar1, -280) + EVT_SET(LVar2, -320) + EVT_CASE_EQ(OUTCOME_PEACH_WON) + EVT_SET(LVar1, -270) + EVT_SET(LVar2, -230) + EVT_CASE_EQ(OUTCOME_RIGHT_WON) + EVT_SET(LVar1, -180) + EVT_SET(LVar2, -140) + EVT_CASE_EQ(OUTCOME_TIE) + EVT_SET(LVar1, -270) + EVT_SET(LVar2, -230) + EVT_END_SWITCH + EVT_CALL(SetNpcAnimation, NPC_HammerBros, ANIM_HammerBros_Anim06) + EVT_CALL(SetNpcFlagBits, NPC_HammerBros, NPC_FLAG_GRAVITY, TRUE) + EVT_CALL(SetNpcSpeed, NPC_HammerBros, EVT_FLOAT(3.0)) + EVT_CALL(NpcMoveTo, NPC_HammerBros, -400, 0, 0) + EVT_CALL(NpcMoveTo, NPC_HammerBros, LVar1, 0, 0) + EVT_IF_EQ(LVar0, 1) + EVT_CALL(NpcFaceNpc, NPC_HammerBros, LVar0, 7) + EVT_END_IF + EVT_IF_NE(LVar0, 3) + EVT_CALL(NpcMoveTo, NPC_HammerBros, LVar1, -60, 0) + EVT_END_IF + EVT_CALL(SetNpcAnimation, NPC_HammerBros, ANIM_HammerBros_Anim03) + EVT_CALL(SetNpcFlagBits, NPC_HammerBros, NPC_FLAG_GRAVITY, FALSE) + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, LVar2, 30, -140) + EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar2, 30, -140) + EVT_CALL(SetCamDistance, CAM_DEFAULT, EVT_FLOAT(250.0)) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(5.0)) + EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_SWITCH(LVar0) + EVT_CASE_EQ(OUTCOME_LEFT_WON) + EVT_CALL(SpeakToNpc, NPC_HammerBros, ANIM_HammerBros_Anim0B, ANIM_HammerBros_Anim03, 0, NPC_Koopatrol_01, MSG_Peach_011B) + EVT_CALL(PlaySound, SOUND_8A) + EVT_CALL(SetNpcAnimation, NPC_Koopatrol_01, ANIM_WorldKoopatrol_Anim19) + EVT_CALL(ContinueSpeech, NPC_HammerBros, ANIM_HammerBros_Anim0B, ANIM_HammerBros_Anim03, 5, MSG_Peach_011C) + EVT_WAIT(10) + EVT_SET(LVar0, ITEM_JAMMIN_JELLY) + EVT_SET(LVar1, NPC_Koopatrol_01) + EVT_SET(LVar2, MSG_Peach_011D) + EVT_EXEC_WAIT(N(EVS_GiveItemToKoopatrol)) + EVT_WAIT(10) + EVT_CASE_EQ(OUTCOME_PEACH_WON) + EVT_CALL(SpeakToPlayer, NPC_HammerBros, ANIM_HammerBros_Anim0B, ANIM_HammerBros_Anim03, 0, MSG_Peach_0121) + EVT_CALL(PlaySound, SOUND_8A) + EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0009) + EVT_WAIT(1) + EVT_CALL(ContinueSpeech, NPC_HammerBros, ANIM_HammerBros_Anim0B, ANIM_HammerBros_Anim03, 0, MSG_Peach_0122) + EVT_WAIT(10) + EVT_CALL(ShowGotItem, ITEM_JAMMIN_JELLY, TRUE, 2) + EVT_SET(GF_KKJ29_PeachWonJamminJelly, TRUE) + EVT_WAIT(10) + EVT_CASE_EQ(OUTCOME_RIGHT_WON) + EVT_CALL(SpeakToNpc, NPC_HammerBros, ANIM_HammerBros_Anim0B, ANIM_HammerBros_Anim03, 0, NPC_Koopatrol_02, MSG_Peach_011E) + EVT_CALL(PlaySound, SOUND_8A) + EVT_CALL(SetNpcAnimation, NPC_Koopatrol_02, ANIM_WorldKoopatrol_Anim19) + EVT_CALL(ContinueSpeech, NPC_HammerBros, ANIM_HammerBros_Anim0B, ANIM_HammerBros_Anim03, 5, MSG_Peach_011F) + EVT_WAIT(10) + EVT_SET(LVar0, ITEM_JAMMIN_JELLY) + EVT_SET(LVar1, NPC_Koopatrol_02) + EVT_SET(LVar2, MSG_Peach_0120) + EVT_EXEC_WAIT(N(EVS_GiveItemToKoopatrol)) + EVT_WAIT(10) + EVT_CASE_EQ(OUTCOME_TIE) + EVT_IF_EQ(AB_KKJ29_PeachScore, 0) + EVT_CALL(SpeakToPlayer, NPC_HammerBros, ANIM_HammerBros_Anim0B, ANIM_HammerBros_Anim03, 5, MSG_Peach_0124) + EVT_ELSE + EVT_CALL(SpeakToPlayer, NPC_HammerBros, ANIM_HammerBros_Anim0B, ANIM_HammerBros_Anim03, 5, MSG_Peach_0123) + EVT_END_IF + EVT_CALL(PlaySound, SOUND_8B) + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +Vec3f N(TwinkHidePath)[] = { + { 290.0, 25.0, -30.0 }, + { 310.0, 70.0, -70.0 }, + { 300.0, 35.0, -110.0 }, + { 290.0, 33.0, -110.0 }, +}; + +Vec3f N(TwinkFollowPath1)[] = { + { 290.0, 33.0, -110.0 }, + { 300.0, 35.0, -110.0 }, + { 310.0, 10.0, -70.0 }, + { 240.0, 25.0, -30.0 }, +}; + +Vec3f N(TwinkFollowPath2)[] = { + { 240.0, 25.0, -30.0 }, + { 230.0, 20.0, -30.0 }, + { 40.0, 80.0, -60.0 }, + { -140.0, 150.0, -100.0 }, + { -180.0, 130.0, -100.0 }, + { -195.0, 80.0, -100.0 }, +}; + +Vec3f N(TwinkFlyAwayPath)[] = { + { -175.0, 60.0, -100.0 }, + { -160.0, 130.0, -100.0 }, + { -120.0, 150.0, -100.0 }, + { -70.0, 200.0, -100.0 }, +}; + +EvtScript N(EVS_TwinkFollowPath) = { + EVT_LOOP(0) + EVT_CALL(GetNextPathPos) + EVT_CALL(SetNpcPos, NPC_PARTNER, LVar1, LVar2, LVar3) + EVT_WAIT(1) + EVT_IF_EQ(LVar0, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_ApproachPeach) = { + EVT_CALL(SetNpcVar, NPC_HammerBros, 0, 1) + EVT_THREAD + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_SUB(LVar0, 26) + EVT_SUB(LVar2, 2) + EVT_CALL(SetNpcAnimation, NPC_HammerBros, ANIM_HammerBros_Anim09) + EVT_CALL(SetNpcSpeed, NPC_HammerBros, EVT_FLOAT(5.0)) + EVT_CALL(NpcMoveTo, NPC_HammerBros, LVar0, LVar2, 0) + EVT_CALL(SetNpcAnimation, NPC_HammerBros, ANIM_HammerBros_Anim03) + EVT_CALL(NpcFacePlayer, NPC_HammerBros, 5) + EVT_CALL(SetNpcVar, NPC_HammerBros, 0, 0) + EVT_END_THREAD + EVT_THREAD + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_ADD(LVar0, 26) + EVT_ADD(LVar2, 2) + EVT_CALL(SetNpcAnimation, NPC_Koopatrol_01, ANIM_WorldKoopatrol_Anim06) + EVT_CALL(SetNpcSpeed, NPC_Koopatrol_01, EVT_FLOAT(5.0)) + EVT_CALL(NpcMoveTo, NPC_Koopatrol_01, LVar0, LVar2, 0) + EVT_CALL(SetNpcAnimation, NPC_Koopatrol_01, ANIM_WorldKoopatrol_Anim01) + EVT_CALL(NpcFacePlayer, NPC_Koopatrol_01, 5) + EVT_END_THREAD + EVT_LOOP(0) + EVT_WAIT(1) + EVT_CALL(GetNpcVar, NPC_HammerBros, 0, LVar0) + EVT_IF_EQ(LVar0, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_WAIT(10) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_PickUpPeach) = { + EVT_THREAD + EVT_CALL(GetNpcPos, NPC_HammerBros, LVar0, LVar1, LVar2) + EVT_ADD(LVar0, 5) + EVT_CALL(NpcMoveTo, NPC_HammerBros, LVar0, LVar2, 5) + EVT_CALL(SetNpcAnimation, NPC_HammerBros, ANIM_HammerBros_Anim13) + EVT_ADD(LVar0, 5) + EVT_CALL(NpcMoveTo, NPC_HammerBros, LVar0, LVar2, 5) + EVT_END_THREAD + EVT_THREAD + EVT_CALL(GetNpcPos, NPC_Koopatrol_01, LVar0, LVar1, LVar2) + EVT_SUB(LVar0, 5) + EVT_CALL(NpcMoveTo, NPC_Koopatrol_01, LVar0, LVar2, 5) + EVT_CALL(SetNpcAnimation, NPC_Koopatrol_01, ANIM_WorldKoopatrol_Anim12) + EVT_SUB(LVar0, 5) + EVT_CALL(NpcMoveTo, NPC_Koopatrol_01, LVar0, LVar2, 5) + EVT_END_THREAD + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0005) + EVT_WAIT(1) + EVT_LOOP(4) + EVT_ADD(LVar1, 2) + EVT_CALL(SetPlayerPos, LVar0, LVar1, LVar2) + EVT_WAIT(1) + EVT_END_LOOP + EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0018) + EVT_ADD(LVar0, 10) + EVT_LOOP(5) + EVT_ADD(LVar1, 4) + EVT_CALL(SetPlayerPos, LVar0, LVar1, LVar2) + EVT_WAIT(1) + EVT_END_LOOP + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_CarryPeachAway) = { + EVT_CALL(InterpNpcYaw, NPC_Koopatrol_01, 90, 3) + EVT_WAIT(10) + EVT_THREAD + EVT_LOOP(0) + EVT_CALL(GetNpcPos, NPC_HammerBros, LVar0, LVar1, LVar2) + EVT_ADD(LVar0, 32) + EVT_ADD(LVar2, 2) + EVT_CALL(SetPlayerPos, LVar0, 30, LVar2) + EVT_WAIT(1) + EVT_END_LOOP + EVT_END_THREAD + EVT_CALL(SetNpcVar, NPC_HammerBros, 0, 1) + EVT_THREAD + EVT_CALL(SetNpcAnimation, NPC_HammerBros, ANIM_HammerBros_Anim08) + EVT_CALL(SetNpcSpeed, NPC_HammerBros, EVT_FLOAT(5.0)) + EVT_CALL(NpcMoveTo, NPC_HammerBros, 404, -26, 0) + EVT_CALL(SetNpcVar, NPC_HammerBros, 0, 0) + EVT_END_THREAD + EVT_THREAD + EVT_CALL(SetNpcAnimation, NPC_Koopatrol_01, ANIM_WorldKoopatrol_Anim14) + EVT_CALL(SetNpcSpeed, NPC_Koopatrol_01, EVT_FLOAT(5.0)) + EVT_CALL(NpcMoveTo, NPC_Koopatrol_01, 436, -22, 0) + EVT_END_THREAD + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_OpenDoor) = { + EVT_CALL(PlaySoundAtCollider, COLLIDER_tte, SOUND_BASIC_DOOR_OPEN, 0) + EVT_CALL(MakeLerp, 0, 120, 10, EASING_LINEAR) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_CALL(RotateModel, MODEL_o57, LVar0, 0, 1, 0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_CloseDoor) = { + EVT_CALL(MakeLerp, 120, 0, 10, EASING_LINEAR) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_CALL(RotateModel, MODEL_o57, LVar0, 0, 1, 0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_CALL(PlaySoundAtCollider, COLLIDER_tte, SOUND_BASIC_DOOR_CLOSE, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_TwinkHide) = { + EVT_CALL(SetNpcAnimation, NPC_PARTNER, ANIM_Twink_Cringe) + EVT_CALL(GetNpcPos, NPC_PARTNER, LVar0, LVar1, LVar2) + EVT_CALL(NpcJump0, NPC_PARTNER, LVar0, LVar1, LVar2, 10) + EVT_CALL(LoadPath, 20, EVT_PTR(N(TwinkHidePath)), ARRAY_COUNT(N(TwinkHidePath)), EASING_LINEAR) + EVT_EXEC_WAIT(N(EVS_TwinkFollowPath)) + EVT_CALL(SetNpcAnimation, NPC_PARTNER, ANIM_Twink_Sad) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_PeachSweat) = { + EVT_LOOP(0) + EVT_CALL(ShowSweat, 0, 1, -45, EMOTER_PLAYER, 0, 0, 0, 0, 20) + EVT_WAIT(20) + EVT_END_LOOP + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_TwinkSweat) = { + EVT_LOOP(0) + EVT_CALL(ShowSweat, NPC_PARTNER, 1, -45, EMOTER_NPC, 0, 0, 0, 0, 20) + EVT_WAIT(20) + EVT_END_LOOP + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_ManageQuizGame) = { + EVT_CALL(SetCamLeadPlayer, CAM_DEFAULT, FALSE) + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(DisablePlayerPhysics, TRUE) + EVT_CALL(RotateModel, MODEL_o57, 120, 0, 1, 0) + EVT_CALL(func_802D1270, 250, -30, EVT_FLOAT(2.0)) + EVT_EXEC_WAIT(N(EVS_CloseDoor)) + EVT_CALL(DisablePartnerAI, 0) + EVT_EXEC(N(EVS_TwinkHide)) + EVT_THREAD + EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0005) + EVT_WAIT(60) + EVT_CALL(SetPlayerAnimation, ANIM_Peach_A0001) + EVT_END_THREAD + EVT_WAIT(20) + EVT_CALL(PlaySoundAtNpc, NPC_Koopatrol_01, SOUND_263, 0) + EVT_CALL(ShowEmote, NPC_Koopatrol_01, EMOTE_QUESTION, -45, 15, EMOTER_NPC, 0, 0, 0, 0) + EVT_WAIT(20) + EVT_CALL(InterpNpcYaw, NPC_Koopatrol_01, 90, 5) + EVT_WAIT(10) + EVT_CALL(SetNpcAnimation, NPC_Koopatrol_01, ANIM_WorldKoopatrol_Anim17) + EVT_CALL(NpcJump0, NPC_Koopatrol_01, 175, 0, -25, 10) + EVT_CALL(SetNpcAnimation, NPC_Koopatrol_01, ANIM_WorldKoopatrol_Anim01) + EVT_CALL(SpeakToPlayer, NPC_Koopatrol_01, ANIM_WorldKoopatrol_Anim08, ANIM_WorldKoopatrol_Anim01, 0, MSG_Peach_00EF) + EVT_CALL(SetNpcAnimation, NPC_HammerBros, ANIM_HammerBros_Anim09) + EVT_CALL(SetNpcSpeed, NPC_HammerBros, EVT_FLOAT(5.0)) + EVT_CALL(NpcMoveTo, NPC_HammerBros, 130, -25, 0) + EVT_CALL(SetNpcAnimation, NPC_HammerBros, ANIM_HammerBros_Anim03) + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, 190, 0, -25) + EVT_CALL(SetPanTarget, CAM_DEFAULT, 190, 0, -25) + EVT_CALL(SetCamDistance, CAM_DEFAULT, EVT_FLOAT(275.0)) + EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(17.0), EVT_FLOAT(-11.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_CALL(SpeakToNpc, NPC_HammerBros, ANIM_HammerBros_Anim0B, ANIM_HammerBros_Anim03, 0, NPC_Koopatrol_01, MSG_Peach_00F0) + EVT_CALL(InterpNpcYaw, NPC_Koopatrol_01, 270, 0) + EVT_CALL(SpeakToNpc, NPC_Koopatrol_01, ANIM_WorldKoopatrol_Anim08, ANIM_WorldKoopatrol_Anim01, 0, NPC_HammerBros, MSG_Peach_00F1) + EVT_CALL(SetNpcAnimation, NPC_HammerBros, ANIM_HammerBros_Anim06) + EVT_CALL(SetNpcSpeed, NPC_HammerBros, EVT_FLOAT(2.0)) + EVT_CALL(NpcMoveTo, NPC_HammerBros, 130, 0, 0) + EVT_CALL(SetNpcAnimation, NPC_HammerBros, ANIM_HammerBros_Anim03) + EVT_CALL(SpeakToPlayer, NPC_HammerBros, ANIM_HammerBros_Anim0B, ANIM_HammerBros_Anim03, 0, MSG_Peach_00F2) + EVT_CALL(InterpNpcYaw, NPC_Koopatrol_01, 90, 5) + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_SUB(LVar0, 40) + EVT_CALL(SetNpcAnimation, NPC_Koopatrol_01, ANIM_WorldKoopatrol_Anim04) + EVT_CALL(SetNpcSpeed, NPC_Koopatrol_01, EVT_FLOAT(2.0)) + EVT_CALL(NpcMoveTo, NPC_Koopatrol_01, LVar0, LVar2, 0) + EVT_CALL(SpeakToPlayer, NPC_Koopatrol_01, ANIM_WorldKoopatrol_Anim08, ANIM_WorldKoopatrol_Anim01, 0, MSG_Peach_00F3) + EVT_THREAD + EVT_CALL(func_802D1270, 0, -25, EVT_FLOAT(2.0)) + EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0014) + EVT_CALL(SetPlayerPos, -230, 23, -140) + EVT_END_THREAD + EVT_THREAD + EVT_CALL(NpcMoveTo, NPC_Koopatrol_01, 0, -25, 0) + EVT_CALL(SetNpcAnimation, NPC_Koopatrol_01, ANIM_WorldKoopatrol_Anim03) + EVT_CALL(SetNpcPos, NPC_Koopatrol_01, -320, 30, -140) + EVT_CALL(SetNpcYaw, NPC_Koopatrol_01, 90) + EVT_END_THREAD + EVT_THREAD + EVT_CALL(SetNpcAnimation, NPC_HammerBros, ANIM_HammerBros_Anim06) + EVT_CALL(NpcMoveTo, NPC_HammerBros, 0, -25, 0) + EVT_CALL(SetNpcAnimation, NPC_HammerBros, ANIM_HammerBros_Anim03) + EVT_CALL(SetNpcPos, NPC_HammerBros, -230, 0, 0) + EVT_CALL(SetNpcYaw, NPC_HammerBros, 90) + EVT_END_THREAD + EVT_WAIT(60) + EVT_CALL(LoadPath, 50, EVT_PTR(N(TwinkFollowPath1)), ARRAY_COUNT(N(TwinkFollowPath1)), EASING_LINEAR) + EVT_EXEC_WAIT(N(EVS_TwinkFollowPath)) + EVT_EXEC_GET_TID(N(EVS_TwinkSweat), LVarA) + EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_Twink_Shout, ANIM_Twink_Shout, 5, MSG_Peach_00F4) + EVT_KILL_THREAD(LVarA) + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, -230, 0, -140) + EVT_CALL(SetPanTarget, CAM_DEFAULT, -230, 0, -140) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(0.8)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_CALL(SetNpcAnimation, NPC_PARTNER, ANIM_Twink_Angry) + EVT_CALL(LoadPath, 100, EVT_PTR(N(TwinkFollowPath2)), ARRAY_COUNT(N(TwinkFollowPath2)), EASING_LINEAR) + EVT_EXEC_WAIT(N(EVS_TwinkFollowPath)) + EVT_CALL(SetNpcAnimation, NPC_PARTNER, ANIM_Twink_Idle) + EVT_WAIT(30) + EVT_CALL(SetMusicTrack, 0, SONG_PEACH_QUIZ_INTRO, 0, 8) + EVT_CALL(SpeakToPlayer, NPC_HammerBros, ANIM_HammerBros_Anim0B, ANIM_HammerBros_Anim03, 5, MSG_Peach_00F5) + EVT_CALL(PlaySound, SOUND_8A) + EVT_WAIT(10) + EVT_CALL(SpeakToPlayer, NPC_HammerBros, ANIM_HammerBros_Anim0B, ANIM_HammerBros_Anim03, 5, MSG_Peach_00F6) + EVT_CALL(PlaySound, SOUND_8A) + EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0011) + EVT_CALL(PlaySoundAtPlayer, SOUND_263, 0) + EVT_CALL(ShowEmote, 0, EMOTE_QUESTION, 45, 13, EMOTER_PLAYER, 0, 0, 0, 0) + EVT_WAIT(13) + EVT_CALL(PlaySoundAtPlayer, SOUND_263, 0) + EVT_CALL(ShowEmote, 0, EMOTE_QUESTION, -45, 13, EMOTER_PLAYER, 0, 0, 0, 0) + EVT_WAIT(13) + EVT_CALL(PlaySoundAtPlayer, SOUND_263, 0) + EVT_CALL(ShowEmote, 0, EMOTE_QUESTION, 45, 13, EMOTER_PLAYER, 0, 0, 0, 0) + EVT_WAIT(10) + EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0014) + EVT_CALL(SetNpcAnimation, NPC_HammerBros, ANIM_HammerBros_Anim06) + EVT_CALL(SetNpcFlagBits, NPC_HammerBros, NPC_FLAG_GRAVITY, TRUE) + EVT_CALL(NpcMoveTo, NPC_HammerBros, -395, 0, 0) + EVT_CALL(InterpNpcYaw, NPC_HammerBros, 90, 7) + EVT_CALL(NpcMoveTo, NPC_HammerBros, -395, -30, 0) + EVT_CALL(SetNpcFlagBits, NPC_HammerBros, NPC_FLAG_GRAVITY, FALSE) + EVT_CALL(SetNpcAnimation, NPC_HammerBros, ANIM_HammerBros_Anim03) + EVT_WAIT(10) + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, -395, 10, -40) + EVT_CALL(SetPanTarget, CAM_DEFAULT, -395, 10, -40) + EVT_CALL(SetCamDistance, CAM_DEFAULT, EVT_FLOAT(275.0)) + EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(17.0), EVT_FLOAT(-11.0)) + EVT_CALL(SetCamPosA, CAM_DEFAULT, EVT_FLOAT(-370.0), EVT_FLOAT(40.0)) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(4.0)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_CALL(SetMusicTrack, 0, SONG_PEACH_QUIZ_INTRO, 1, 8) + EVT_CALL(SpeakToPlayer, NPC_HammerBros, ANIM_HammerBros_Anim0B, ANIM_HammerBros_Anim03, 5, MSG_Peach_00F8) + EVT_EXEC_WAIT(N(EVS_SetCam_Contestants)) + EVT_SET(AB_KKJ29_LeftKoopatrolScore, 0) + EVT_SET(AB_KKJ29_PeachScore, 0) + EVT_SET(AB_KKJ29_RightKoopatrolScore, 0) + // round 1 + EVT_SET(LVar1, MSG_Peach_00FC) + EVT_SET(LVar2, 40) + EVT_SET(LVar3, MSG_Peach_00FD) + EVT_SET(LVar4, MSG_Choice_002C) + EVT_SET(LVar5, 1) + EVT_SET(LVar6, MSG_Peach_0111) + EVT_EXEC_WAIT(N(Script_DoRound)) + // round 2 + EVT_SET(LVar1, MSG_Peach_00FE) + EVT_SET(LVar2, 10) + EVT_SET(LVar3, MSG_Peach_00FF) + EVT_SET(LVar4, MSG_Choice_002D) + EVT_SET(LVar5, 0) + EVT_SET(LVar6, MSG_Peach_0112) + EVT_EXEC_WAIT(N(Script_DoRound)) + // round 3 + EVT_SET(LVar1, MSG_Peach_0100) + EVT_SET(LVar2, 60) + EVT_SET(LVar3, MSG_Peach_0101) + EVT_SET(LVar4, MSG_Choice_002E) + EVT_SET(LVar5, 2) + EVT_SET(LVar6, MSG_Peach_0113) + EVT_EXEC_WAIT(N(Script_DoRound)) + // round 4 + EVT_SET(LVar1, MSG_Peach_0102) + EVT_SET(LVar2, 10) + EVT_SET(LVar3, MSG_Peach_0103) + EVT_SET(LVar4, MSG_Choice_002F) + EVT_SET(LVar5, 0) + EVT_SET(LVar6, MSG_Peach_0114) + EVT_EXEC_WAIT(N(Script_DoRound)) + // round 5 + EVT_SET(LVar1, MSG_Peach_0104) + EVT_SET(LVar2, 30) + EVT_SET(LVar3, MSG_Peach_0105) + EVT_SET(LVar4, MSG_Choice_0030) + EVT_SET(LVar5, 2) + EVT_SET(LVar6, MSG_Peach_0115) + EVT_EXEC_WAIT(N(Script_DoRound)) + // round 6 + EVT_SET(LVar1, MSG_Peach_0106) + EVT_SET(LVar2, 20) + EVT_SET(LVar3, MSG_Peach_0107) + EVT_SET(LVar4, MSG_Choice_0031) + EVT_SET(LVar5, 0) + EVT_SET(LVar6, MSG_Peach_0116) + EVT_EXEC_WAIT(N(Script_DoRound)) + // round 7 + EVT_SET(LVar1, MSG_Peach_0108) + EVT_SET(LVar2, 30) + EVT_SET(LVar3, MSG_Peach_0109) + EVT_SET(LVar4, MSG_Choice_0032) + EVT_SET(LVar5, 1) + EVT_SET(LVar6, MSG_Peach_0117) + EVT_EXEC_WAIT(N(Script_DoRound)) + // round 8 + EVT_SET(LVar1, MSG_Peach_010A) + EVT_SET(LVar2, 60) + EVT_SET(LVar3, MSG_Peach_010B) + EVT_SET(LVar4, MSG_Choice_0033) + EVT_SET(LVar5, 1) + EVT_SET(LVar6, MSG_Peach_0118) + EVT_EXEC_WAIT(N(Script_DoRound)) + // round 9 + EVT_SET(LVar1, MSG_Peach_010C) + EVT_SET(LVar2, 60) + EVT_SET(LVar3, MSG_Peach_010D) + EVT_SET(LVar4, MSG_Choice_0034) + EVT_SET(LVar5, 0) + EVT_SET(LVar6, MSG_Peach_0119) + EVT_EXEC_WAIT(N(Script_DoRound)) + // round 10 + EVT_SET(LVar1, MSG_Peach_010E) + EVT_SET(LVar2, 30) + EVT_SET(LVar3, MSG_Peach_010F) + EVT_SET(LVar4, MSG_Choice_0035) + EVT_SET(LVar5, 0) + EVT_SET(LVar6, MSG_Peach_011A) + EVT_EXEC_WAIT(N(Script_DoRound)) + EVT_CALL(SetMusicTrack, 0, SONG_PEACH_MISSION, 0, 8) + EVT_EXEC_WAIT(N(EVS_DeclareWinner)) + EVT_CALL(SetPanTarget, CAM_DEFAULT, -230, 0, 0) + EVT_CALL(SetCamDistance, CAM_DEFAULT, EVT_FLOAT(300.0)) + EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(17.0), EVT_FLOAT(-13.0)) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(0.5)) + EVT_CALL(SetNpcAnimation, NPC_HammerBros, ANIM_HammerBros_Anim06) + EVT_CALL(NpcMoveTo, NPC_HammerBros, -230, 0, 0) + EVT_CALL(InterpNpcYaw, NPC_HammerBros, 90, 0) + EVT_CALL(SetNpcAnimation, NPC_HammerBros, ANIM_HammerBros_Anim03) + EVT_CALL(SetMusicTrack, 0, SONG_PEACH_QUIZ_INTRO, 2, 8) + EVT_CALL(SpeakToPlayer, NPC_HammerBros, ANIM_HammerBros_Anim0B, ANIM_HammerBros_Anim03, 0, MSG_Peach_0125) + EVT_CALL(SetNpcVar, NPC_HammerBros, 0, 1) + EVT_THREAD + EVT_WAIT(20) + EVT_CALL(DisablePlayerPhysics, FALSE) + EVT_CALL(PlayerMoveTo, -185, -140, 20) + EVT_CALL(PlayerMoveTo, -185, 0, 70) + EVT_CALL(DisablePlayerPhysics, TRUE) + EVT_CALL(SetNpcVar, NPC_HammerBros, 0, 0) + EVT_END_THREAD + EVT_THREAD + EVT_WAIT(20) + EVT_CALL(NpcFlyTo, NPC_PARTNER, -160, 50, 0, 90, 0, EASING_LINEAR) + EVT_END_THREAD + EVT_THREAD + EVT_WAIT(15) + EVT_CALL(SetNpcAnimation, NPC_Koopatrol_01, ANIM_WorldKoopatrol_Anim04) + EVT_CALL(SetNpcFlagBits, NPC_Koopatrol_01, NPC_FLAG_GRAVITY, TRUE) + EVT_CALL(SetNpcSpeed, NPC_Koopatrol_02, EVT_FLOAT(2.0)) + EVT_CALL(NpcMoveTo, NPC_Koopatrol_01, -400, -140, 0) + EVT_CALL(SetNpcFlagBits, NPC_Koopatrol_01, NPC_FLAG_GRAVITY, FALSE) + EVT_CALL(SetNpcAnimation, NPC_Koopatrol_01, ANIM_WorldKoopatrol_Anim01) + EVT_END_THREAD + EVT_THREAD + EVT_WAIT(10) + EVT_CALL(SetNpcAnimation, NPC_Koopatrol_02, ANIM_WorldKoopatrol_Anim04) + EVT_CALL(SetNpcFlagBits, NPC_Koopatrol_02, NPC_FLAG_GRAVITY, TRUE) + EVT_CALL(SetNpcSpeed, NPC_Koopatrol_02, EVT_FLOAT(2.0)) + EVT_CALL(NpcMoveTo, NPC_Koopatrol_02, 0, -140, 0) + EVT_CALL(SetNpcFlagBits, NPC_Koopatrol_02, NPC_FLAG_GRAVITY, FALSE) + EVT_CALL(SetNpcPos, NPC_Koopatrol_02, NPC_DISPOSE_LOCATION) + EVT_END_THREAD + EVT_LOOP(0) + EVT_WAIT(1) + EVT_CALL(GetNpcVar, NPC_HammerBros, 0, LVar0) + EVT_IF_EQ(LVar0, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_CALL(SetPanTarget, CAM_DEFAULT, -190, 0, 70) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_CALL(InterpPlayerYaw, 270, 0) + EVT_CALL(InterpNpcYaw, NPC_PARTNER, 270, 0) + EVT_CALL(SpeakToPlayer, NPC_HammerBros, ANIM_HammerBros_Anim0B, ANIM_HammerBros_Anim03, 0, MSG_Peach_0126) + EVT_CALL(ShowGotItem, ITEM_SNEAKY_PARASOL, TRUE, 0) + EVT_CALL(SpeakToPlayer, NPC_HammerBros, ANIM_HammerBros_Anim0B, ANIM_HammerBros_Anim03, 0, MSG_Peach_0127) + EVT_WAIT(10) + EVT_CALL(SetMusicTrack, 0, SONG_BOWSER_THEME, 0, 8) + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, 330, 0, 0) + EVT_CALL(SetPanTarget, CAM_DEFAULT, 330, 0, 0) + EVT_CALL(SetCamDistance, CAM_DEFAULT, EVT_FLOAT(350.0)) + EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(17.0), EVT_FLOAT(-13.0)) + EVT_CALL(SetCamPosB, CAM_DEFAULT, EVT_FLOAT(250.0), EVT_FLOAT(40.0)) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(90.0)) + EVT_WAIT(20) + EVT_CALL(SetNpcPos, NPC_HammerBros, -350, 0, 0) + EVT_CALL(SetNpcPos, NPC_Koopatrol_01, -325, 0, -30) + EVT_CALL(SetNpcYaw, NPC_Koopatrol_01, 90) + EVT_EXEC(N(EVS_OpenDoor)) + EVT_CALL(SetNpcPos, NPC_Bowser, 410, 0, -25) + EVT_CALL(SetNpcSpeed, NPC_Bowser, EVT_FLOAT(2.0)) + EVT_CALL(SetNpcAnimation, NPC_Bowser, ANIM_WorldBowser_Walk) + EVT_CALL(NpcMoveTo, NPC_Bowser, 250, -25, 0) + EVT_CALL(SetNpcAnimation, NPC_Bowser, ANIM_WorldBowser_Idle) + EVT_CALL(SpeakToNpc, NPC_Bowser, ANIM_WorldBowser_Talk, ANIM_WorldBowser_Idle, 0, NPC_HammerBros, MSG_Peach_0128) + EVT_CALL(ContinueSpeech, NPC_Bowser, ANIM_WorldBowser_TalkEyesClosed, ANIM_WorldBowser_Idle, 0, MSG_Peach_0129) + EVT_CALL(SetNpcVar, NPC_Bowser, 1, 1) + EVT_THREAD + EVT_CALL(SetPlayerPos, -185, 0, -100) + EVT_CALL(InterpPlayerYaw, 90, 0) + EVT_LOOP(0) + EVT_WAIT(1) + EVT_CALL(GetNpcPos, NPC_Bowser, LVar0, LVar1, LVar2) + EVT_IF_LT(LVar0, -20) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_CALL(InterpPlayerYaw, 270, 0) + EVT_EXEC_GET_TID(N(EVS_PeachSweat), LVarA) + EVT_LOOP(0) + EVT_WAIT(1) + EVT_CALL(GetNpcVar, NPC_Bowser, 1, LVar0) + EVT_IF_EQ(LVar0, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_KILL_THREAD(LVarA) + EVT_WAIT(10) + EVT_CALL(InterpPlayerYaw, 90, 7) + EVT_CALL(func_802D1270, -180, -24, EVT_FLOAT(2.0)) + EVT_CALL(func_802D1270, -120, -24, EVT_FLOAT(2.0)) + EVT_END_THREAD + EVT_THREAD + EVT_CALL(SetNpcPos, NPC_PARTNER, -175, 60, -100) + EVT_CALL(SetNpcYaw, NPC_PARTNER, 90) + EVT_LOOP(0) + EVT_WAIT(1) + EVT_CALL(GetNpcPos, NPC_Bowser, LVar0, LVar1, LVar2) + EVT_IF_LT(LVar0, -10) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_CALL(InterpNpcYaw, NPC_PARTNER, 270, 0) + EVT_EXEC_GET_TID(N(EVS_TwinkSweat), LVarA) + EVT_LOOP(0) + EVT_WAIT(1) + EVT_CALL(GetNpcVar, NPC_Bowser, 1, LVar0) + EVT_IF_EQ(LVar0, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_KILL_THREAD(LVarA) + EVT_WAIT(10) + EVT_CALL(SetNpcAnimation, NPC_PARTNER, ANIM_Twink_Fly) + EVT_CALL(InterpNpcYaw, NPC_PARTNER, 90, 5) + EVT_CALL(LoadPath, 50, EVT_PTR(N(TwinkFlyAwayPath)), ARRAY_COUNT(N(TwinkFlyAwayPath)), EASING_LINEAR) + EVT_EXEC_WAIT(N(EVS_TwinkFollowPath)) + EVT_CALL(SetNpcAnimation, NPC_PARTNER, ANIM_Twink_Idle) + EVT_END_THREAD + EVT_THREAD + EVT_WAIT(10) + EVT_CALL(SetPanTarget, CAM_DEFAULT, -300, 0, 0) + EVT_CALL(SetCamDistance, CAM_DEFAULT, EVT_FLOAT(300.0)) + EVT_END_THREAD + EVT_CALL(SetNpcSpeed, NPC_Bowser, EVT_FLOAT(3.75)) + EVT_CALL(SetNpcAnimation, NPC_Bowser, ANIM_WorldBowser_Walk) + EVT_CALL(NpcMoveTo, NPC_Bowser, -260, 0, 0) + EVT_CALL(SetNpcAnimation, NPC_Bowser, ANIM_WorldBowser_Idle) + EVT_CALL(SetNpcVar, NPC_Bowser, 0, 0) + EVT_CALL(SetNpcVar, NPC_Bowser, 1, 0) + EVT_WAIT(10) + EVT_LOOP(2) + EVT_CALL(SetNpcAnimation, NPC_Bowser, ANIM_WorldBowser_Talk) + EVT_WAIT(10) + EVT_CALL(SetNpcAnimation, NPC_Bowser, ANIM_WorldBowser_Idle) + EVT_WAIT(3) + EVT_CALL(SetNpcAnimation, NPC_HammerBros, ANIM_HammerBros_Anim0B) + EVT_WAIT(10) + EVT_CALL(SetNpcAnimation, NPC_HammerBros, ANIM_HammerBros_Anim03) + EVT_WAIT(3) + EVT_END_LOOP + EVT_WAIT(10) + EVT_CALL(SpeakToNpc, NPC_Bowser, ANIM_WorldBowser_Talk, ANIM_WorldBowser_Idle, 0, NPC_HammerBros, MSG_Peach_012A) + EVT_CALL(InterpNpcYaw, NPC_Bowser, 90, 5) + EVT_CALL(SetPanTarget, CAM_DEFAULT, -190, 0, 0) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(3.0)) + EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_WAIT(10) + EVT_THREAD + EVT_WAIT(10) + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_CALL(SetPlayerJumpscale, EVT_FLOAT(1.0)) + EVT_CALL(PlayerJump1, LVar0, LVar1, LVar2, 10) + EVT_CALL(InterpPlayerYaw, 270, 5) + EVT_END_THREAD + EVT_THREAD + EVT_CALL(SetNpcAnimation, NPC_Bowser, ANIM_WorldBowser_Shock) + EVT_CALL(GetNpcPos, NPC_Bowser, LVar0, LVar1, LVar2) + EVT_CALL(NpcJump0, NPC_Bowser, LVar0, LVar1, LVar2, 10) + EVT_END_THREAD + EVT_CALL(SpeakToPlayer, NPC_Bowser, ANIM_WorldBowser_Shock, ANIM_WorldBowser_Shock, 5, MSG_Peach_012B) + EVT_CALL(SetNpcAnimation, NPC_Bowser, ANIM_WorldBowser_Idle) + EVT_CALL(EndSpeech, NPC_Bowser, ANIM_WorldBowser_Talk, ANIM_WorldBowser_Idle, 5) + EVT_CALL(SpeakToPlayer, NPC_Koopatrol_01, ANIM_WorldKoopatrol_Anim08, ANIM_WorldKoopatrol_Anim01, 5, MSG_Peach_012C) + EVT_EXEC_WAIT(N(EVS_ApproachPeach)) + EVT_CALL(SpeakToPlayer, NPC_HammerBros, ANIM_HammerBros_Anim0B, ANIM_HammerBros_Anim03, 5, MSG_Peach_012D) + EVT_EXEC_WAIT(N(EVS_PickUpPeach)) + EVT_CALL(SpeakToPlayer, NPC_PLAYER, ANIM_Peach_C0018, ANIM_Peach_C0018, 5, MSG_Peach_012E) + EVT_EXEC_WAIT(N(EVS_CarryPeachAway)) + EVT_WAIT(30) + EVT_CALL(FadeOutMusic, 0, 1000) + EVT_EXEC_WAIT(N(EVS_EndPeachChapter5)) + EVT_CALL(EnablePartnerAI) + EVT_CALL(DisablePlayerPhysics, FALSE) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_kmr/kmr.h b/src/world/area_kmr/kmr.h index 10b0ffb773..5737856f7e 100644 --- a/src/world/area_kmr/kmr.h +++ b/src/world/area_kmr/kmr.h @@ -2,22 +2,22 @@ #define _WORLD_AREA_KMR_KMR_H_ enum { - AB_KMR_0 = AreaByte(0), - AB_KMR_1 = AreaByte(1), - AB_KMR_2 = AreaByte(2), - AB_KMR_3 = AreaByte(3), - AB_KMR_4 = AreaByte(4), - AB_KMR_5 = AreaByte(5), - AB_KMR_6 = AreaByte(6), - AB_KMR_7 = AreaByte(7), - AB_KMR_8 = AreaByte(8), - AB_KMR_9 = AreaByte(9), - AB_KMR_A = AreaByte(10), - AB_KMR_B = AreaByte(11), - AB_KMR_C = AreaByte(12), - AB_KMR_D = AreaByte(13), - AB_KMR_E = AreaByte(14), - AB_KMR_F = AreaByte(15), + AB_KMR_0 = AreaByte(0), + AB_KMR_Unused_1 = AreaByte(1), + AB_KMR_2 = AreaByte(2), + AB_KMR_Unused_3 = AreaByte(3), + AB_KMR_Unused_4 = AreaByte(4), + AB_KMR_Unused_5 = AreaByte(5), + AB_KMR_Unused_6 = AreaByte(6), + AB_KMR_Unused_7 = AreaByte(7), + AB_KMR_Unused_8 = AreaByte(8), + AB_KMR_Unused_9 = AreaByte(9), + AB_KMR_Unused_A = AreaByte(10), + AB_KMR_Unused_B = AreaByte(11), + AB_KMR_Unused_C = AreaByte(12), + AB_KMR_Unused_D = AreaByte(13), + AB_KMR_Unused_E = AreaByte(14), + AB_KMR_Unused_F = AreaByte(15), }; enum { diff --git a/src/world/area_kmr/kmr_00/kmr_00_4_npc.c b/src/world/area_kmr/kmr_00/kmr_00_4_npc.c index 25e2b4a1e5..356e6b304e 100644 --- a/src/world/area_kmr/kmr_00/kmr_00_4_npc.c +++ b/src/world/area_kmr/kmr_00/kmr_00_4_npc.c @@ -106,86 +106,86 @@ EvtScript N(EVS_NpcInit_Goombaria) = { EVT_END }; -StaticNpc N(NpcData_Goombaria) = { +NpcData N(NpcData_Goombaria) = { .id = NPC_Goombaria, - .settings = &N(NpcSettings_Goombaria_Stationary), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_Goombaria), - .drops = GOOMBARIA_DROPS, + .settings = &N(NpcSettings_Goombaria_Stationary), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = NO_DROPS, .animations = GOOMBARIA_ANIMS, }; -StaticNpc N(NpcData_StarSpirits)[] = { +NpcData N(NpcData_StarSpirits)[] = { { .id = NPC_Eldstar, - .settings = &N(NpcSettings_StarSpirit), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_StarSpirit), - .drops = ELDSTAR_DROPS, + .settings = &N(NpcSettings_StarSpirit), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = NO_DROPS, .animations = ELDSTAR_ANIMS, }, { .id = NPC_Mamar, - .settings = &N(NpcSettings_StarSpirit), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_StarSpirit), - .drops = MAMAR_DROPS, + .settings = &N(NpcSettings_StarSpirit), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = NO_DROPS, .animations = MAMAR_ANIMS, }, { .id = NPC_Skolar, - .settings = &N(NpcSettings_StarSpirit), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_StarSpirit), - .drops = SKOLAR_DROPS, + .settings = &N(NpcSettings_StarSpirit), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = NO_DROPS, .animations = SKOLAR_ANIMS, }, { .id = NPC_Muskular, - .settings = &N(NpcSettings_StarSpirit), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_StarSpirit), - .drops = MUSKULAR_DROPS, + .settings = &N(NpcSettings_StarSpirit), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = NO_DROPS, .animations = MUSKULAR_ANIMS, }, { .id = NPC_Misstar, - .settings = &N(NpcSettings_StarSpirit), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_StarSpirit), - .drops = MISSTAR_DROPS, + .settings = &N(NpcSettings_StarSpirit), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = NO_DROPS, .animations = MISSTAR_ANIMS, }, { .id = NPC_Klevar, - .settings = &N(NpcSettings_StarSpirit), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_StarSpirit), - .drops = KLEVAR_DROPS, + .settings = &N(NpcSettings_StarSpirit), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = NO_DROPS, .animations = KLEVAR_ANIMS, }, { .id = NPC_Kalmar, - .settings = &N(NpcSettings_StarSpirit), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_StarSpirit), - .drops = KALMAR_DROPS, + .settings = &N(NpcSettings_StarSpirit), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = NO_DROPS, .animations = KALMAR_ANIMS, }, }; diff --git a/src/world/area_kmr/kmr_02/kmr_02.h b/src/world/area_kmr/kmr_02/kmr_02.h index f795805d48..1d6f40f8ae 100644 --- a/src/world/area_kmr/kmr_02/kmr_02.h +++ b/src/world/area_kmr/kmr_02/kmr_02.h @@ -22,30 +22,30 @@ #include "sprite/npc/WorldKammy.h" enum { - NPC_Goompa = 0, - NPC_Goombaria = 1, - NPC_Goombario = 2, - NPC_Goompapa = 3, - NPC_Goomama = 4, - NPC_Gooma = 5, - NPC_Toad = 6, - NPC_Kammy = 7, - NPC_ChuckQuizmo = 8, - NPC_Eldstar_01 = 11, - NPC_Eldstar_02 = 12, - NPC_Parakarry = 13, + NPC_Goompa = 0, + NPC_Goombaria = 1, + NPC_Goombario = 2, + NPC_Goompapa = 3, + NPC_Goomama = 4, + NPC_Gooma = 5, + NPC_Toad = 6, + NPC_Kammy = 7, + NPC_ChuckQuizmo = 8, + NPC_Eldstar_01 = 11, + NPC_Eldstar_02 = 12, + NPC_Parakarry = 13, }; enum { - MV_Unk_00 = MapVar(0), - MV_Unk_01 = MapVar(1), - MV_Unk_04 = MapVar(4), - MV_Unk_05 = MapVar(5), + MV_Unk_00 = MapVar(0), + MV_Unk_01 = MapVar(1), + MV_Unk_04 = MapVar(4), + MV_Unk_05 = MapVar(5), }; -enum { - MF_SpawnFlag_BushCoin = MapFlag(10), - MF_SpawnFlag_Goomnut = MapFlag(11), +enum { + MF_SpawnFlag_BushCoin = MapFlag(10), + MF_SpawnFlag_Goomnut = MapFlag(11), }; #define NAMESPACE kmr_02 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 d0f1803d01..45c4732dc2 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 @@ -31,30 +31,7 @@ API_CALLABLE(N(func_80242014_8B2084)) { #include "world/common/npc/GoombaFamily_Wander.inc.c" #include "world/common/npc/GoombaFamily.inc.c" - -#include "world/common/enemy/complete/Kammy.h" - -GuardAISettings N(AISettings_Kammy) = { - .playerSearchInterval = -1, - .chaseRadius = 300.0f, - .unk_AI_20 = 30, -}; - -EvtScript N(EVS_NpcAI_Kammy) = { - EVT_CALL(N(GuardAI_Main), EVT_PTR(N(AISettings_Kammy))) - EVT_RETURN - EVT_END -}; - -NpcSettings N(NpcSettings_Kammy) = { - .height = 40, - .radius = 30, - .level = 26, - .ai = &N(EVS_NpcAI_Kammy), - .onHit = &EnemyNpcHit, - .onDefeat = &EnemyNpcDefeat, -}; - +#include "world/common/enemy/Kammy_Guard.inc.c" #include "world/common/npc/StarSpirit.inc.c" MAP_STATIC_PAD(1,key_choice); @@ -1762,15 +1739,11 @@ EvtScript N(EVS_NpcAI_Eldstar_02) = { EVT_END }; -StaticNpc N(NpcData_GoombaFamily)[] = { +NpcData N(NpcData_GoombaFamily)[] = { { .id = NPC_Goompa, - .settings = &N(NpcSettings_GoombaFamily_Wander), .pos = { 506.0f, 30.0f, -364.0f }, .yaw = 45, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_800 | ENEMY_FLAG_2000, - .init = &N(EVS_NpcInit_Goompa), - .drops = GOOMPA_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -1783,17 +1756,17 @@ StaticNpc N(NpcData_GoombaFamily)[] = { .detectSize = { 100 }, } }, + .init = &N(EVS_NpcInit_Goompa), + .settings = &N(NpcSettings_GoombaFamily_Wander), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .drops = NO_DROPS, .animations = GOOMPA_ANIMS, .tattle = MSG_NpcTattle_Goompa, }, { .id = NPC_Goombaria, - .settings = &N(NpcSettings_GoombaFamily_Wander), .pos = { 92.0f, 0.0f, 76.0f }, .yaw = 0, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_800 | ENEMY_FLAG_2000, - .init = &N(EVS_NpcInit_Goombaria), - .drops = GOOMBARIA_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -1806,17 +1779,17 @@ StaticNpc N(NpcData_GoombaFamily)[] = { .detectSize = { 100 }, } }, + .init = &N(EVS_NpcInit_Goombaria), + .settings = &N(NpcSettings_GoombaFamily_Wander), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .drops = NO_DROPS, .animations = GOOMBARIA_ANIMS, .tattle = MSG_NpcTattle_Goombaria, }, { .id = NPC_Goombario, - .settings = &N(NpcSettings_GoombaFamily_Wander), .pos = { -50.0f, 0.0f, -30.0f }, .yaw = 0, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_800 | ENEMY_FLAG_2000, - .init = &N(EVS_NpcInit_Goombario), - .drops = GOOMBARIO_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -1829,16 +1802,16 @@ StaticNpc N(NpcData_GoombaFamily)[] = { .detectSize = { 100 }, } }, + .init = &N(EVS_NpcInit_Goombario), + .settings = &N(NpcSettings_GoombaFamily_Wander), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .drops = NO_DROPS, .animations = GOOMBARIO_ANIMS, }, { .id = NPC_Gooma, - .settings = &N(NpcSettings_GoombaFamily_Wander), .pos = { 100.0f, 0.0f, -256.0f }, .yaw = 90, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_800 | ENEMY_FLAG_2000, - .init = &N(EVS_NpcInit_Gooma), - .drops = GOOMA_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -1851,17 +1824,17 @@ StaticNpc N(NpcData_GoombaFamily)[] = { .detectSize = { 30 }, } }, + .init = &N(EVS_NpcInit_Gooma), + .settings = &N(NpcSettings_GoombaFamily_Wander), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .drops = NO_DROPS, .animations = GOOMA_ANIMS, .tattle = MSG_NpcTattle_Gooma, }, { .id = NPC_Goompapa, - .settings = &N(NpcSettings_GoombaFamily_Wander), .pos = { 163.0f, 0.0f, 283.0f }, .yaw = 0, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_800 | ENEMY_FLAG_2000, - .init = &N(EVS_NpcInit_Goompapa), - .drops = GOOMPAPA_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -1874,19 +1847,19 @@ StaticNpc N(NpcData_GoombaFamily)[] = { .detectSize = { 100 }, } }, + .init = &N(EVS_NpcInit_Goompapa), + .settings = &N(NpcSettings_GoombaFamily_Wander), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .drops = NO_DROPS, .animations = GOOMPAPA_ANIMS, .tattle = MSG_NpcTattle_Goompapa, }, }; -StaticNpc N(NpcData_Goomama) = { +NpcData N(NpcData_Goomama) = { .id = NPC_Goomama, - .settings = &N(NpcSettings_GoombaFamily_Wander), .pos = { -200.0f, 0.0f, 100.0f }, .yaw = 0, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_800 | ENEMY_FLAG_2000, - .init = &N(EVS_NpcInit_Goomama), - .drops = GOOMAMA_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -1899,6 +1872,10 @@ StaticNpc N(NpcData_Goomama) = { .detectSize = { 100 }, } }, + .init = &N(EVS_NpcInit_Goomama), + .settings = &N(NpcSettings_GoombaFamily_Wander), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .drops = NO_DROPS, .animations = GOOMAMA_ANIMS, .tattle = MSG_NpcTattle_Goomama, }; @@ -1909,14 +1886,10 @@ EvtScript N(EVS_NpcInit_Toad) = { EVT_END }; -StaticNpc N(NpcData_Toad) = { +NpcData N(NpcData_Toad) = { .id = NPC_Toad, - .settings = &N(NpcSettings_Toad_Guard), .pos = { -138.0f, 19.0f, -297.0f }, .yaw = 0, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, - .init = &N(EVS_NpcInit_Toad), - .drops = TOAD_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -1929,28 +1902,28 @@ StaticNpc N(NpcData_Toad) = { .detectSize = { 0 }, } }, + .init = &N(EVS_NpcInit_Toad), + .settings = &N(NpcSettings_Toad_Guard), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .drops = NO_DROPS, .animations = TOAD_RED_ANIMS, .tattle = MSG_NpcTattle_KMR_ToadHouseToad, }; -s32 N(ExtraAnims_Kammy)[] = { +AnimID N(ExtraAnims_Kammy)[] = { ANIM_WorldKammy_Anim15, ANIM_WorldKammy_Anim10, ANIM_WorldKammy_Anim0E, ANIM_WorldKammy_Anim0F, ANIM_WorldKammy_Anim16, ANIM_WorldKammy_Anim13, - -1 + ANIM_LIST_END }; -StaticNpc N(NpcData_Kammy) = { +NpcData N(NpcData_Kammy) = { .id = NPC_Kammy, - .settings = &N(NpcSettings_Kammy), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 90, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_800, - .init = &N(EVS_NpcInit_Kammy), - .drops = NPC_NO_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -1963,19 +1936,23 @@ StaticNpc N(NpcData_Kammy) = { .detectSize = { 100 }, } }, + .init = &N(EVS_NpcInit_Kammy), + .settings = &N(NpcSettings_Kammy_Guard), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_800, + .drops = NO_DROPS, .animations = KAMMY_ANIMS, .extraAnimations = N(ExtraAnims_Kammy), }; -StaticNpc N(NpcData_ChuckQuizmo) = { +NpcData N(NpcData_ChuckQuizmo) = { .id = NPC_ChuckQuizmo, - .settings = &N(NpcSettings_ChuckQuizmo), .pos = { -300.0f, 0.0f, 175.0f }, .yaw = 90, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_4000 | ENEMY_FLAG_400000, .initVarCount = 1, .initVar = { .bytes = { 0, QUIZ_AREA_KMR, QUIZ_COUNT_KMR, QUIZ_MAP_KMR_02 }}, - .drops = QUIZMO_DROPS, + .settings = &N(NpcSettings_ChuckQuizmo), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_4000 | ENEMY_FLAG_400000, + .drops = NO_DROPS, .animations = QUIZMO_ANIMS, .tattle = MSG_NpcTattle_ChuckQuizmo, }; @@ -2006,33 +1983,33 @@ EvtScript N(EVS_NpcInit_Eldstar_02) = { EVT_END }; -s32 N(ExtraAnims_Eldstar)[] = { +AnimID N(ExtraAnims_Eldstar)[] = { ANIM_WorldEldstar_Idle, ANIM_WorldEldstar_Wave, ANIM_Goompa_Still, // ?? - -1 + ANIM_LIST_END }; -StaticNpc N(NpcData_Eldstar_Prologue)[] = { +NpcData N(NpcData_Eldstar_Prologue)[] = { { .id = NPC_Eldstar_01, - .settings = &N(NpcSettings_StarSpirit), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_4000 | ENEMY_FLAG_200000, .init = &N(EVS_NpcInit_Eldstar_01), - .drops = ELDSTAR_DROPS, + .settings = &N(NpcSettings_StarSpirit), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_4000 | ENEMY_FLAG_200000, + .drops = NO_DROPS, .animations = ELDSTAR_ANIMS, .extraAnimations = N(ExtraAnims_Eldstar), }, { .id = NPC_Eldstar_02, - .settings = &N(NpcSettings_StarSpirit), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_Eldstar_02), - .drops = ELDSTAR_DROPS, + .settings = &N(NpcSettings_StarSpirit), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .drops = NO_DROPS, .animations = ELDSTAR_ANIMS, .extraAnimations = N(ExtraAnims_Eldstar), }, @@ -2229,30 +2206,26 @@ EvtScript N(EVS_NpcInit_Parakarry_Epilogue) = { EVT_END }; -StaticNpc N(NpcData_Epilogue)[] = { +NpcData N(NpcData_Epilogue)[] = { { .id = NPC_Eldstar_01, - .settings = &N(NpcSettings_StarSpirit), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_4000 | ENEMY_FLAG_200000, .init = &N(EVS_NpcInit_Eldstar_Epilogue), - .drops = ELDSTAR_DROPS, + .settings = &N(NpcSettings_StarSpirit), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_4000 | ENEMY_FLAG_200000, + .drops = NO_DROPS, .animations = ELDSTAR_ANIMS, .extraAnimations = N(ExtraAnims_Eldstar), }, { .id = NPC_Parakarry, - .settings = &N(NpcSettings_GoombaFamily), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_800 | ENEMY_FLAG_200000, .init = &N(EVS_NpcInit_Parakarry_Epilogue), - .drops = { - .dropFlags = NPC_DROP_FLAG_80, - .heartDrops = NO_DROPS, - .flowerDrops = NO_DROPS, - }, + .settings = &N(NpcSettings_GoombaFamily), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_800 | ENEMY_FLAG_200000, + .drops = NO_DROPS, .animations = { .idle = ANIM_WorldParakarry_Idle, .walk = ANIM_WorldParakarry_Walk, @@ -2274,22 +2247,22 @@ StaticNpc N(NpcData_Epilogue)[] = { }, { .id = NPC_Goombario, - .settings = &N(NpcSettings_GoombaFamily), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_200000, .init = &N(EVS_NpcInit_Goombario_Epilogue), - .drops = GOOMBARIO_DROPS, + .settings = &N(NpcSettings_GoombaFamily), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_200000, + .drops = NO_DROPS, .animations = GOOMBARIO_ANIMS, }, { .id = NPC_Goombaria, - .settings = &N(NpcSettings_GoombaFamily), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_200000, .init = &N(EVS_NpcInit_Goombaria_Epilogue), - .drops = GOOMBARIA_DROPS, + .settings = &N(NpcSettings_GoombaFamily), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_200000, + .drops = NO_DROPS, .animations = GOOMBARIA_ANIMS, }, }; diff --git a/src/world/area_kmr/kmr_03/kmr_03_3_npc.c b/src/world/area_kmr/kmr_03/kmr_03_3_npc.c index 6fec18488f..c2db05d489 100644 --- a/src/world/area_kmr/kmr_03/kmr_03_3_npc.c +++ b/src/world/area_kmr/kmr_03/kmr_03_3_npc.c @@ -163,18 +163,14 @@ EvtScript N(EVS_NpcInit_Goompa) = { EVT_END }; -StaticNpc N(NpcData_GoombaFamily) = { +NpcData N(NpcData_GoombaFamily) = { .id = NPC_Goompa, - .settings = &N(NpcSettings_Goompa), .pos = { -50.0f, 0.0f, 80.0f }, .yaw = 45, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_Goompa), - .drops = { - .dropFlags = NPC_DROP_FLAG_80, - .heartDrops = NO_DROPS, - .flowerDrops = NO_DROPS, - }, + .settings = &N(NpcSettings_Goompa), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400000, + .drops = NO_DROPS, .animations = { .idle = ANIM_Goompa_Idle, .walk = ANIM_Goompa_Walk, 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 959e4c2b0f..2cfbbb643f 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 @@ -258,18 +258,14 @@ EvtScript N(EVS_NpcInit_JrTroopa) = { EVT_END }; -StaticNpc N(NpcData_JrTroopa) = { +NpcData N(NpcData_JrTroopa) = { .id = NPC_JrTroopa, - .settings = &N(NpcSettings_JrTroopa), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_200000 | ENEMY_FLAG_NO_DROPS, .init = &N(EVS_NpcInit_JrTroopa), - .drops = { - .dropFlags = NPC_DROP_FLAG_80, - .heartDrops = NO_DROPS, - .flowerDrops = NO_DROPS, - }, + .settings = &N(NpcSettings_JrTroopa), + .flags = ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_200000 | ENEMY_FLAG_NO_DROPS, + .drops = NO_DROPS, .animations = { .idle = ANIM_JrTroopa_Idle, .walk = ANIM_JrTroopa_Walk, @@ -290,11 +286,11 @@ StaticNpc N(NpcData_JrTroopa) = { }, }; -StaticNpc N(NpcData_GoombaFamily) = { +NpcData N(NpcData_GoombaFamily) = { .id = NPC_Goompa, - .settings = &N(NpcSettings_Goompa), .pos = { -58.0f, 0.0f, 130.0f }, .yaw = 0, + .settings = &N(NpcSettings_Goompa), .flags = ENEMY_FLAG_100 | ENEMY_FLAG_200000, .animations = { }, diff --git a/src/world/area_kmr/kmr_05/kmr_05_3_npc.c b/src/world/area_kmr/kmr_05/kmr_05_3_npc.c index 3c933cec6b..f54372a6cc 100644 --- a/src/world/area_kmr/kmr_05/kmr_05_3_npc.c +++ b/src/world/area_kmr/kmr_05/kmr_05_3_npc.c @@ -1,8 +1,8 @@ #include "kmr_05.h" -#include "world/common/enemy/complete/Goomba_Wander.inc.c" -#include "world/common/enemy/complete/Paragoomba_Wander.inc.c" -#include "world/common/enemy/complete/SpikedGoomba_Wander.inc.c" +#include "world/common/enemy/Goomba_Wander.inc.c" +#include "world/common/enemy/Paragoomba_Wander.inc.c" +#include "world/common/enemy/SpikedGoomba_Wander.inc.c" EvtScript N(EVS_GoompaRemark) = { EVT_CALL(DisablePlayerInput, TRUE) @@ -69,13 +69,10 @@ EvtScript N(EVS_NpcIdle_SpikedGoomba) = { EVT_END }; -StaticNpc N(NpcData_Goomba_01) = { +NpcData N(NpcData_Goomba_01) = { .id = NPC_Goomba_01, - .settings = &N(NpcSettings_Goomba_Wander), .pos = { 305.0f, 50.0f, -13.0f }, .yaw = 90, - .flags = ENEMY_FLAG_400, - .drops = GOOMBA_DROPS, .territory = { .wander = { .isFlying = FALSE, @@ -88,17 +85,17 @@ StaticNpc N(NpcData_Goomba_01) = { .detectSize = { 120, 130 }, } }, + .settings = &N(NpcSettings_Goomba_Wander), + .flags = ENEMY_FLAG_400, + .drops = GOOMBA_DROPS, .animations = GOOMBA_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, }; -StaticNpc N(NpcData_Goomba_02) = { +NpcData N(NpcData_Goomba_02) = { .id = NPC_Goomba_02, - .settings = &N(NpcSettings_Goomba_Wander), .pos = { 700.0f, 210.0f, -165.0f }, .yaw = 90, - .flags = ENEMY_FLAG_400, - .drops = GOOMBA_DROPS, .territory = { .wander = { .isFlying = FALSE, @@ -111,6 +108,9 @@ StaticNpc N(NpcData_Goomba_02) = { .detectSize = { 120, 130 }, } }, + .settings = &N(NpcSettings_Goomba_Wander), + .flags = ENEMY_FLAG_400, + .drops = GOOMBA_DROPS, .animations = GOOMBA_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, }; @@ -122,14 +122,10 @@ EvtScript N(EVS_NpcInit_SpikedGoomba) = { EVT_END }; -StaticNpc N(NpcData_SpikedGoomba) = { +NpcData N(NpcData_SpikedGoomba) = { .id = NPC_SpikedGoomba, - .settings = &N(NpcSettings_SpikedGoomba_Wander), .pos = { 712.0f, 100.0f, -95.0f }, .yaw = 270, - .flags = ENEMY_FLAG_400, - .init = &N(EVS_NpcInit_SpikedGoomba), - .drops = SPIKED_GOOMBA_DROPS, .territory = { .wander = { .isFlying = FALSE, @@ -142,17 +138,18 @@ StaticNpc N(NpcData_SpikedGoomba) = { .detectSize = { 165, 150 }, } }, + .init = &N(EVS_NpcInit_SpikedGoomba), + .settings = &N(NpcSettings_SpikedGoomba_Wander), + .flags = ENEMY_FLAG_400, + .drops = SPIKED_GOOMBA_DROPS, .animations = SPIKED_GOOMBA_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, }; -StaticNpc N(NpcData_Paragoomba) = { +NpcData N(NpcData_Paragoomba) = { .id = NPC_Paragoomba, - .settings = &N(NpcSettings_Paragoomba_Wander), .pos = { 960.0f, 210.0f, -20.0f }, .yaw = 270, - .flags = ENEMY_FLAG_400, - .drops = PARAGOOMBA_DROPS, .territory = { .wander = { .isFlying = FALSE, @@ -165,6 +162,9 @@ StaticNpc N(NpcData_Paragoomba) = { .detectSize = { 210, 100 }, } }, + .settings = &N(NpcSettings_Paragoomba_Wander), + .flags = ENEMY_FLAG_400, + .drops = PARAGOOMBA_DROPS, .animations = PARAGOOMBA_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, }; diff --git a/src/world/area_kmr/kmr_06/kmr_06_3_npc.c b/src/world/area_kmr/kmr_06/kmr_06_3_npc.c index 4e44df9c5c..bdb91faed4 100644 --- a/src/world/area_kmr/kmr_06/kmr_06_3_npc.c +++ b/src/world/area_kmr/kmr_06/kmr_06_3_npc.c @@ -1,15 +1,12 @@ #include "kmr_06.h" -#include "world/common/enemy/complete/SpikedGoomba_Wander.inc.c" -#include "world/common/enemy/complete/Paragoomba_Wander.inc.c" +#include "world/common/enemy/SpikedGoomba_Wander.inc.c" +#include "world/common/enemy/Paragoomba_Wander.inc.c" -StaticNpc N(NpcData_SpikedGoomba) = { +NpcData N(NpcData_SpikedGoomba) = { .id = NPC_SpikedGoomba, - .settings = &N(NpcSettings_SpikedGoomba_Wander), .pos = { 160.0f, 0.0f, 30.0f }, .yaw = 270, - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, - .drops = SPIKED_GOOMBA_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -22,16 +19,16 @@ StaticNpc N(NpcData_SpikedGoomba) = { .detectSize = { 300 }, } }, + .settings = &N(NpcSettings_SpikedGoomba_Wander), + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .drops = SPIKED_GOOMBA_DROPS, .animations = SPIKED_GOOMBA_ANIMS, }; -StaticNpc N(NpcData_Paragoomba) = { +NpcData N(NpcData_Paragoomba) = { .id = NPC_Paragoomba, - .settings = &N(NpcSettings_Paragoomba_Wander), .pos = { 525.0f, 60.0f, 15.0f }, .yaw = 270, - .flags = ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, - .drops = PARAGOOMBA_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -44,6 +41,9 @@ StaticNpc N(NpcData_Paragoomba) = { .detectSize = { 300 }, } }, + .settings = &N(NpcSettings_Paragoomba_Wander), + .flags = ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = PARAGOOMBA_DROPS, .animations = PARAGOOMBA_ANIMS, }; 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 effbd746d2..d11b033eef 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_Guard.inc.c" +#include "world/common/enemy/GoombaBros_Guard.inc.c" extern AnimScript Entity_SimpleSpring_AnimLaunch; @@ -206,15 +206,11 @@ EvtScript N(EVS_NpcInit_GoombaBros_Blue) = { EVT_END }; -StaticNpc N(NpcData_GoombaBros_Red)[] = { +NpcData N(NpcData_GoombaBros_Red)[] = { { .id = NPC_GoombaBros_Red, - .settings = &N(NpcSettings_GoombaBros_Guard), .pos = { 526.0f, 80.0f, 0.0f }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_40000 | ENEMY_FLAG_200000 | ENEMY_FLAG_NO_DROPS, - .init = &N(EVS_NpcInit_GoombaBros_Red), - .drops = GOOMBA_BROS_DROPS, .territory = { .wander = { .isFlying = FALSE, @@ -227,16 +223,16 @@ StaticNpc N(NpcData_GoombaBros_Red)[] = { .detectSize = { 0 }, } }, + .init = &N(EVS_NpcInit_GoombaBros_Red), + .settings = &N(NpcSettings_GoombaBros_Guard), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_40000 | ENEMY_FLAG_200000 | ENEMY_FLAG_NO_DROPS, + .drops = NO_DROPS, .animations = GOOMBA_BROS_RED_ANIMS, }, { .id = NPC_GoombaBros_Blue, - .settings = &N(NpcSettings_GoombaBros_Guard), .pos = { 498.0f, 80.0f, -10.0f }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_40000 | ENEMY_FLAG_200000 | ENEMY_FLAG_NO_DROPS, - .init = &N(EVS_NpcInit_GoombaBros_Blue), - .drops = GOOMBA_BROS_DROPS, .territory = { .wander = { .isFlying = FALSE, @@ -249,6 +245,10 @@ StaticNpc N(NpcData_GoombaBros_Red)[] = { .detectSize = { 0 }, } }, + .init = &N(EVS_NpcInit_GoombaBros_Blue), + .settings = &N(NpcSettings_GoombaBros_Guard), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_40000 | ENEMY_FLAG_200000 | ENEMY_FLAG_NO_DROPS, + .drops = NO_DROPS, .animations = GOOMBA_BROS_BLUE_ANIMS, }, }; diff --git a/src/world/area_kmr/kmr_09/kmr_09_3_npc.c b/src/world/area_kmr/kmr_09/kmr_09_3_npc.c index 084dd3e606..b0fa1edb9e 100644 --- a/src/world/area_kmr/kmr_09/kmr_09_3_npc.c +++ b/src/world/area_kmr/kmr_09/kmr_09_3_npc.c @@ -1,16 +1,13 @@ #include "kmr_09.h" #include "entity.h" -#include "world/common/enemy/complete/Goomba_Wander.inc.c" -#include "world/common/enemy/complete/Paragoomba_Wander.inc.c" +#include "world/common/enemy/Goomba_Wander.inc.c" +#include "world/common/enemy/Paragoomba_Wander.inc.c" -StaticNpc N(NpcData_Goomba_01) = { +NpcData N(NpcData_Goomba_01) = { .id = NPC_Goomba_01, - .settings = &N(NpcSettings_Goomba_Wander), .pos = { 200.0f, 0.0f, 24.0f }, .yaw = 90, - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, - .drops = GOOMBA_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -23,16 +20,16 @@ StaticNpc N(NpcData_Goomba_01) = { .detectSize = { 250 }, } }, + .settings = &N(NpcSettings_Goomba_Wander), + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .drops = GOOMBA_DROPS, .animations = GOOMBA_ANIMS, }; -StaticNpc N(NpcData_Goomba_02) = { +NpcData N(NpcData_Goomba_02) = { .id = NPC_Goomba_02, - .settings = &N(NpcSettings_Goomba_Wander), .pos = { 250.0f, 0.0f, 35.0f }, .yaw = 90, - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, - .drops = GOOMBA_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -45,6 +42,9 @@ StaticNpc N(NpcData_Goomba_02) = { .detectSize = { 250 }, } }, + .settings = &N(NpcSettings_Goomba_Wander), + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .drops = GOOMBA_DROPS, .animations = GOOMBA_ANIMS, }; @@ -127,14 +127,10 @@ EvtScript N(EVS_NpcInit_Goomba_Ambush) = { EVT_END }; -StaticNpc N(NpcData_Goomba_Ambush) = { +NpcData N(NpcData_Goomba_Ambush) = { .id = NPC_Goomba_Ambush, - .settings = &N(NpcSettings_Goomba_Wander), .pos = { -34.0f, 29.0f, -32.0f }, .yaw = 270, - .flags = ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, - .init = &N(EVS_NpcInit_Goomba_Ambush), - .drops = GOOMBA_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -147,16 +143,17 @@ StaticNpc N(NpcData_Goomba_Ambush) = { .detectSize = { 250 }, } }, + .init = &N(EVS_NpcInit_Goomba_Ambush), + .settings = &N(NpcSettings_Goomba_Wander), + .flags = ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = GOOMBA_DROPS, .animations = GOOMBA_ANIMS, }; -StaticNpc N(NpcData_Paragoomba) = { +NpcData N(NpcData_Paragoomba) = { .id = NPC_Paragoomba, - .settings = &N(NpcSettings_Paragoomba_Wander), .pos = { 670.0f, 60.0f, 20.0f }, .yaw = 270, - .flags = ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, - .drops = PARAGOOMBA_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -169,6 +166,9 @@ StaticNpc N(NpcData_Paragoomba) = { .detectSize = { 250 }, } }, + .settings = &N(NpcSettings_Paragoomba_Wander), + .flags = ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = PARAGOOMBA_DROPS, .animations = PARAGOOMBA_ANIMS, }; diff --git a/src/world/area_kmr/kmr_10/kmr_10_3_npc.c b/src/world/area_kmr/kmr_10/kmr_10_3_npc.c index 90bf695bd7..fbea56b462 100644 --- a/src/world/area_kmr/kmr_10/kmr_10_3_npc.c +++ b/src/world/area_kmr/kmr_10/kmr_10_3_npc.c @@ -8,14 +8,14 @@ EvtScript N(EVS_NpcInit_Toad) = { EVT_END }; -StaticNpc N(NpcData_Toad) = { +NpcData N(NpcData_Toad) = { .id = NPC_Dummy, - .settings = &N(NpcSettings_Toad_Stationary), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_4000 | ENEMY_FLAG_200000, .init = &N(EVS_NpcInit_Toad), - .drops = TOAD_DROPS, + .settings = &N(NpcSettings_Toad_Stationary), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_4000 | ENEMY_FLAG_200000, + .drops = NO_DROPS, .animations = TOAD_RED_ANIMS, }; diff --git a/src/world/area_kmr/kmr_11/kmr_11.h b/src/world/area_kmr/kmr_11/kmr_11.h index c370ef6927..b5bb273d21 100644 --- a/src/world/area_kmr/kmr_11/kmr_11.h +++ b/src/world/area_kmr/kmr_11/kmr_11.h @@ -55,6 +55,6 @@ extern AnimScript N(AnimScript_Bridge); API_CALLABLE(N(SetCameraVFov)); API_CALLABLE(N(SetupFog)); -ApiStatus InitAnimatedModels(Evt* script, s32 isInitialCall); -ApiStatus SetAnimatedModelRenderMode(Evt* script, s32 isInitialCall); -ApiStatus DeleteAnimatedModel(Evt* script, s32 isInitialCall); +API_CALLABLE(InitAnimatedModels); +API_CALLABLE(SetAnimatedModelRenderMode); +API_CALLABLE(DeleteAnimatedModel); 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 3b7e1b3abd..8f030b608b 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_Guard.inc.c" +#include "world/common/enemy/GoombaBros_Guard.inc.c" EvtScript N(EVS_NpcIdle_GoombaBros_01) = { EVT_RETURN @@ -291,19 +291,11 @@ NpcSettings N(NpcSettings_Kammy) = { .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_800 | ENEMY_FLAG_200000, }; -StaticNpc N(NpcData_Enemies)[] = { +NpcData N(NpcData_Enemies)[] = { { .id = NPC_BlueGoombaBro, - .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_NO_DROPS, - .init = &N(EVS_NpcInit_GoombaBros_01), - .drops = { - .dropFlags = NPC_DROP_FLAG_80, - .heartDrops = NO_DROPS, - .flowerDrops = NO_DROPS, - }, .territory = { .wander = { .isFlying = FALSE, @@ -316,6 +308,10 @@ StaticNpc N(NpcData_Enemies)[] = { .detectSize = { 100 }, } }, + .init = &N(EVS_NpcInit_GoombaBros_01), + .settings = &N(NpcSettings_GoombaBros_Guard), + .flags = ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_40000 | ENEMY_FLAG_200000 | ENEMY_FLAG_NO_DROPS, + .drops = NO_DROPS, .animations = { .idle = ANIM_GoombaBros_Blue_Idle, .walk = ANIM_GoombaBros_Blue_Walk, @@ -337,16 +333,8 @@ StaticNpc N(NpcData_Enemies)[] = { }, { .id = NPC_RedGoombaBro, - .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_NO_DROPS, - .init = &N(EVS_NpcInit_GoombaBros_02), - .drops = { - .dropFlags = NPC_DROP_FLAG_80, - .heartDrops = NO_DROPS, - .flowerDrops = NO_DROPS, - }, .territory = { .wander = { .isFlying = FALSE, @@ -359,6 +347,10 @@ StaticNpc N(NpcData_Enemies)[] = { .detectSize = { 100 }, } }, + .init = &N(EVS_NpcInit_GoombaBros_02), + .settings = &N(NpcSettings_GoombaBros_Guard), + .flags = ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_40000 | ENEMY_FLAG_200000 | ENEMY_FLAG_NO_DROPS, + .drops = NO_DROPS, .animations = { .idle = ANIM_GoombaBros_Red_Idle, .walk = ANIM_GoombaBros_Red_Walk, @@ -380,16 +372,8 @@ StaticNpc N(NpcData_Enemies)[] = { }, { .id = NPC_GoombaKing, - .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_NO_DROPS, - .init = &N(EVS_NpcInit_GoombaKing), - .drops = { - .dropFlags = NPC_DROP_FLAG_80, - .heartDrops = NO_DROPS, - .flowerDrops = NO_DROPS, - }, .territory = { .wander = { .isFlying = FALSE, @@ -402,6 +386,10 @@ StaticNpc N(NpcData_Enemies)[] = { .detectSize = { 100 }, } }, + .init = &N(EVS_NpcInit_GoombaKing), + .settings = &N(NpcSettings_GoombaBros_Guard), + .flags = ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_40000 | ENEMY_FLAG_200000 | ENEMY_FLAG_NO_DROPS, + .drops = NO_DROPS, .animations = { .idle = ANIM_GoombaKing_Idle, .walk = ANIM_GoombaKing_Walk, @@ -423,14 +411,14 @@ StaticNpc N(NpcData_Enemies)[] = { }, }; -StaticNpc N(NpcData_Kammy) = { +NpcData N(NpcData_Kammy) = { .id = NPC_Kammy, - .settings = &N(NpcSettings_Kammy), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 100, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_200000, .initVarCount = 1, .initVar = { .value = 0 }, + .settings = &N(NpcSettings_Kammy), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_200000, .animations = {}, }; diff --git a/src/world/area_kmr/kmr_12/kmr_12_3_npc.c b/src/world/area_kmr/kmr_12/kmr_12_3_npc.c index 8fc4e7e4aa..c18e9e66f4 100644 --- a/src/world/area_kmr/kmr_12/kmr_12_3_npc.c +++ b/src/world/area_kmr/kmr_12/kmr_12_3_npc.c @@ -1,7 +1,7 @@ #include "kmr_12.h" #include "entity.h" -#include "world/common/enemy/complete/Goomba_Wander.inc.c" +#include "world/common/enemy/Goomba_Wander.inc.c" API_CALLABLE(N(GetAmbushEnemy)) { script->varTablePtr[0] = get_enemy_safe(NPC_Goomba_Ambush); @@ -87,14 +87,10 @@ EvtScript N(EVS_NpcInit_Goomba) = { EVT_END }; -StaticNpc N(NpcData_Goomba) = { +NpcData N(NpcData_Goomba) = { .id = NPC_Goomba_Ambush, - .settings = &N(NpcSettings_Goomba_Wander), .pos = { -33.0f, 30.0f, -25.0f }, .yaw = 90, - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, - .init = &N(EVS_NpcInit_Goomba), - .drops = GOOMBA_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -107,6 +103,10 @@ StaticNpc N(NpcData_Goomba) = { .detectSize = { 400, 60 }, } }, + .init = &N(EVS_NpcInit_Goomba), + .settings = &N(NpcSettings_Goomba_Wander), + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = GOOMBA_DROPS, .animations = GOOMBA_ANIMS, }; 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 4502d2b84b..fe1bb9c0d5 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 @@ -613,18 +613,14 @@ EvtScript N(EVS_NpcInit_Luigi_1) = { EVT_END }; -StaticNpc N(NpcData_Luigi_0) = { +NpcData N(NpcData_Luigi_0) = { .id = NPC_Luigi_0, - .settings = &N(NpcSettings_Luigi), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 90, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_Luigi_0), - .drops = { - .dropFlags = NPC_DROP_FLAG_80, - .heartDrops = NO_DROPS, - .flowerDrops = NO_DROPS, - }, + .settings = &N(NpcSettings_Luigi), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = NO_DROPS, .animations = { .idle = ANIM_Luigi_Still, .walk = ANIM_Luigi_Still, @@ -646,18 +642,14 @@ StaticNpc N(NpcData_Luigi_0) = { .tattle = MSG_NpcTattle_Luigi, }; -StaticNpc N(NpcData_Luigi_1) = { +NpcData N(NpcData_Luigi_1) = { .id = NPC_Luigi_1, - .settings = &N(NpcSettings_Luigi), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 90, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_Luigi_1), - .drops = { - .dropFlags = NPC_DROP_FLAG_80, - .heartDrops = NO_DROPS, - .flowerDrops = NO_DROPS, - }, + .settings = &N(NpcSettings_Luigi), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = NO_DROPS, .animations = { .idle = ANIM_Luigi_Still, .walk = ANIM_Luigi_Still, @@ -774,18 +766,14 @@ EvtScript N(EVS_NpcInit_ShyGuy) = { EVT_END }; -StaticNpc N(NpcData_ShyGuy) = { +NpcData N(NpcData_ShyGuy) = { .id = NPC_ShyGuy, - .settings = &N(NpcSettings_ShyGuy), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 270, - .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | 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 | ENEMY_FLAG_10000000, .init = &N(EVS_NpcInit_ShyGuy), - .drops = { - .dropFlags = NPC_DROP_FLAG_80, - .heartDrops = NO_DROPS, - .flowerDrops = NO_DROPS, - }, + .settings = &N(NpcSettings_ShyGuy), + .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | 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 | ENEMY_FLAG_10000000, + .drops = NO_DROPS, .animations = { .idle = ANIM_ShyGuy_Red_Anim01, .walk = ANIM_ShyGuy_Red_Anim02, diff --git a/src/world/area_kmr/kmr_20/kmr_20_8_bed.c b/src/world/area_kmr/kmr_20/kmr_20_8_bed.c index 60f580cdc1..70cf1b056e 100644 --- a/src/world/area_kmr/kmr_20/kmr_20_8_bed.c +++ b/src/world/area_kmr/kmr_20/kmr_20_8_bed.c @@ -143,7 +143,7 @@ EvtScript N(EVS_UseBed) = { EVT_CALL(DisablePlayerPhysics, TRUE) EVT_CALL(N(ToadHouse_DisableStatusMenu)) EVT_IF_NE(LVar4, 0) - EVT_EXEC(N(8024AC8C)) + EVT_EXEC(N(EVS_ToadHouse_Unk2)) EVT_END_IF EVT_CALL(N(ToadHouse_PutPartnerAway), LVarA) EVT_WAIT(20) @@ -161,7 +161,7 @@ EvtScript N(EVS_UseBed) = { EVT_CALL(FullyRestoreHPandFP) EVT_CALL(FullyRestoreSP) EVT_IF_NE(LVar4, 0) - EVT_EXEC(N(8024AC14)) + EVT_EXEC(N(EVS_ToadHouse_Unk1)) EVT_END_IF EVT_CALL(N(ToadHouse_GetPartnerBackOut), LVarA) EVT_WAIT(30) diff --git a/src/world/area_kmr/kmr_20/kmr_20_9_npc_scenes.c b/src/world/area_kmr/kmr_20/kmr_20_9_npc_scenes.c index 87cb64bf59..591e3526fa 100644 --- a/src/world/area_kmr/kmr_20/kmr_20_9_npc_scenes.c +++ b/src/world/area_kmr/kmr_20/kmr_20_9_npc_scenes.c @@ -21,18 +21,14 @@ EvtScript N(EVS_NpcInit_Luigi_Scenes) = { EVT_END }; -StaticNpc N(NpcData_Scenes)[] = { +NpcData N(NpcData_Scenes)[] = { { .id = NPC_Scene_Parakarry, - .settings = &N(NpcSettings_Scenes), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 90, + .settings = &N(NpcSettings_Scenes), .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000, - .drops = { - .dropFlags = NPC_DROP_FLAG_80, - .heartDrops = NO_DROPS, - .flowerDrops = NO_DROPS, - }, + .drops = NO_DROPS, .animations = { .idle = ANIM_WorldParakarry_Idle, .walk = ANIM_WorldParakarry_Walk, @@ -54,16 +50,12 @@ StaticNpc N(NpcData_Scenes)[] = { }, { .id = NPC_Scene_Luigi, - .settings = &N(NpcSettings_Scenes), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 90, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_GRAVITY, .init = &N(EVS_NpcInit_Luigi_Scenes), - .drops = { - .dropFlags = NPC_DROP_FLAG_80, - .heartDrops = NO_DROPS, - .flowerDrops = NO_DROPS, - }, + .settings = &N(NpcSettings_Scenes), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_GRAVITY, + .drops = NO_DROPS, .animations = { .idle = ANIM_Luigi_Still, .walk = ANIM_Luigi_Still, diff --git a/src/world/area_kmr/kmr_21/kmr_21_1_main.c b/src/world/area_kmr/kmr_21/kmr_21_1_main.c index 6eebab7850..f1268990a1 100644 --- a/src/world/area_kmr/kmr_21/kmr_21_1_main.c +++ b/src/world/area_kmr/kmr_21/kmr_21_1_main.c @@ -130,7 +130,7 @@ EvtScript N(EVS_Scene_ShowTitle) = { EvtScript N(EVS_Main) = { EVT_CALL(DisablePlayerInput, TRUE) EVT_CALL(DisablePlayerPhysics, TRUE) - EVT_CALL(SetPlayerPos, -1000, 0, 0) + EVT_CALL(SetPlayerPos, -1000, 0, 0) //@bug? improper dispose location for player EVT_WAIT(1) EVT_CALL(GetCurrentPartnerID, LVar0) EVT_IF_NE(LVar0, PARTNER_NONE) diff --git a/src/world/area_kmr/kmr_22/kmr_22.h b/src/world/area_kmr/kmr_22/kmr_22.h index 6638b3bdd0..f50fefa2fc 100644 --- a/src/world/area_kmr/kmr_22/kmr_22.h +++ b/src/world/area_kmr/kmr_22/kmr_22.h @@ -19,40 +19,40 @@ #include "sprite/npc/WorldBowser.h" enum { - NPC_Eldstar = 0, - NPC_Mamar = 1, - NPC_Skolar = 2, - NPC_Muskular = 3, - NPC_Misstar = 4, - NPC_Klevar = 5, - NPC_Kalmar = 6, - NPC_KoopaBros_01 = 7, - NPC_KoopaBros_02 = 8, - NPC_KoopaBros_03 = 9, - NPC_KoopaBros_04 = 10, - NPC_Tutankoopa = 11, - NPC_ChainChomp_01 = 12, - NPC_ChainChomp_02 = 13, - NPC_ChainChomp_03 = 14, - NPC_ChainChomp_04 = 15, - NPC_ChainChomp_05 = 16, - NPC_Tubba = 17, - NPC_GeneralGuy = 18, - NPC_ShyGuy_01 = 19, - NPC_ShyGuy_02 = 20, - NPC_LavaPiranhaHead = 21, - NPC_LavaBud_01 = 22, - NPC_LavaBud_02 = 23, - NPC_HuffNPuff_Body = 25, - NPC_HuffNPuff_Face = 26, - NPC_HuffNPuff_Arms = 27, - NPC_TuffPuff_01 = 28, - NPC_TuffPuff_02 = 29, - NPC_CrystalKing = 30, - NPC_IceCube = 31, - NPC_IceSphere = 32, - NPC_IceSpike = 33, - NPC_Bowser = 34, + NPC_Eldstar = 0, + NPC_Mamar = 1, + NPC_Skolar = 2, + NPC_Muskular = 3, + NPC_Misstar = 4, + NPC_Klevar = 5, + NPC_Kalmar = 6, + NPC_KoopaBros_01 = 7, + NPC_KoopaBros_02 = 8, + NPC_KoopaBros_03 = 9, + NPC_KoopaBros_04 = 10, + NPC_Tutankoopa = 11, + NPC_ChainChomp_01 = 12, + NPC_ChainChomp_02 = 13, + NPC_ChainChomp_03 = 14, + NPC_ChainChomp_04 = 15, + NPC_ChainChomp_05 = 16, + NPC_Tubba = 17, + NPC_GeneralGuy = 18, + NPC_ShyGuy_01 = 19, + NPC_ShyGuy_02 = 20, + NPC_LavaPiranhaHead = 21, + NPC_LavaBud_01 = 22, + NPC_LavaBud_02 = 23, + NPC_HuffNPuff_Body = 25, + NPC_HuffNPuff_Face = 26, + NPC_HuffNPuff_Arms = 27, + NPC_TuffPuff_01 = 28, + NPC_TuffPuff_02 = 29, + NPC_CrystalKing = 30, + NPC_IceCube = 31, + NPC_IceSphere = 32, + NPC_IceSpike = 33, + NPC_Bowser = 34, }; enum { diff --git a/src/world/area_kmr/kmr_22/kmr_22_2_npc.c b/src/world/area_kmr/kmr_22/kmr_22_2_npc.c index db4e3c2597..967e9bdd44 100644 --- a/src/world/area_kmr/kmr_22/kmr_22_2_npc.c +++ b/src/world/area_kmr/kmr_22/kmr_22_2_npc.c @@ -2,7 +2,7 @@ #include "world/common/npc/StarSpirit.h" #include "world/common/npc/KoopaBros.h" -#include "world/common/enemy/complete/ShyGuy.h" +#include "world/common/enemy/ShyGuy.h" MAP_RODATA_PAD(1,npc); @@ -30,82 +30,78 @@ NpcSettings N(NpcSettings_Unused) = { #include "npc/chapter_7.inc.c" #include "npc/chapter_8.inc.c" -StaticNpc N(NpcData_Chapter1)[] = { +NpcData N(NpcData_Chapter1)[] = { { .id = NPC_Eldstar, - .settings = &N(NpcSettings_Dummy), .pos = { -62.0f, 96.0f, 0.0f }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_Eldstar), - .drops = ELDSTAR_DROPS, + .settings = &N(NpcSettings_Dummy), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = NO_DROPS, .animations = ELDSTAR_ANIMS, }, { .id = NPC_KoopaBros_01, - .settings = &N(NpcSettings_Dummy), .pos = { 10.0f, 0.0f, 0.0f }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_KoopaBros), - .drops = KOOPA_BROS_DROPS, + .settings = &N(NpcSettings_Dummy), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = NO_DROPS, .animations = BLACK_KOOPA_BROS_ANIMS, }, { .id = NPC_KoopaBros_02, - .settings = &N(NpcSettings_Dummy), .pos = { 90.0f, 10.0f, 91.0f }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_KoopaBros), - .drops = KOOPA_BROS_DROPS, + .settings = &N(NpcSettings_Dummy), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = NO_DROPS, .animations = BLACK_KOOPA_BROS_ANIMS, }, { .id = NPC_KoopaBros_03, - .settings = &N(NpcSettings_Dummy), .pos = { 86.0f, 0.0f, -7.0f }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_KoopaBros), - .drops = KOOPA_BROS_DROPS, + .settings = &N(NpcSettings_Dummy), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = NO_DROPS, .animations = BLACK_KOOPA_BROS_ANIMS, }, { .id = NPC_KoopaBros_04, - .settings = &N(NpcSettings_Dummy), .pos = { 54.0f, -2.0f, -47.0f }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_KoopaBros), - .drops = KOOPA_BROS_DROPS, + .settings = &N(NpcSettings_Dummy), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = NO_DROPS, .animations = BLACK_KOOPA_BROS_ANIMS, }, }; -StaticNpc N(NpcData_Chapter2)[] = { +NpcData N(NpcData_Chapter2)[] = { { .id = NPC_Mamar, - .settings = &N(NpcSettings_Dummy), .pos = { -62.0f, 96.0f, 0.0f }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_Mamar), - .drops = MAMAR_DROPS, + .settings = &N(NpcSettings_Dummy), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = NO_DROPS, .animations = MAMAR_ANIMS, }, { .id = NPC_Tutankoopa, - .settings = &N(NpcSettings_Dummy), .pos = { 78.0f, 19.0f, 20.0f }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_Tutankoopa), - .drops = { - .dropFlags = NPC_DROP_FLAG_80, - .heartDrops = NO_DROPS, - .flowerDrops = NO_DROPS, - }, + .settings = &N(NpcSettings_Dummy), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = NO_DROPS, .animations = { .idle = ANIM_Tutankoopa_Anim01, .walk = ANIM_Tutankoopa_Anim01, @@ -127,16 +123,12 @@ StaticNpc N(NpcData_Chapter2)[] = { }, { .id = NPC_ChainChomp_01, - .settings = &N(NpcSettings_Dummy), .pos = { 23.0f, -4.0f, -180.0f }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_ChainChomp), - .drops = { - .dropFlags = NPC_DROP_FLAG_80, - .heartDrops = NO_DROPS, - .flowerDrops = NO_DROPS, - }, + .settings = &N(NpcSettings_Dummy), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = NO_DROPS, .animations = { .idle = ANIM_ChainChomp_Anim00, .walk = ANIM_ChainChomp_Anim00, @@ -158,15 +150,11 @@ StaticNpc N(NpcData_Chapter2)[] = { }, { .id = NPC_ChainChomp_02, - .settings = &N(NpcSettings_Dummy), .pos = { 23.0f, -4.0f, -180.0f }, .yaw = 270, + .settings = &N(NpcSettings_Dummy), .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, - .drops = { - .dropFlags = NPC_DROP_FLAG_80, - .heartDrops = NO_DROPS, - .flowerDrops = NO_DROPS, - }, + .drops = NO_DROPS, .animations = { .idle = ANIM_ChainChomp_Anim00, .walk = ANIM_ChainChomp_Anim00, @@ -188,15 +176,11 @@ StaticNpc N(NpcData_Chapter2)[] = { }, { .id = NPC_ChainChomp_03, - .settings = &N(NpcSettings_Dummy), .pos = { 23.0f, -4.0f, -180.0f }, .yaw = 270, + .settings = &N(NpcSettings_Dummy), .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, - .drops = { - .dropFlags = NPC_DROP_FLAG_80, - .heartDrops = NO_DROPS, - .flowerDrops = NO_DROPS, - }, + .drops = NO_DROPS, .animations = { .idle = ANIM_ChainChomp_Anim00, .walk = ANIM_ChainChomp_Anim00, @@ -218,15 +202,11 @@ StaticNpc N(NpcData_Chapter2)[] = { }, { .id = NPC_ChainChomp_04, - .settings = &N(NpcSettings_Dummy), .pos = { 23.0f, -4.0f, -180.0f }, .yaw = 270, + .settings = &N(NpcSettings_Dummy), .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, - .drops = { - .dropFlags = NPC_DROP_FLAG_80, - .heartDrops = NO_DROPS, - .flowerDrops = NO_DROPS, - }, + .drops = NO_DROPS, .animations = { .idle = ANIM_ChainChomp_Anim00, .walk = ANIM_ChainChomp_Anim00, @@ -248,15 +228,11 @@ StaticNpc N(NpcData_Chapter2)[] = { }, { .id = NPC_ChainChomp_05, - .settings = &N(NpcSettings_Dummy), .pos = { 23.0f, -4.0f, -180.0f }, .yaw = 270, + .settings = &N(NpcSettings_Dummy), .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, - .drops = { - .dropFlags = NPC_DROP_FLAG_80, - .heartDrops = NO_DROPS, - .flowerDrops = NO_DROPS, - }, + .drops = NO_DROPS, .animations = { .idle = ANIM_ChainChomp_Anim00, .walk = ANIM_ChainChomp_Anim00, @@ -278,29 +254,25 @@ StaticNpc N(NpcData_Chapter2)[] = { }, }; -StaticNpc N(NpcData_Chapter3)[] = { +NpcData N(NpcData_Chapter3)[] = { { .id = NPC_Skolar, - .settings = &N(NpcSettings_Dummy), .pos = { -62.0f, 96.0f, 0.0f }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_Skolar), - .drops = SKOLAR_DROPS, + .settings = &N(NpcSettings_Dummy), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = NO_DROPS, .animations = SKOLAR_ANIMS, }, { .id = NPC_Tubba, - .settings = &N(NpcSettings_Dummy), .pos = { 54.0f, -1.0f, 1.0f }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_Tubba), - .drops = { - .dropFlags = NPC_DROP_FLAG_80, - .heartDrops = NO_DROPS, - .flowerDrops = NO_DROPS, - }, + .settings = &N(NpcSettings_Dummy), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = NO_DROPS, .animations = { .idle = ANIM_WorldTubba_Anim06, .walk = ANIM_WorldTubba_Anim09, @@ -322,29 +294,25 @@ StaticNpc N(NpcData_Chapter3)[] = { }, }; -StaticNpc N(NpcData_Chapter4)[] = { +NpcData N(NpcData_Chapter4)[] = { { .id = NPC_Muskular, - .settings = &N(NpcSettings_Dummy), .pos = { -62.0f, 96.0f, 0.0f }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_Muskular), - .drops = MUSKULAR_DROPS, + .settings = &N(NpcSettings_Dummy), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = NO_DROPS, .animations = MUSKULAR_ANIMS, }, { .id = NPC_GeneralGuy, - .settings = &N(NpcSettings_Dummy), .pos = { 97.0f, 0.0f, 0.0f }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_GeneralGuy), - .drops = { - .dropFlags = NPC_DROP_FLAG_80, - .heartDrops = NO_DROPS, - .flowerDrops = NO_DROPS, - }, + .settings = &N(NpcSettings_Dummy), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = NO_DROPS, .animations = { .idle = ANIM_GeneralGuy_Anim02, .walk = ANIM_GeneralGuy_Anim02, @@ -366,95 +334,91 @@ StaticNpc N(NpcData_Chapter4)[] = { }, { .id = NPC_ShyGuy_01, - .settings = &N(NpcSettings_Dummy), .pos = { 17.0f, 0.0f, -14.0f }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_ShyGuy), - .drops = SHY_GUY_NO_DROPS, + .settings = &N(NpcSettings_Dummy), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = NO_DROPS, .animations = RED_SHY_GUY_ANIMS, }, { .id = NPC_ShyGuy_02, - .settings = &N(NpcSettings_Dummy), .pos = { 47.0f, 0.0f, 25.0f }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_ShyGuy), - .drops = SHY_GUY_NO_DROPS, + .settings = &N(NpcSettings_Dummy), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = NO_DROPS, .animations = RED_SHY_GUY_ANIMS, }, }; -StaticNpc N(NpcData_Chapter5)[] = { +NpcData N(NpcData_Chapter5)[] = { { .id = NPC_Misstar, - .settings = &N(NpcSettings_Dummy), .pos = { -62.0f, 96.0f, 0.0f }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_Misstar), - .drops = MISSTAR_DROPS, + .settings = &N(NpcSettings_Dummy), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = NO_DROPS, .animations = MISSTAR_ANIMS, }, { .id = NPC_LavaPiranhaHead, - .settings = &N(NpcSettings_Dummy), .pos = { 0.0f, 0.0f, 0.0f }, .yaw = 270, - .flags = ENEMY_FLAG_4, .init = &N(EVS_NpcInit_LavaPiranhaHead), - .drops = LAVA_PIRANHA_NO_DROPS, + .settings = &N(NpcSettings_Dummy), + .flags = ENEMY_FLAG_4, + .drops = NO_DROPS, .animations = LAVA_PIRANHA_HEAD_ANIMS, .extraAnimations = N(D_80243848_902EB8), }, { .id = NPC_LavaBud_01, - .settings = &N(NpcSettings_Dummy), .pos = { 0.0f, 0.0f, 0.0f }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4, .init = &N(EVS_NpcInit_LavaBud_01), - .drops = LAVA_PIRANHA_NO_DROPS, + .settings = &N(NpcSettings_Dummy), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4, + .drops = NO_DROPS, .animations = LAVA_PIRANHA_BUD_ANIMS, .extraAnimations = N(D_80243854_902EC4), }, { .id = NPC_LavaBud_02, - .settings = &N(NpcSettings_Dummy), .pos = { 0.0f, 0.0f, 0.0f }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4, .init = &N(EVS_NpcInit_LavaBud_01), - .drops = LAVA_PIRANHA_NO_DROPS, + .settings = &N(NpcSettings_Dummy), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4, + .drops = NO_DROPS, .animations = LAVA_PIRANHA_BUD_ANIMS, .extraAnimations = N(D_80243854_902EC4), }, }; -StaticNpc N(NpcData_Chapter6)[] = { +NpcData N(NpcData_Chapter6)[] = { { .id = NPC_Klevar, - .settings = &N(NpcSettings_Dummy), .pos = { -62.0f, 96.0f, 0.0f }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_Klevar), - .drops = KLEVAR_DROPS, + .settings = &N(NpcSettings_Dummy), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = NO_DROPS, .animations = KLEVAR_ANIMS, }, { .id = NPC_HuffNPuff_Body, - .settings = &N(NpcSettings_Dummy), .pos = { 70.0f, 109.0f, 1.0f }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_HuffNPuff_Body), - .drops = { - .dropFlags = NPC_DROP_FLAG_80, - .heartDrops = NO_DROPS, - .flowerDrops = NO_DROPS, - }, + .settings = &N(NpcSettings_Dummy), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = NO_DROPS, .animations = { .idle = ANIM_HuffNPuff_Anim01, .walk = ANIM_HuffNPuff_Anim01, @@ -476,16 +440,12 @@ StaticNpc N(NpcData_Chapter6)[] = { }, { .id = NPC_HuffNPuff_Face, - .settings = &N(NpcSettings_Dummy), .pos = { 70.0f, 109.0f, 1.0f }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_HuffNPuff_Face), - .drops = { - .dropFlags = NPC_DROP_FLAG_80, - .heartDrops = NO_DROPS, - .flowerDrops = NO_DROPS, - }, + .settings = &N(NpcSettings_Dummy), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = NO_DROPS, .animations = { .idle = ANIM_HuffNPuff_Anim01, .walk = ANIM_HuffNPuff_Anim01, @@ -507,16 +467,12 @@ StaticNpc N(NpcData_Chapter6)[] = { }, { .id = NPC_HuffNPuff_Arms, - .settings = &N(NpcSettings_Dummy), .pos = { 70.0f, 109.0f, 1.0f }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_HuffNPuff_Arms), - .drops = { - .dropFlags = NPC_DROP_FLAG_80, - .heartDrops = NO_DROPS, - .flowerDrops = NO_DROPS, - }, + .settings = &N(NpcSettings_Dummy), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = NO_DROPS, .animations = { .idle = ANIM_HuffNPuff_Anim01, .walk = ANIM_HuffNPuff_Anim01, @@ -538,16 +494,12 @@ StaticNpc N(NpcData_Chapter6)[] = { }, { .id = NPC_TuffPuff_01, - .settings = &N(NpcSettings_Dummy), .pos = { 60.0f, 40.0f, -50.0f }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_TuffPuff_01), - .drops = { - .dropFlags = NPC_DROP_FLAG_80, - .heartDrops = NO_DROPS, - .flowerDrops = NO_DROPS, - }, + .settings = &N(NpcSettings_Dummy), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = NO_DROPS, .animations = { .idle = ANIM_TuffPuff_Still, .walk = ANIM_TuffPuff_Still, @@ -569,15 +521,11 @@ StaticNpc N(NpcData_Chapter6)[] = { }, { .id = NPC_TuffPuff_02, - .settings = &N(NpcSettings_Dummy), .pos = { 14.0f, 61.0f, 1.0f }, .yaw = 270, + .settings = &N(NpcSettings_Dummy), .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, - .drops = { - .dropFlags = NPC_DROP_FLAG_80, - .heartDrops = NO_DROPS, - .flowerDrops = NO_DROPS, - }, + .drops = NO_DROPS, .animations = { .idle = ANIM_TuffPuff_Still, .walk = ANIM_TuffPuff_Still, @@ -599,29 +547,25 @@ StaticNpc N(NpcData_Chapter6)[] = { }, }; -StaticNpc N(NpcData_Chapter7)[] = { +NpcData N(NpcData_Chapter7)[] = { { .id = NPC_Kalmar, - .settings = &N(NpcSettings_Dummy), .pos = { -62.0f, 96.0f, 0.0f }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_Kalmar), - .drops = KALMAR_DROPS, + .settings = &N(NpcSettings_Dummy), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = NO_DROPS, .animations = KALMAR_ANIMS, }, { .id = NPC_CrystalKing, - .settings = &N(NpcSettings_Dummy), .pos = { 60.0f, -2.0f, 0.0f }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_CrystalKing), - .drops = { - .dropFlags = NPC_DROP_FLAG_80, - .heartDrops = NO_DROPS, - .flowerDrops = NO_DROPS, - }, + .settings = &N(NpcSettings_Dummy), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = NO_DROPS, .animations = { .idle = ANIM_CrystalKing_Anim09, .walk = ANIM_CrystalKing_Anim09, @@ -643,16 +587,12 @@ StaticNpc N(NpcData_Chapter7)[] = { }, { .id = NPC_IceCube, - .settings = &N(NpcSettings_Dummy), .pos = { 10.0f, 31.0f, -12.0f }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_IceCube), - .drops = { - .dropFlags = NPC_DROP_FLAG_80, - .heartDrops = NO_DROPS, - .flowerDrops = NO_DROPS, - }, + .settings = &N(NpcSettings_Dummy), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = NO_DROPS, .animations = { .idle = ANIM_CrystalKing_Anim09, .walk = ANIM_CrystalKing_Anim09, @@ -674,16 +614,12 @@ StaticNpc N(NpcData_Chapter7)[] = { }, { .id = NPC_IceSphere, - .settings = &N(NpcSettings_Dummy), .pos = { 40.0f, 68.0f, 0.0f }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_IceSphere), - .drops = { - .dropFlags = NPC_DROP_FLAG_80, - .heartDrops = NO_DROPS, - .flowerDrops = NO_DROPS, - }, + .settings = &N(NpcSettings_Dummy), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = NO_DROPS, .animations = { .idle = ANIM_CrystalKing_Anim09, .walk = ANIM_CrystalKing_Anim09, @@ -705,16 +641,12 @@ StaticNpc N(NpcData_Chapter7)[] = { }, { .id = NPC_IceSpike, - .settings = &N(NpcSettings_Dummy), .pos = { 96.0f, 53.0f, 0.0f }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_IceSpike), - .drops = { - .dropFlags = NPC_DROP_FLAG_80, - .heartDrops = NO_DROPS, - .flowerDrops = NO_DROPS, - }, + .settings = &N(NpcSettings_Dummy), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = NO_DROPS, .animations = { .idle = ANIM_CrystalKing_Anim09, .walk = ANIM_CrystalKing_Anim09, @@ -736,18 +668,14 @@ StaticNpc N(NpcData_Chapter7)[] = { }, }; -StaticNpc N(NpcData_Chapter8) = { +NpcData N(NpcData_Chapter8) = { .id = NPC_Bowser, - .settings = &N(NpcSettings_Dummy), .pos = { 58.0f, 0.0f, 20.0f }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_Bowser), - .drops = { - .dropFlags = NPC_DROP_FLAG_80, - .heartDrops = NO_DROPS, - .flowerDrops = NO_DROPS, - }, + .settings = &N(NpcSettings_Dummy), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = NO_DROPS, .animations = { .idle = ANIM_WorldBowser_Idle, .walk = ANIM_WorldBowser_Idle, 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 b630522639..ad69b73f8a 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 @@ -1,5 +1,5 @@ -#include "world/common/enemy/complete/LavaPiranha.h" +#include "world/common/enemy/LavaPiranha.h" #include "world/common/lava_piranha/part1.inc.c" diff --git a/src/world/area_kmr/kmr_23/kmr_23_2_npc.c b/src/world/area_kmr/kmr_23/kmr_23_2_npc.c index 46136be06a..d6b01fe59c 100644 --- a/src/world/area_kmr/kmr_23/kmr_23_2_npc.c +++ b/src/world/area_kmr/kmr_23/kmr_23_2_npc.c @@ -535,163 +535,163 @@ EvtScript N(EVS_NpcInit_Eldstar_02) = { EVT_END }; -StaticNpc N(NpcData_Eldstar)[] = { +NpcData N(NpcData_Eldstar)[] = { { .id = NPC_StarSpirit, - .settings = &N(NpcSettings_StarSpirit), .pos = { -40.0f, 96.0f, 0.0f }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_Eldstar_01), - .drops = ELDSTAR_DROPS, + .settings = &N(NpcSettings_StarSpirit), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = NO_DROPS, .animations = ELDSTAR_ANIMS, }, { .id = NPC_AuxSpirit, - .settings = &N(NpcSettings_StarSpirit), .pos = { -40.0f, 96.0f, 0.0f }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_Eldstar_02), - .drops = ELDSTAR_DROPS, + .settings = &N(NpcSettings_StarSpirit), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = NO_DROPS, .animations = ELDSTAR_ANIMS, }, }; -StaticNpc N(NpcData_Mamar)[] = { +NpcData N(NpcData_Mamar)[] = { { .id = NPC_StarSpirit, - .settings = &N(NpcSettings_StarSpirit), .pos = { -40.0f, 96.0f, 0.0f }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_Eldstar_01), - .drops = MAMAR_DROPS, + .settings = &N(NpcSettings_StarSpirit), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = NO_DROPS, .animations = MAMAR_ANIMS, }, { .id = NPC_AuxSpirit, - .settings = &N(NpcSettings_StarSpirit), .pos = { -40.0f, 96.0f, 0.0f }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_Eldstar_02), - .drops = MAMAR_DROPS, + .settings = &N(NpcSettings_StarSpirit), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = NO_DROPS, .animations = MAMAR_ANIMS, }, }; -StaticNpc N(NpcData_Skolar)[] = { +NpcData N(NpcData_Skolar)[] = { { .id = NPC_StarSpirit, - .settings = &N(NpcSettings_StarSpirit), .pos = { -40.0f, 96.0f, 0.0f }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_Eldstar_01), - .drops = SKOLAR_DROPS, + .settings = &N(NpcSettings_StarSpirit), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = NO_DROPS, .animations = SKOLAR_ANIMS, }, { .id = NPC_AuxSpirit, - .settings = &N(NpcSettings_StarSpirit), .pos = { -40.0f, 96.0f, 0.0f }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_Eldstar_02), - .drops = SKOLAR_DROPS, + .settings = &N(NpcSettings_StarSpirit), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = NO_DROPS, .animations = SKOLAR_ANIMS, }, }; -StaticNpc N(NpcData_Muskular)[] = { +NpcData N(NpcData_Muskular)[] = { { .id = NPC_StarSpirit, - .settings = &N(NpcSettings_StarSpirit), .pos = { -40.0f, 96.0f, 0.0f }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_Eldstar_01), - .drops = MUSKULAR_DROPS, + .settings = &N(NpcSettings_StarSpirit), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = NO_DROPS, .animations = MUSKULAR_ANIMS, }, { .id = NPC_AuxSpirit, - .settings = &N(NpcSettings_StarSpirit), .pos = { -40.0f, 96.0f, 0.0f }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_Eldstar_02), - .drops = MUSKULAR_DROPS, + .settings = &N(NpcSettings_StarSpirit), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = NO_DROPS, .animations = MUSKULAR_ANIMS, }, }; -StaticNpc N(NpcData_Misstar)[] = { +NpcData N(NpcData_Misstar)[] = { { .id = NPC_StarSpirit, - .settings = &N(NpcSettings_StarSpirit), .pos = { -40.0f, 96.0f, 0.0f }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_Eldstar_01), - .drops = MISSTAR_DROPS, + .settings = &N(NpcSettings_StarSpirit), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = NO_DROPS, .animations = MISSTAR_ANIMS, }, { .id = NPC_AuxSpirit, - .settings = &N(NpcSettings_StarSpirit), .pos = { -40.0f, 96.0f, 0.0f }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_Eldstar_02), - .drops = MISSTAR_DROPS, + .settings = &N(NpcSettings_StarSpirit), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = NO_DROPS, .animations = MISSTAR_ANIMS, }, }; -StaticNpc N(NpcData_Klevar)[] = { +NpcData N(NpcData_Klevar)[] = { { .id = NPC_StarSpirit, - .settings = &N(NpcSettings_StarSpirit), .pos = { -40.0f, 96.0f, 0.0f }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_Eldstar_01), - .drops = KLEVAR_DROPS, + .settings = &N(NpcSettings_StarSpirit), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = NO_DROPS, .animations = KLEVAR_ANIMS, }, { .id = NPC_AuxSpirit, - .settings = &N(NpcSettings_StarSpirit), .pos = { -40.0f, 96.0f, 0.0f }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_Eldstar_02), - .drops = KLEVAR_DROPS, + .settings = &N(NpcSettings_StarSpirit), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = NO_DROPS, .animations = KLEVAR_ANIMS, }, }; -StaticNpc N(NpcData_Kalmar)[] = { +NpcData N(NpcData_Kalmar)[] = { { .id = NPC_StarSpirit, - .settings = &N(NpcSettings_StarSpirit), .pos = { -40.0f, 96.0f, 0.0f }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_Eldstar_01), - .drops = KALMAR_DROPS, + .settings = &N(NpcSettings_StarSpirit), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = NO_DROPS, .animations = KALMAR_ANIMS, }, { .id = NPC_AuxSpirit, - .settings = &N(NpcSettings_StarSpirit), .pos = { -40.0f, 96.0f, 0.0f }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_Eldstar_02), - .drops = KALMAR_DROPS, + .settings = &N(NpcSettings_StarSpirit), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = NO_DROPS, .animations = KALMAR_ANIMS, }, }; diff --git a/src/world/area_kmr/kmr_30/kmr_30_1_main.c b/src/world/area_kmr/kmr_30/kmr_30_1_main.c index 9f678b0dd1..f0ab45ed23 100644 --- a/src/world/area_kmr/kmr_30/kmr_30_1_main.c +++ b/src/world/area_kmr/kmr_30/kmr_30_1_main.c @@ -1,7 +1,6 @@ #include "kmr_30.h" #include "world/common/atomic/TexturePan.inc.c" -#include "world/common/atomic/TexturePan.data.inc.c" EvtScript N(EVS_Main) = { EVT_SET(GB_WorldLocation, LOCATION_MARIOS_HOUSE) diff --git a/src/world/area_kmr/kmr_30/kmr_30_2_npc.c b/src/world/area_kmr/kmr_30/kmr_30_2_npc.c index 2eccfd48df..636879566d 100644 --- a/src/world/area_kmr/kmr_30/kmr_30_2_npc.c +++ b/src/world/area_kmr/kmr_30/kmr_30_2_npc.c @@ -6,17 +6,13 @@ NpcSettings N(NpcSettings_ParadePeach) = { .level = 99, }; -StaticNpc N(NpcData_ParadePeach) = { +NpcData N(NpcData_ParadePeach) = { .id = NPC_ParadePeach, - .settings = &N(NpcSettings_ParadePeach), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 270, + .settings = &N(NpcSettings_ParadePeach), .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, - .drops = { - .dropFlags = NPC_DROP_FLAG_80, - .heartDrops = NO_DROPS, - .flowerDrops = NO_DROPS, - }, + .drops = NO_DROPS, .animations = { .idle = ANIM_ParadePeach_IdleRaisedArms, .walk = ANIM_ParadePeach_IdleRaisedArms, diff --git a/src/world/area_kpa/kpa.h b/src/world/area_kpa/kpa.h index 70bf5df5cc..75b1e66f6d 100644 --- a/src/world/area_kpa/kpa.h +++ b/src/world/area_kpa/kpa.h @@ -2,6 +2,7 @@ #define _WORLD_AREA_KPA_KPA_H_ enum { + AB_KPA_Unused_0 = AreaByte(0), AB_KPA17_Toad1_Dialogue = AreaByte(1), AB_KPA17_Toad2_Dialogue = AreaByte(2), AB_KPA17_Toad3_Dialogue = AreaByte(3), @@ -16,6 +17,7 @@ enum { AB_KPA82_QuizRound = AreaByte(12), AB_KPA82_RightAnswers = AreaByte(13), AB_KPA82_WrongAnswers = AreaByte(14), + AB_KPA_Unused_F = AreaByte(15), }; enum { diff --git a/src/world/area_kpa/kpa_01/kpa_01_3_npc.c b/src/world/area_kpa/kpa_01/kpa_01_3_npc.c index f027981072..a6d51b6bbd 100644 --- a/src/world/area_kpa/kpa_01/kpa_01_3_npc.c +++ b/src/world/area_kpa/kpa_01/kpa_01_3_npc.c @@ -1,14 +1,11 @@ #include "kpa_01.h" -#include "world/common/enemy/complete/SpikeTop.inc.c" +#include "world/common/enemy/SpikeTop.inc.c" -StaticNpc N(NpcData_BonyBeetle_01) = { +NpcData N(NpcData_BonyBeetle_01) = { .id = NPC_BonyBeetle_01, - .settings = &N(NpcSettings_BonyBeetle), .pos = { 1740.0f, -215.0f, 60.0f }, .yaw = 270, - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, - .drops = BONY_BEETLE_DROPS, .territory = { .wander = { .isFlying = FALSE, @@ -21,16 +18,16 @@ StaticNpc N(NpcData_BonyBeetle_01) = { .detectSize = { 300 }, } }, + .settings = &N(NpcSettings_BonyBeetle), + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .drops = BONY_BEETLE_DROPS, .animations = BONY_BEETLE_ANIMS, }; -StaticNpc N(NpcData_BonyBeetle_02) = { +NpcData N(NpcData_BonyBeetle_02) = { .id = NPC_BonyBeetle_02, - .settings = &N(NpcSettings_BonyBeetle), .pos = { 243.0f, 5.0f, 230.0f }, .yaw = 90, - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, - .drops = BONY_BEETLE_DROPS, .territory = { .wander = { .isFlying = FALSE, @@ -43,6 +40,9 @@ StaticNpc N(NpcData_BonyBeetle_02) = { .detectSize = { 300 }, } }, + .settings = &N(NpcSettings_BonyBeetle), + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .drops = BONY_BEETLE_DROPS, .animations = BONY_BEETLE_ANIMS, }; diff --git a/src/world/area_kpa/kpa_03/kpa_03_3_npc.c b/src/world/area_kpa/kpa_03/kpa_03_3_npc.c index 8d348bd10b..8993e24ec3 100644 --- a/src/world/area_kpa/kpa_03/kpa_03_3_npc.c +++ b/src/world/area_kpa/kpa_03/kpa_03_3_npc.c @@ -1,25 +1,22 @@ #include "kpa_03.h" -#include "world/common/enemy/complete/Koopatrol_Wander.inc.c" -#include "world/common/enemy/complete/SpikeTop.inc.c" -#include "world/common/enemy/complete/Magikoopa.inc.c" +#include "world/common/enemy/Koopatrol_Wander.inc.c" +#include "world/common/enemy/SpikeTop.inc.c" +#include "world/common/enemy/Magikoopa.inc.c" -s32 N(ExtraAnims_Koopatrol)[] = { +AnimID N(ExtraAnims_Koopatrol)[] = { ANIM_WorldKoopatrol_Anim01, ANIM_WorldKoopatrol_Anim04, ANIM_WorldKoopatrol_Anim06, ANIM_WorldKoopatrol_Anim10, ANIM_WorldKoopatrol_Anim0B, - -1 + ANIM_LIST_END }; -StaticNpc N(NpcData_Koopatrol_01) = { +NpcData N(NpcData_Koopatrol_01) = { .id = NPC_Koopatrol_01, - .settings = &N(NpcSettings_Koopatrol_Wander), .pos = { 1045.0f, -255.0f, -194.0f }, .yaw = 270, - .flags = ENEMY_FLAG_400, - .drops = KOOPATROL_DROPS, .territory = { .wander = { .isFlying = FALSE, @@ -32,18 +29,18 @@ StaticNpc N(NpcData_Koopatrol_01) = { .detectSize = { 300 }, } }, + .settings = &N(NpcSettings_Koopatrol_Wander), + .flags = ENEMY_FLAG_400, + .drops = KOOPATROL_DROPS, .animations = KOOPATROL_ANIMS, .extraAnimations = N(ExtraAnims_Koopatrol), .aiDetectFlags = AI_DETECT_SIGHT | AI_DETECT_SENSITIVE_MOTION, }; -StaticNpc N(NpcData_Koopatrol_02) = { +NpcData N(NpcData_Koopatrol_02) = { .id = NPC_Koopatrol_02, - .settings = &N(NpcSettings_Koopatrol_Wander), .pos = { 950.0f, -265.0f, 0.0f }, .yaw = 90, - .flags = ENEMY_FLAG_400, - .drops = KOOPATROL_DROPS, .territory = { .wander = { .isFlying = FALSE, @@ -56,18 +53,18 @@ StaticNpc N(NpcData_Koopatrol_02) = { .detectSize = { 300 }, } }, + .settings = &N(NpcSettings_Koopatrol_Wander), + .flags = ENEMY_FLAG_400, + .drops = KOOPATROL_DROPS, .animations = KOOPATROL_ANIMS, .extraAnimations = N(ExtraAnims_Koopatrol), .aiDetectFlags = AI_DETECT_SIGHT | AI_DETECT_SENSITIVE_MOTION, }; -StaticNpc N(NpcData_BonyBeetle_01) = { +NpcData N(NpcData_BonyBeetle_01) = { .id = NPC_BonyBeetle_01, - .settings = &N(NpcSettings_BonyBeetle), .pos = { -940.0f, 140.0f, -145.0f }, .yaw = 90, - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, - .drops = BONY_BEETLE_DROPS_ALT, .territory = { .wander = { .isFlying = FALSE, @@ -80,17 +77,17 @@ StaticNpc N(NpcData_BonyBeetle_01) = { .detectSize = { 300 }, } }, + .settings = &N(NpcSettings_BonyBeetle), + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .drops = BONY_BEETLE_DROPS_ALT, .animations = BONY_BEETLE_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT | AI_DETECT_SENSITIVE_MOTION, }; -StaticNpc N(NpcData_BonyBeetle_02) = { +NpcData N(NpcData_BonyBeetle_02) = { .id = NPC_BonyBeetle_02, - .settings = &N(NpcSettings_BonyBeetle), .pos = { 175.0f, -130.0f, 0.0f }, .yaw = 270, - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, - .drops = BONY_BEETLE_DROPS, .territory = { .wander = { .isFlying = FALSE, @@ -103,18 +100,18 @@ StaticNpc N(NpcData_BonyBeetle_02) = { .detectSize = { 300 }, } }, + .settings = &N(NpcSettings_BonyBeetle), + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .drops = BONY_BEETLE_DROPS, .animations = BONY_BEETLE_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT | AI_DETECT_SENSITIVE_MOTION, }; -StaticNpc N(NpcData_Magikoopa_01)[] = { +NpcData N(NpcData_Magikoopa_01)[] = { { .id = NPC_Magikoopa_01, - .settings = &N(NpcSettings_Magikoopa), .pos = { -1000.0f, -160.0f, -150.0f }, .yaw = 90, - .flags = ENEMY_FLAG_400, - .drops = MAGIKOOPA_DROPS, .territory = { .wander = { .isFlying = FALSE, @@ -127,6 +124,9 @@ StaticNpc N(NpcData_Magikoopa_01)[] = { .detectSize = { 200 }, } }, + .settings = &N(NpcSettings_Magikoopa), + .flags = ENEMY_FLAG_400, + .drops = MAGINO_DROPS, .animations = MAGIKOOPA_ANIMS, .extraAnimations = N(ExtraAnims_Magikoopa), .aiDetectFlags = AI_DETECT_SIGHT | AI_DETECT_SENSITIVE_MOTION, diff --git a/src/world/area_kpa/kpa_08/kpa_08_4_npc.c b/src/world/area_kpa/kpa_08/kpa_08_4_npc.c index 22af388c1b..b1e698f0ad 100644 --- a/src/world/area_kpa/kpa_08/kpa_08_4_npc.c +++ b/src/world/area_kpa/kpa_08/kpa_08_4_npc.c @@ -1,15 +1,12 @@ #include "kpa_08.h" -#include "world/common/enemy/complete/Magikoopa.inc.c" +#include "world/common/enemy/Magikoopa.inc.c" -StaticNpc N(NpcData_Magikoopa)[] = { +NpcData N(NpcData_Magikoopa)[] = { { .id = NPC_Magikoopa, - .settings = &N(NpcSettings_Magikoopa), .pos = { -210.0f, 0.0f, 25.0f }, .yaw = 270, - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, - .drops = MAGIKOOPA_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -22,6 +19,9 @@ StaticNpc N(NpcData_Magikoopa)[] = { .detectSize = { 200 }, } }, + .settings = &N(NpcSettings_Magikoopa), + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = MAGINO_DROPS, .animations = MAGIKOOPA_ANIMS, .extraAnimations = N(ExtraAnims_Magikoopa), .aiDetectFlags = AI_DETECT_SIGHT | AI_DETECT_SENSITIVE_MOTION, diff --git a/src/world/area_kpa/kpa_09/kpa_09_4_npc.c b/src/world/area_kpa/kpa_09/kpa_09_4_npc.c index 3f9d34df2f..69bb85cd32 100644 --- a/src/world/area_kpa/kpa_09/kpa_09_4_npc.c +++ b/src/world/area_kpa/kpa_09/kpa_09_4_npc.c @@ -1,15 +1,12 @@ #include "kpa_09.h" -#include "world/common/enemy/complete/DryBones.inc.c" +#include "world/common/enemy/DryBones.inc.c" -StaticNpc N(NpcData_DryBones)[] = { +NpcData N(NpcData_DryBones)[] = { { .id = NPC_DryBones, - .settings = &N(NpcSettings_DryBones), .pos = { -73.0f, 0.0f, 0.0f }, .yaw = 90, - .flags = ENEMY_FLAG_800, - .drops = DRY_BONES_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -22,6 +19,9 @@ StaticNpc N(NpcData_DryBones)[] = { .detectSize = { 200 }, } }, + .settings = &N(NpcSettings_DryBones), + .flags = ENEMY_FLAG_800, + .drops = DRY_BONES_DROPS, .animations = DRY_BONES_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT | AI_DETECT_SENSITIVE_MOTION, }, diff --git a/src/world/area_kpa/kpa_10/kpa_10_2_main.c b/src/world/area_kpa/kpa_10/kpa_10_2_main.c index ebfa15d893..531376e7df 100644 --- a/src/world/area_kpa/kpa_10/kpa_10_2_main.c +++ b/src/world/area_kpa/kpa_10/kpa_10_2_main.c @@ -1,7 +1,6 @@ #include "kpa_10.h" #include "world/common/atomic/TexturePan.inc.c" -#include "world/common/atomic/TexturePan.data.inc.c" EvtScript N(EVS_ExitWalk_kpa_62_1) = EVT_EXIT_WALK(60, kpa_10_ENTRY_0, "kpa_62", kpa_62_ENTRY_1); EvtScript N(EVS_ExitWalk_kpa_12_0) = EVT_EXIT_WALK(60, kpa_10_ENTRY_1, "kpa_12", kpa_12_ENTRY_0); diff --git a/src/world/area_kpa/kpa_10/kpa_10_3_npc.c b/src/world/area_kpa/kpa_10/kpa_10_3_npc.c index 9dfcb92c26..488c9efab6 100644 --- a/src/world/area_kpa/kpa_10/kpa_10_3_npc.c +++ b/src/world/area_kpa/kpa_10/kpa_10_3_npc.c @@ -2,34 +2,34 @@ #include "world/common/npc/Toad_Stationary.inc.c" -StaticNpc N(NpcData_Prisoners)[] = { +NpcData N(NpcData_Prisoners)[] = { { .id = NPC_Toad_01, - .settings = &N(NpcSettings_Toad_Stationary), .pos = { 845.0f, 30.0f, -285.0f }, .yaw = 0, + .settings = &N(NpcSettings_Toad_Stationary), .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, - .drops = TOAD_DROPS, + .drops = NO_DROPS, .animations = TOAD_RED_ANIMS, .tattle = MSG_NpcTattle_KPA_CaptiveToadA, }, { .id = NPC_Toad_02, - .settings = &N(NpcSettings_Toad_Stationary), .pos = { 872.0f, 30.0f, -315.0f }, .yaw = 0, + .settings = &N(NpcSettings_Toad_Stationary), .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, - .drops = TOAD_DROPS, + .drops = NO_DROPS, .animations = TOAD_BLUE_ANIMS, .tattle = MSG_NpcTattle_KPA_CaptiveToadB, }, { .id = NPC_ToadGuard, - .settings = &N(NpcSettings_Toad_Stationary), .pos = { 900.0f, 30.0f, -285.0f }, .yaw = 0, + .settings = &N(NpcSettings_Toad_Stationary), .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, - .drops = TOAD_DROPS, + .drops = NO_DROPS, .animations = TOAD_GUARD_YELLOW_ANIMS, .tattle = MSG_NpcTattle_KPA_CaptiveSoldierA, }, diff --git a/src/world/area_kpa/kpa_102/kpa_102_2_main.c b/src/world/area_kpa/kpa_102/kpa_102_2_main.c index 954a779e42..a869b60ae4 100644 --- a/src/world/area_kpa/kpa_102/kpa_102_2_main.c +++ b/src/world/area_kpa/kpa_102/kpa_102_2_main.c @@ -1,7 +1,6 @@ #include "kpa_102.h" #include "world/common/atomic/TexturePan.inc.c" -#include "world/common/atomic/TexturePan.data.inc.c" EvtScript N(EVS_ExitWalk_kpa_41_2) = EVT_EXIT_WALK(40, kpa_102_ENTRY_0, "kpa_41", kpa_41_ENTRY_2); EvtScript N(EVS_ExitDoors_kpa_53_0) = EVT_EXIT_DOUBLE_DOOR(kpa_102_ENTRY_1, "kpa_53", kpa_53_ENTRY_0, COLLIDER_tte, MODEL_o631, MODEL_o632); diff --git a/src/world/area_kpa/kpa_102/kpa_102_3_npc.c b/src/world/area_kpa/kpa_102/kpa_102_3_npc.c index c9c558c5c9..bb397a3205 100644 --- a/src/world/area_kpa/kpa_102/kpa_102_3_npc.c +++ b/src/world/area_kpa/kpa_102/kpa_102_3_npc.c @@ -1,16 +1,13 @@ #include "kpa_102.h" -#include "world/common/enemy/complete/HammerBros.inc.c" -#include "world/common/enemy/complete/Koopatrol_Wander.inc.c" -#include "world/common/enemy/complete/FlyingMagikoopa.inc.c" +#include "world/common/enemy/HammerBros_Wander.inc.c" +#include "world/common/enemy/Koopatrol_Wander.inc.c" +#include "world/common/enemy/FlyingMagikoopa.inc.c" -StaticNpc N(NpcData_Koopatrol) = { +NpcData N(NpcData_Koopatrol) = { .id = NPC_Koopatrol, - .settings = &N(NpcSettings_Koopatrol_Wander), .pos = { -200.0f, 0.0f, -225.0f }, .yaw = 270, - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, - .drops = KOOPATROL_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -23,17 +20,17 @@ StaticNpc N(NpcData_Koopatrol) = { .detectSize = { 200 }, } }, + .settings = &N(NpcSettings_Koopatrol_Wander), + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = KOOPATROL_DROPS, .animations = KOOPATROL_ANIMS, }; -StaticNpc N(NpcData_FlyingMagikoopa)[] = { +NpcData N(NpcData_FlyingMagikoopa)[] = { { .id = NPC_FlyingMagikoopa, - .settings = &N(NpcSettings_FlyingMagikoopa), .pos = { 125.0f, 50.0f, -225.0f }, .yaw = 90, - .flags = ENEMY_FLAG_800, - .drops = FLYING_MAGIKOOPA_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -46,6 +43,9 @@ StaticNpc N(NpcData_FlyingMagikoopa)[] = { .detectSize = { 200 }, } }, + .settings = &N(NpcSettings_FlyingMagikoopa), + .flags = ENEMY_FLAG_800, + .drops = FLYING_MAGINO_DROPS, .animations = FLYING_MAGIKOOPA_ANIMS, .extraAnimations = N(ExtraAnims_FlyingMagikoopa), .aiDetectFlags = AI_DETECT_SIGHT | AI_DETECT_SENSITIVE_MOTION, @@ -53,14 +53,11 @@ StaticNpc N(NpcData_FlyingMagikoopa)[] = { FLYING_MAGIKOOPA_SPELL_HITBOX(NPC_FlyingMagikoopa + 1), }; -StaticNpc N(NpcData_HammerBros)[] = { +NpcData N(NpcData_HammerBros)[] = { { .id = NPC_HammerBros, - .settings = &N(NpcSettings_HammerBros), .pos = { 450.0f, 0.0f, -225.0f }, .yaw = 270, - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, - .drops = HAMMER_BROS_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -73,6 +70,9 @@ StaticNpc N(NpcData_HammerBros)[] = { .detectSize = { 200 }, } }, + .settings = &N(NpcSettings_HammerBros_Wander), + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = HAMMER_BROS_DROPS, .animations = HAMMER_BROS_ANIMS, }, HAMMER_BROS_HAMMER_HITBOX(NPC_HammerBros + 1), diff --git a/src/world/area_kpa/kpa_11/kpa_11_2_main.c b/src/world/area_kpa/kpa_11/kpa_11_2_main.c index 4f8771ba56..6668dd73c8 100644 --- a/src/world/area_kpa/kpa_11/kpa_11_2_main.c +++ b/src/world/area_kpa/kpa_11/kpa_11_2_main.c @@ -1,7 +1,6 @@ #include "kpa_11.h" #include "world/common/atomic/TexturePan.inc.c" -#include "world/common/atomic/TexturePan.data.inc.c" EvtScript N(EVS_ExitWalk_kpa_62_1) = EVT_EXIT_WALK(60, kpa_11_ENTRY_0, "kpa_62", kpa_62_ENTRY_1); EvtScript N(EVS_ExitWalk_kpa_12_0) = EVT_EXIT_WALK(60, kpa_11_ENTRY_1, "kpa_12", kpa_12_ENTRY_0); diff --git a/src/world/area_kpa/kpa_11/kpa_11_4_npc.c b/src/world/area_kpa/kpa_11/kpa_11_4_npc.c index 211c5d454a..2f890f65d0 100644 --- a/src/world/area_kpa/kpa_11/kpa_11_4_npc.c +++ b/src/world/area_kpa/kpa_11/kpa_11_4_npc.c @@ -1,6 +1,6 @@ #include "kpa_11.h" -#include "world/common/enemy/complete/Koopatrol_Wander.inc.c" +#include "world/common/enemy/Koopatrol_Wander.inc.c" #include "world/common/npc/Toad_Stationary.inc.c" EvtScript N(EVS_NpcDefeat_Koopatrol) = { @@ -33,14 +33,10 @@ EvtScript N(EVS_NpcInit_Koopatrol) = { EVT_END }; -StaticNpc N(NpcData_Koopatrol) = { +NpcData N(NpcData_Koopatrol) = { .id = NPC_Koopatrol, - .settings = &N(NpcSettings_Koopatrol_Wander), .pos = { 550.0f, 30.0f, -145.0f }, .yaw = 270, - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_40000 | ENEMY_FLAG_NO_DROPS, - .init = &N(EVS_NpcInit_Koopatrol), - .drops = NPC_NO_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -53,6 +49,10 @@ StaticNpc N(NpcData_Koopatrol) = { .detectSize = { 200 }, } }, + .init = &N(EVS_NpcInit_Koopatrol), + .settings = &N(NpcSettings_Koopatrol_Wander), + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_40000 | ENEMY_FLAG_NO_DROPS, + .drops = NO_DROPS, .animations = KOOPATROL_ANIMS, }; @@ -61,37 +61,37 @@ EvtScript N(EVS_NpcInit_Prisoner) = { EVT_END }; -StaticNpc N(NpcData_Prisoners)[] = { +NpcData N(NpcData_Prisoners)[] = { { .id = NPC_Toad_01, - .settings = &N(NpcSettings_Toad_Stationary), .pos = { 845.0f, 30.0f, -285.0f }, .yaw = 0, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_Prisoner), - .drops = TOAD_DROPS, + .settings = &N(NpcSettings_Toad_Stationary), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .drops = NO_DROPS, .animations = TOAD_RED_ANIMS, .tattle = MSG_NpcTattle_KPA_CaptiveToadA, }, { .id = NPC_Toad_02, - .settings = &N(NpcSettings_Toad_Stationary), .pos = { 872.0f, 30.0f, -315.0f }, .yaw = 0, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_Prisoner), - .drops = TOAD_DROPS, + .settings = &N(NpcSettings_Toad_Stationary), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .drops = NO_DROPS, .animations = TOAD_BLUE_ANIMS, .tattle = MSG_NpcTattle_KPA_CaptiveToadB, }, { .id = NPC_ToadGuard, - .settings = &N(NpcSettings_Toad_Stationary), .pos = { 900.0f, 30.0f, -285.0f }, .yaw = 0, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_Prisoner), - .drops = TOAD_DROPS, + .settings = &N(NpcSettings_Toad_Stationary), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .drops = NO_DROPS, .animations = TOAD_GUARD_YELLOW_ANIMS, .tattle = MSG_NpcTattle_KPA_CaptiveSoldierA, }, diff --git a/src/world/area_kpa/kpa_111/kpa_111_4_npc.c b/src/world/area_kpa/kpa_111/kpa_111_4_npc.c index ba55953403..0094fe63b1 100644 --- a/src/world/area_kpa/kpa_111/kpa_111_4_npc.c +++ b/src/world/area_kpa/kpa_111/kpa_111_4_npc.c @@ -1,15 +1,12 @@ #include "kpa_111.h" -#include "world/common/enemy/complete/DryBones.inc.c" +#include "world/common/enemy/DryBones.inc.c" -StaticNpc N(NpcData_DryBones)[] = { +NpcData N(NpcData_DryBones)[] = { { .id = NPC_DryBones_01, - .settings = &N(NpcSettings_DryBones), .pos = { -10.0f, 0.0f, 100.0f }, .yaw = 90, - .flags = ENEMY_FLAG_800, - .drops = DRY_BONES_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -22,6 +19,9 @@ StaticNpc N(NpcData_DryBones)[] = { .detectSize = { 180 }, } }, + .settings = &N(NpcSettings_DryBones), + .flags = ENEMY_FLAG_800, + .drops = DRY_BONES_DROPS, .animations = DRY_BONES_ANIMS, }, DRY_BONES_BONE_HITBOX(NPC_DryBones_01 + 1), @@ -29,14 +29,11 @@ StaticNpc N(NpcData_DryBones)[] = { DRY_BONES_BONE_HITBOX(NPC_DryBones_01 + 3), }; -StaticNpc N(NpcData_DryBones_02)[] = { +NpcData N(NpcData_DryBones_02)[] = { { .id = NPC_DryBones_02, - .settings = &N(NpcSettings_DryBones), .pos = { 200.0f, 0.0f, 140.0f }, .yaw = 270, - .flags = ENEMY_FLAG_800, - .drops = DRY_BONES_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -49,6 +46,9 @@ StaticNpc N(NpcData_DryBones_02)[] = { .detectSize = { 180 }, } }, + .settings = &N(NpcSettings_DryBones), + .flags = ENEMY_FLAG_800, + .drops = DRY_BONES_DROPS, .animations = DRY_BONES_ANIMS, }, DRY_BONES_BONE_HITBOX(NPC_DryBones_02 + 1), diff --git a/src/world/area_kpa/kpa_113/kpa_113_5_npc.c b/src/world/area_kpa/kpa_113/kpa_113_5_npc.c index e6f4fe3a94..e20c98722d 100644 --- a/src/world/area_kpa/kpa_113/kpa_113_5_npc.c +++ b/src/world/area_kpa/kpa_113/kpa_113_5_npc.c @@ -1,14 +1,11 @@ #include "kpa_113.h" -#include "world/common/enemy/complete/SpikeTop.inc.c" +#include "world/common/enemy/SpikeTop.inc.c" -StaticNpc N(NpcData_BonyBeetle) = { +NpcData N(NpcData_BonyBeetle) = { .id = NPC_BonyBeetle, - .settings = &N(NpcSettings_BonyBeetle), .pos = { 100.0f, 0.0f, 83.0f }, .yaw = 90, - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, - .drops = BONY_BEETLE_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -21,6 +18,9 @@ StaticNpc N(NpcData_BonyBeetle) = { .detectSize = { 260, 100 }, } }, + .settings = &N(NpcSettings_BonyBeetle), + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .drops = BONY_BEETLE_DROPS, .animations = BONY_BEETLE_ANIMS, }; diff --git a/src/world/area_kpa/kpa_115/kpa_115_4_npc.c b/src/world/area_kpa/kpa_115/kpa_115_4_npc.c index 3e9eafe77f..c759d078b0 100644 --- a/src/world/area_kpa/kpa_115/kpa_115_4_npc.c +++ b/src/world/area_kpa/kpa_115/kpa_115_4_npc.c @@ -1,15 +1,12 @@ #include "kpa_115.h" -#include "world/common/enemy/complete/HammerBros.inc.c" +#include "world/common/enemy/HammerBros_Wander.inc.c" -StaticNpc N(NpcData_HammerBros)[] = { +NpcData N(NpcData_HammerBros)[] = { { .id = NPC_HammerBros, - .settings = &N(NpcSettings_HammerBros), .pos = { 100.0f, 0.0f, 120.0f }, .yaw = 90, - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, - .drops = HAMMER_BROS_DROPS, .territory = { .wander = { .isFlying = FALSE, @@ -22,6 +19,9 @@ StaticNpc N(NpcData_HammerBros)[] = { .detectSize = { 200 }, } }, + .settings = &N(NpcSettings_HammerBros_Wander), + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = HAMMER_BROS_DROPS, .animations = HAMMER_BROS_ANIMS, }, HAMMER_BROS_HAMMER_HITBOX(NPC_HammerBros + 1), diff --git a/src/world/area_kpa/kpa_12/kpa_12_2_main.c b/src/world/area_kpa/kpa_12/kpa_12_2_main.c index 3484a22fc6..fc9af6be2d 100644 --- a/src/world/area_kpa/kpa_12/kpa_12_2_main.c +++ b/src/world/area_kpa/kpa_12/kpa_12_2_main.c @@ -1,7 +1,6 @@ #include "kpa_12.h" #include "world/common/atomic/TexturePan.inc.c" -#include "world/common/atomic/TexturePan.data.inc.c" EvtScript N(EVS_ExitWalk_kpa_1X_Upper) = { EVT_SET_GROUP(EVT_GROUP_1B) diff --git a/src/world/area_kpa/kpa_13/kpa_13_2_main.c b/src/world/area_kpa/kpa_13/kpa_13_2_main.c index 620392eb16..3fbfed5398 100644 --- a/src/world/area_kpa/kpa_13/kpa_13_2_main.c +++ b/src/world/area_kpa/kpa_13/kpa_13_2_main.c @@ -1,7 +1,6 @@ #include "kpa_13.h" #include "world/common/atomic/TexturePan.inc.c" -#include "world/common/atomic/TexturePan.data.inc.c" EvtScript N(EVS_ExitWalk_kpa_12_1) = EVT_EXIT_WALK(60, kpa_13_ENTRY_0, "kpa_12", kpa_12_ENTRY_1); EvtScript N(EVS_ExitWalk_kpa_15_0) = EVT_EXIT_WALK(60, kpa_13_ENTRY_2, "kpa_15", kpa_15_ENTRY_0); 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 03872e2a72..a379fc17cd 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 @@ -1,6 +1,6 @@ #include "kpa_130.h" -#include "world/common/enemy/complete/BombshellBill.h" +#include "world/common/enemy/BombshellBill.h" #include "world/common/enemy/ai/BulletBillAI.inc.c" @@ -151,15 +151,11 @@ EvtScript N(EVS_NpcInit_BillBlaster_03) = { EVT_END }; -StaticNpc N(NpcData_BillBlaster_01)[] = { +NpcData N(NpcData_BillBlaster_01)[] = { { .id = NPC_BillBlaster_01, - .settings = &N(NpcSettings_BillBlaster), .pos = { -288.0f, 120.0f, 120.0f }, .yaw = 270, - .flags = ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, - .init = &N(EVS_NpcInit_BillBlaster), - .drops = BOMBSHELL_BLASTER_NO_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -172,16 +168,16 @@ StaticNpc N(NpcData_BillBlaster_01)[] = { .detectSize = { 0 }, } }, + .init = &N(EVS_NpcInit_BillBlaster), + .settings = &N(NpcSettings_BillBlaster), + .flags = ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .drops = NO_DROPS, .animations = BOMBSHELL_BLASTER_ANIMS, }, { .id = NPC_BillBlaster_02, - .settings = &N(NpcSettings_BillBlaster), .pos = { -288.0f, 120.0f, 78.0f }, .yaw = 270, - .flags = ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, - .init = &N(EVS_NpcInit_BillBlaster), - .drops = BOMBSHELL_BLASTER_NO_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -194,19 +190,19 @@ StaticNpc N(NpcData_BillBlaster_01)[] = { .detectSize = { 0 }, } }, + .init = &N(EVS_NpcInit_BillBlaster), + .settings = &N(NpcSettings_BillBlaster), + .flags = ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .drops = NO_DROPS, .animations = BOMBSHELL_BLASTER_ANIMS, }, }; -StaticNpc N(NpcData_BillBlaster_03)[] = { +NpcData N(NpcData_BillBlaster_03)[] = { { .id = NPC_BillBlaster_03, - .settings = &N(NpcSettings_BillBlaster), .pos = { -748.0f, 300.0f, -22.0f }, .yaw = 90, - .flags = ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, - .init = &N(EVS_NpcInit_BillBlaster_03), - .drops = BOMBSHELL_BLASTER_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -219,16 +215,16 @@ StaticNpc N(NpcData_BillBlaster_03)[] = { .detectSize = { 0 }, } }, + .init = &N(EVS_NpcInit_BillBlaster_03), + .settings = &N(NpcSettings_BillBlaster), + .flags = ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .drops = BOMBSHELL_BLASTER_DROPS, .animations = BOMBSHELL_BLASTER_ANIMS, }, { .id = NPC_BillBlaster_04, - .settings = &N(NpcSettings_BillBlaster), .pos = { -748.0f, 300.0f, 22.0f }, .yaw = 90, - .flags = ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, - .init = &N(EVS_NpcInit_BillBlaster_03), - .drops = BOMBSHELL_BLASTER_NO_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -241,19 +237,19 @@ StaticNpc N(NpcData_BillBlaster_03)[] = { .detectSize = { 0 }, } }, + .init = &N(EVS_NpcInit_BillBlaster_03), + .settings = &N(NpcSettings_BillBlaster), + .flags = ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .drops = NO_DROPS, .animations = BOMBSHELL_BLASTER_ANIMS, }, }; -StaticNpc N(NpcData_BillBlaster_05)[] = { +NpcData N(NpcData_BillBlaster_05)[] = { { .id = NPC_BillBlaster_05, - .settings = &N(NpcSettings_BillBlaster), .pos = { 30.0f, 480.0f, -122.0f }, .yaw = 270, - .flags = ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, - .init = &N(EVS_NpcInit_BillBlaster), - .drops = BOMBSHELL_BLASTER_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -266,16 +262,16 @@ StaticNpc N(NpcData_BillBlaster_05)[] = { .detectSize = { 0 }, } }, + .init = &N(EVS_NpcInit_BillBlaster), + .settings = &N(NpcSettings_BillBlaster), + .flags = ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .drops = BOMBSHELL_BLASTER_DROPS, .animations = BOMBSHELL_BLASTER_ANIMS, }, { .id = NPC_BillBlaster_06, - .settings = &N(NpcSettings_BillBlaster), .pos = { 30.0f, 480.0f, -78.0f }, .yaw = 270, - .flags = ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, - .init = &N(EVS_NpcInit_BillBlaster), - .drops = BOMBSHELL_BLASTER_NO_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -288,19 +284,19 @@ StaticNpc N(NpcData_BillBlaster_05)[] = { .detectSize = { 0 }, } }, + .init = &N(EVS_NpcInit_BillBlaster), + .settings = &N(NpcSettings_BillBlaster), + .flags = ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .drops = NO_DROPS, .animations = BOMBSHELL_BLASTER_ANIMS, }, }; -StaticNpc N(NpcData_BillBlaster_07)[] = { +NpcData N(NpcData_BillBlaster_07)[] = { { .id = NPC_BillBlaster_07, - .settings = &N(NpcSettings_BillBlaster), .pos = { 820.0f, 600.0f, -122.0f }, .yaw = 270, - .flags = ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, - .init = &N(EVS_NpcInit_BillBlaster), - .drops = BOMBSHELL_BLASTER_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -313,16 +309,16 @@ StaticNpc N(NpcData_BillBlaster_07)[] = { .detectSize = { 0 }, } }, + .init = &N(EVS_NpcInit_BillBlaster), + .settings = &N(NpcSettings_BillBlaster), + .flags = ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .drops = BOMBSHELL_BLASTER_DROPS, .animations = BOMBSHELL_BLASTER_ANIMS, }, { .id = NPC_BillBlaster_08, - .settings = &N(NpcSettings_BillBlaster), .pos = { 820.0f, 600.0f, -78.0f }, .yaw = 270, - .flags = ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, - .init = &N(EVS_NpcInit_BillBlaster), - .drops = BOMBSHELL_BLASTER_NO_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -335,32 +331,36 @@ StaticNpc N(NpcData_BillBlaster_07)[] = { .detectSize = { 0 }, } }, + .init = &N(EVS_NpcInit_BillBlaster), + .settings = &N(NpcSettings_BillBlaster), + .flags = ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .drops = NO_DROPS, .animations = BOMBSHELL_BLASTER_ANIMS, }, }; -StaticNpc N(NpcData_BulletBill_01) = BOMBSHELL_BILL_NPC(NPC_BulletBill_01); -StaticNpc N(NpcData_BulletBill_02) = BOMBSHELL_BILL_NPC(NPC_BulletBill_02); -StaticNpc N(NpcData_BulletBill_03) = BOMBSHELL_BILL_NPC(NPC_BulletBill_03); -StaticNpc N(NpcData_BulletBill_04) = BOMBSHELL_BILL_NPC(NPC_BulletBill_04); -StaticNpc N(NpcData_BulletBill_05) = BOMBSHELL_BILL_NPC(NPC_BulletBill_05); -StaticNpc N(NpcData_BulletBill_06) = BOMBSHELL_BILL_NPC(NPC_BulletBill_06); -StaticNpc N(NpcData_BulletBill_07) = BOMBSHELL_BILL_NPC(NPC_BulletBill_07); -StaticNpc N(NpcData_BulletBill_08) = BOMBSHELL_BILL_NPC(NPC_BulletBill_08); -StaticNpc N(NpcData_BulletBill_09) = BOMBSHELL_BILL_NPC(NPC_BulletBill_09); -StaticNpc N(NpcData_BulletBill_10) = BOMBSHELL_BILL_NPC(NPC_BulletBill_10); +NpcData N(NpcData_BulletBill_01) = BOMBSHELL_BILL_NPC(NPC_BulletBill_01); +NpcData N(NpcData_BulletBill_02) = BOMBSHELL_BILL_NPC(NPC_BulletBill_02); +NpcData N(NpcData_BulletBill_03) = BOMBSHELL_BILL_NPC(NPC_BulletBill_03); +NpcData N(NpcData_BulletBill_04) = BOMBSHELL_BILL_NPC(NPC_BulletBill_04); +NpcData N(NpcData_BulletBill_05) = BOMBSHELL_BILL_NPC(NPC_BulletBill_05); +NpcData N(NpcData_BulletBill_06) = BOMBSHELL_BILL_NPC(NPC_BulletBill_06); +NpcData N(NpcData_BulletBill_07) = BOMBSHELL_BILL_NPC(NPC_BulletBill_07); +NpcData N(NpcData_BulletBill_08) = BOMBSHELL_BILL_NPC(NPC_BulletBill_08); +NpcData N(NpcData_BulletBill_09) = BOMBSHELL_BILL_NPC(NPC_BulletBill_09); +NpcData N(NpcData_BulletBill_10) = BOMBSHELL_BILL_NPC(NPC_BulletBill_10); // the following NPCs are unused -StaticNpc N(NpcData_BulletBill_11) = BOMBSHELL_BILL_NPC(NPC_BulletBill_11); -StaticNpc N(NpcData_BulletBill_12) = BOMBSHELL_BILL_NPC(NPC_BulletBill_12); -StaticNpc N(NpcData_BulletBill_13) = BOMBSHELL_BILL_NPC(NPC_BulletBill_13); -StaticNpc N(NpcData_BulletBill_14) = BOMBSHELL_BILL_NPC(NPC_BulletBill_14); -StaticNpc N(NpcData_BulletBill_15) = BOMBSHELL_BILL_NPC(NPC_BulletBill_15); -StaticNpc N(NpcData_BulletBill_16) = BOMBSHELL_BILL_NPC(NPC_BulletBill_16); -StaticNpc N(NpcData_BulletBill_17) = BOMBSHELL_BILL_NPC(NPC_BulletBill_17); -StaticNpc N(NpcData_BulletBill_18) = BOMBSHELL_BILL_NPC(NPC_BulletBill_18); -StaticNpc N(NpcData_BulletBill_19) = BOMBSHELL_BILL_NPC(NPC_BulletBill_19); -StaticNpc N(NpcData_BulletBill_20) = BOMBSHELL_BILL_NPC(NPC_BulletBill_20); +NpcData N(NpcData_BulletBill_11) = BOMBSHELL_BILL_NPC(NPC_BulletBill_11); +NpcData N(NpcData_BulletBill_12) = BOMBSHELL_BILL_NPC(NPC_BulletBill_12); +NpcData N(NpcData_BulletBill_13) = BOMBSHELL_BILL_NPC(NPC_BulletBill_13); +NpcData N(NpcData_BulletBill_14) = BOMBSHELL_BILL_NPC(NPC_BulletBill_14); +NpcData N(NpcData_BulletBill_15) = BOMBSHELL_BILL_NPC(NPC_BulletBill_15); +NpcData N(NpcData_BulletBill_16) = BOMBSHELL_BILL_NPC(NPC_BulletBill_16); +NpcData N(NpcData_BulletBill_17) = BOMBSHELL_BILL_NPC(NPC_BulletBill_17); +NpcData N(NpcData_BulletBill_18) = BOMBSHELL_BILL_NPC(NPC_BulletBill_18); +NpcData N(NpcData_BulletBill_19) = BOMBSHELL_BILL_NPC(NPC_BulletBill_19); +NpcData N(NpcData_BulletBill_20) = BOMBSHELL_BILL_NPC(NPC_BulletBill_20); NpcGroupList N(DefaultNPCs) = { NPC_GROUP(N(NpcData_BillBlaster_01), BTL_KPA4_FORMATION_02, BTL_KPA4_STAGE_04), diff --git a/src/world/area_kpa/kpa_133/kpa_133_2_main.c b/src/world/area_kpa/kpa_133/kpa_133_2_main.c index 201870018e..8cc3adb3e8 100644 --- a/src/world/area_kpa/kpa_133/kpa_133_2_main.c +++ b/src/world/area_kpa/kpa_133/kpa_133_2_main.c @@ -2,7 +2,6 @@ #include "effects.h" #include "world/common/atomic/TexturePan.inc.c" -#include "world/common/atomic/TexturePan.data.inc.c" EvtScript N(EVS_ExitDoors_kpa_51_1) = EVT_EXIT_DOUBLE_DOOR(kpa_133_ENTRY_0, "kpa_51", kpa_51_ENTRY_1, COLLIDER_ttw, MODEL_o486, MODEL_o485); EvtScript N(EVS_ExitWalk_kpa_134_0) = EVT_EXIT_WALK(40, kpa_133_ENTRY_1, "kpa_134", kpa_134_ENTRY_0); diff --git a/src/world/area_kpa/kpa_133/kpa_133_4_npc.c b/src/world/area_kpa/kpa_133/kpa_133_4_npc.c index dca3b3158a..0e650c51d9 100644 --- a/src/world/area_kpa/kpa_133/kpa_133_4_npc.c +++ b/src/world/area_kpa/kpa_133/kpa_133_4_npc.c @@ -8,14 +8,14 @@ EvtScript N(EVS_NpcInit_Toad) = { EVT_END }; -StaticNpc N(NpcData_Dummy) = { +NpcData N(NpcData_Dummy) = { .id = NPC_Dummy, - .settings = &N(NpcSettings_Toad_Stationary), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_4000 | ENEMY_FLAG_200000, .init = &N(EVS_NpcInit_Toad), - .drops = TOAD_DROPS, + .settings = &N(NpcSettings_Toad_Stationary), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_4000 | ENEMY_FLAG_200000, + .drops = NO_DROPS, .animations = TOAD_RED_ANIMS, }; diff --git a/src/world/area_kpa/kpa_134/kpa_134_2_main.c b/src/world/area_kpa/kpa_134/kpa_134_2_main.c index 3b51c096b0..c0a2f0c31d 100644 --- a/src/world/area_kpa/kpa_134/kpa_134_2_main.c +++ b/src/world/area_kpa/kpa_134/kpa_134_2_main.c @@ -2,7 +2,6 @@ #include "effects.h" #include "world/common/atomic/TexturePan.inc.c" -#include "world/common/atomic/TexturePan.data.inc.c" EvtScript N(EVS_ExitWalk_kpa_133_1) = EVT_EXIT_WALK(40, kpa_134_ENTRY_0, "kpa_133", kpa_133_ENTRY_1); EvtScript N(EVS_ExitDoors_kpa_130_0) = EVT_EXIT_DOUBLE_DOOR(kpa_134_ENTRY_1, "kpa_130", kpa_130_ENTRY_0, COLLIDER_nno, MODEL_o408, MODEL_o409); diff --git a/src/world/area_kpa/kpa_134/kpa_134_4_npc.c b/src/world/area_kpa/kpa_134/kpa_134_4_npc.c index fe185a350b..5355941715 100644 --- a/src/world/area_kpa/kpa_134/kpa_134_4_npc.c +++ b/src/world/area_kpa/kpa_134/kpa_134_4_npc.c @@ -8,14 +8,14 @@ EvtScript N(EVS_NpcInit_Toad) = { EVT_END }; -StaticNpc N(NpcData_Dummy) = { +NpcData N(NpcData_Dummy) = { .id = NPC_Dummy, - .settings = &N(NpcSettings_Toad_Stationary), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_4000 | ENEMY_FLAG_200000, .init = &N(EVS_NpcInit_Toad), - .drops = TOAD_DROPS, + .settings = &N(NpcSettings_Toad_Stationary), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_4000 | ENEMY_FLAG_200000, + .drops = NO_DROPS, .animations = TOAD_RED_ANIMS, }; diff --git a/src/world/area_kpa/kpa_14/kpa_14_2_main.c b/src/world/area_kpa/kpa_14/kpa_14_2_main.c index 2b0345de3c..81597d5970 100644 --- a/src/world/area_kpa/kpa_14/kpa_14_2_main.c +++ b/src/world/area_kpa/kpa_14/kpa_14_2_main.c @@ -2,7 +2,6 @@ #include "effects.h" #include "world/common/atomic/TexturePan.inc.c" -#include "world/common/atomic/TexturePan.data.inc.c" API_CALLABLE(N(GetActingPartner)) { if (gPartnerActionStatus.partnerActionState != 0) { diff --git a/src/world/area_kpa/kpa_15/kpa_15_2_main.c b/src/world/area_kpa/kpa_15/kpa_15_2_main.c index 831a630027..45b0338d1b 100644 --- a/src/world/area_kpa/kpa_15/kpa_15_2_main.c +++ b/src/world/area_kpa/kpa_15/kpa_15_2_main.c @@ -1,7 +1,6 @@ #include "kpa_15.h" #include "world/common/atomic/TexturePan.inc.c" -#include "world/common/atomic/TexturePan.data.inc.c" EvtScript N(D_8024074C_A59ADC) = EVT_EXIT_WALK(40, kpa_15_ENTRY_0, "kpa_13", kpa_13_ENTRY_2); diff --git a/src/world/area_kpa/kpa_16/kpa_16_2_main.c b/src/world/area_kpa/kpa_16/kpa_16_2_main.c index 0a826c1e80..6d329aabea 100644 --- a/src/world/area_kpa/kpa_16/kpa_16_2_main.c +++ b/src/world/area_kpa/kpa_16/kpa_16_2_main.c @@ -1,7 +1,6 @@ #include "kpa_16.h" #include "world/common/atomic/TexturePan.inc.c" -#include "world/common/atomic/TexturePan.data.inc.c" EvtScript N(EVS_ExitWalk_kpa_14_2) = EVT_EXIT_WALK(40, kpa_16_ENTRY_0, "kpa_14", kpa_14_ENTRY_2); diff --git a/src/world/area_kpa/kpa_16/kpa_16_4_npc.c b/src/world/area_kpa/kpa_16/kpa_16_4_npc.c index 1d3967db95..aa79b3f781 100644 --- a/src/world/area_kpa/kpa_16/kpa_16_4_npc.c +++ b/src/world/area_kpa/kpa_16/kpa_16_4_npc.c @@ -1,7 +1,7 @@ #include "kpa_16.h" -#include "world/common/enemy/complete/Koopatrol.h" -#include "world/common/enemy/complete/Magikoopa.h" +#include "world/common/enemy/Koopatrol.h" +#include "world/common/enemy/Magikoopa.h" API_CALLABLE(N(SetScreenBlackFadeAmount)) { Bytecode* args = script->ptrReadPos; @@ -286,42 +286,42 @@ EvtScript N(EVS_NpcInit_Guards) = { EVT_END }; -StaticNpc N(NpcData_Guards)[] = { +NpcData N(NpcData_Guards)[] = { { .id = NPC_Koopatrol_01, - .settings = &N(NpcSettings_Dummy), .pos = { 585.0f, 230.0f, -145.0f }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_40000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS, .init = &N(EVS_NpcInit_Guards), + .settings = &N(NpcSettings_Dummy), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_40000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS, .drops = KOOPATROL_DROPS, .animations = KOOPATROL_ANIMS, }, { .id = NPC_Koopatrol_02, - .settings = &N(NpcSettings_Dummy), .pos = { 525.0f, 230.0f, -165.0f }, .yaw = 270, + .settings = &N(NpcSettings_Dummy), .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_40000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS, .drops = KOOPATROL_DROPS, .animations = KOOPATROL_ANIMS, }, { .id = NPC_Koopatrol_03, - .settings = &N(NpcSettings_Dummy), .pos = { 550.0f, 230.0f, -120.0f }, .yaw = 270, + .settings = &N(NpcSettings_Dummy), .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_40000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS, .drops = KOOPATROL_DROPS, .animations = KOOPATROL_ANIMS, }, { .id = NPC_Magikoopa, - .settings = &N(NpcSettings_Dummy), .pos = { 505.0f, 230.0f, -120.0f }, .yaw = 270, + .settings = &N(NpcSettings_Dummy), .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS, - .drops = MAGIKOOPA_DROPS, + .drops = MAGINO_DROPS, .animations = MAGIKOOPA_ANIMS, }, }; diff --git a/src/world/area_kpa/kpa_17/kpa_17_4_npc.c b/src/world/area_kpa/kpa_17/kpa_17_4_npc.c index d7d9aecb1f..132647bf57 100644 --- a/src/world/area_kpa/kpa_17/kpa_17_4_npc.c +++ b/src/world/area_kpa/kpa_17/kpa_17_4_npc.c @@ -187,48 +187,48 @@ EvtScript N(EVS_NpcInit_ToadMinister) = { EVT_END }; -StaticNpc N(NpcData_Prisoners)[] = { +NpcData N(NpcData_Prisoners)[] = { { .id = NPC_Toad_01, - .settings = &N(NpcSettings_Toad_Stationary), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_Toad_01), - .drops = NPC_NO_DROPS, + .settings = &N(NpcSettings_Toad_Stationary), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = NO_DROPS, .animations = TOAD_RED_ANIMS, .tattle = MSG_NpcTattle_KPA_CaptiveToadA, }, { .id = NPC_Toad_02, - .settings = &N(NpcSettings_Toad_Stationary), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_Toad_02), - .drops = NPC_NO_DROPS, + .settings = &N(NpcSettings_Toad_Stationary), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = NO_DROPS, .animations = TOAD_BLUE_ANIMS, .tattle = MSG_NpcTattle_KPA_CaptiveToadB, }, { .id = NPC_ToadGuard, - .settings = &N(NpcSettings_Toad_Stationary), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_ToadGuard), - .drops = NPC_NO_DROPS, + .settings = &N(NpcSettings_Toad_Stationary), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = NO_DROPS, .animations = TOAD_GUARD_YELLOW_ANIMS, .tattle = MSG_NpcTattle_KPA_CaptiveSoldierA, }, { .id = NPC_ToadMinister, - .settings = &N(NpcSettings_Toad_Stationary), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_ToadMinister), - .drops = NPC_NO_DROPS, + .settings = &N(NpcSettings_Toad_Stationary), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = NO_DROPS, .animations = { .idle = ANIM_ToadMinister_Idle, .walk = ANIM_ToadMinister_Idle, diff --git a/src/world/area_kpa/kpa_32/kpa_32_3_main.c b/src/world/area_kpa/kpa_32/kpa_32_3_main.c index fc474eade4..afe65b6e96 100644 --- a/src/world/area_kpa/kpa_32/kpa_32_3_main.c +++ b/src/world/area_kpa/kpa_32/kpa_32_3_main.c @@ -1,7 +1,6 @@ #include "kpa_32.h" #include "world/common/atomic/TexturePan.inc.c" -#include "world/common/atomic/TexturePan.data.inc.c" EvtScript N(EVS_ExitDoors_kpa_81_2) = EVT_EXIT_DOUBLE_DOOR(kpa_32_ENTRY_0, "kpa_81", kpa_81_ENTRY_2, COLLIDER_ttw, MODEL_b4_doa, MODEL_o1256); EvtScript N(EVS_ExitWalk_kpa_90_0) = EVT_EXIT_WALK(60, kpa_32_ENTRY_1, "kpa_90", kpa_90_ENTRY_0); diff --git a/src/world/area_kpa/kpa_33/kpa_33_3_main.c b/src/world/area_kpa/kpa_33/kpa_33_3_main.c index daa4cbb083..bbf4619f80 100644 --- a/src/world/area_kpa/kpa_33/kpa_33_3_main.c +++ b/src/world/area_kpa/kpa_33/kpa_33_3_main.c @@ -2,7 +2,6 @@ #include "kpa_33.h" #include "world/common/atomic/TexturePan.inc.c" -#include "world/common/atomic/TexturePan.data.inc.c" EvtScript N(EVS_ExitWalk_kpa_94_1) = EVT_EXIT_WALK(60, kpa_33_ENTRY_0, "kpa_94", kpa_94_ENTRY_1); EvtScript N(EVS_ExitDoors_kpa_61_1) = EVT_EXIT_DOUBLE_DOOR(kpa_33_ENTRY_1, "kpa_61", kpa_61_ENTRY_1, COLLIDER_tt3, MODEL_o1250, MODEL_b3_doa); diff --git a/src/world/area_kpa/kpa_50/kpa_50_3_npc.c b/src/world/area_kpa/kpa_50/kpa_50_3_npc.c index df8ecb51bb..9018bec95d 100644 --- a/src/world/area_kpa/kpa_50/kpa_50_3_npc.c +++ b/src/world/area_kpa/kpa_50/kpa_50_3_npc.c @@ -1,15 +1,12 @@ #include "kpa_50.h" -#include "world/common/enemy/complete/HammerBros.inc.c" -#include "world/common/enemy/complete/Koopatrol_Wander.inc.c" +#include "world/common/enemy/HammerBros_Wander.inc.c" +#include "world/common/enemy/Koopatrol_Wander.inc.c" -StaticNpc N(NpcData_Koopatrol_01) = { +NpcData N(NpcData_Koopatrol_01) = { .id = NPC_Koopatrol_01, - .settings = &N(NpcSettings_Koopatrol_Wander), .pos = { -251.0f, 0.0f, -30.0f }, .yaw = 270, - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, - .drops = KOOPATROL_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -22,16 +19,16 @@ StaticNpc N(NpcData_Koopatrol_01) = { .detectSize = { 300 }, } }, + .settings = &N(NpcSettings_Koopatrol_Wander), + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = KOOPATROL_DROPS, .animations = KOOPATROL_ANIMS, }; -StaticNpc N(NpcData_Koopatrol_02) = { +NpcData N(NpcData_Koopatrol_02) = { .id = NPC_Koopatrol_02, - .settings = &N(NpcSettings_Koopatrol_Wander), .pos = { 100.0f, 0.0f, -30.0f }, .yaw = 270, - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, - .drops = KOOPATROL_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -44,17 +41,17 @@ StaticNpc N(NpcData_Koopatrol_02) = { .detectSize = { 300 }, } }, + .settings = &N(NpcSettings_Koopatrol_Wander), + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = KOOPATROL_DROPS, .animations = KOOPATROL_ANIMS, }; -StaticNpc N(NpcData_HammerBros_01)[] = { +NpcData N(NpcData_HammerBros_01)[] = { { .id = NPC_HammerBros, - .settings = &N(NpcSettings_HammerBros), .pos = { 450.0f, 0.0f, -30.0f }, .yaw = 270, - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, - .drops = HAMMER_BROS_DROPS, .territory = { .wander = { .isFlying = FALSE, @@ -67,6 +64,9 @@ StaticNpc N(NpcData_HammerBros_01)[] = { .detectSize = { 300 }, } }, + .settings = &N(NpcSettings_HammerBros_Wander), + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = HAMMER_BROS_DROPS, .animations = HAMMER_BROS_ANIMS, }, HAMMER_BROS_HAMMER_HITBOX(NPC_HammerBros + 1), diff --git a/src/world/area_kpa/kpa_51/kpa_51_3_npc.c b/src/world/area_kpa/kpa_51/kpa_51_3_npc.c index 19e6939aa7..c85c24c941 100644 --- a/src/world/area_kpa/kpa_51/kpa_51_3_npc.c +++ b/src/world/area_kpa/kpa_51/kpa_51_3_npc.c @@ -1,17 +1,14 @@ #include "kpa_51.h" -#include "world/common/enemy/complete/Magikoopa.inc.c" -#include "world/common/enemy/complete/Koopatrol_Wander.inc.c" +#include "world/common/enemy/Magikoopa.inc.c" +#include "world/common/enemy/Koopatrol_Wander.inc.c" -StaticNpc N(NpcData_Magikoopa_01)[] = { +NpcData N(NpcData_Magikoopa_01)[] = { { .id = NPC_Magikoopa_01, - .settings = &N(NpcSettings_Magikoopa), .pos = { -130.0f, 0.0f, -30.0f }, .yaw = 90, - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, - .drops = MAGIKOOPA_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -24,6 +21,9 @@ StaticNpc N(NpcData_Magikoopa_01)[] = { .detectSize = { 200 }, } }, + .settings = &N(NpcSettings_Magikoopa), + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = MAGINO_DROPS, .animations = MAGIKOOPA_ANIMS, .extraAnimations = N(ExtraAnims_Magikoopa), .aiDetectFlags = AI_DETECT_SIGHT | AI_DETECT_SENSITIVE_MOTION, @@ -31,14 +31,11 @@ StaticNpc N(NpcData_Magikoopa_01)[] = { MAGIKOOPA_SPELL_HITBOX(NPC_Magikoopa_01 + 1) }; -StaticNpc N(NpcData_Magikoopa_02)[] = { +NpcData N(NpcData_Magikoopa_02)[] = { { .id = NPC_Magikoopa_02, - .settings = &N(NpcSettings_Magikoopa), .pos = { 150.0f, 0.0f, -30.0f }, .yaw = 270, - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, - .drops = MAGIKOOPA_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -51,6 +48,9 @@ StaticNpc N(NpcData_Magikoopa_02)[] = { .detectSize = { 200 }, } }, + .settings = &N(NpcSettings_Magikoopa), + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = MAGINO_DROPS, .animations = MAGIKOOPA_ANIMS, .extraAnimations = N(ExtraAnims_Magikoopa), .aiDetectFlags = AI_DETECT_SIGHT | AI_DETECT_SENSITIVE_MOTION, @@ -58,13 +58,10 @@ StaticNpc N(NpcData_Magikoopa_02)[] = { MAGIKOOPA_SPELL_HITBOX(NPC_Magikoopa_02 + 1) }; -StaticNpc N(NpcData_Koopatrol) = { +NpcData N(NpcData_Koopatrol) = { .id = NPC_Koopatrol, - .settings = &N(NpcSettings_Koopatrol_Wander), .pos = { 0.0f, 0.0f, -30.0f }, .yaw = 270, - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, - .drops = KOOPATROL_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -77,6 +74,9 @@ StaticNpc N(NpcData_Koopatrol) = { .detectSize = { 300 }, } }, + .settings = &N(NpcSettings_Koopatrol_Wander), + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = KOOPATROL_DROPS, .animations = KOOPATROL_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT | AI_DETECT_SENSITIVE_MOTION, }; diff --git a/src/world/area_kpa/kpa_52/kpa_52_4_npc.c b/src/world/area_kpa/kpa_52/kpa_52_4_npc.c index 249c93229e..c3d580d9e5 100644 --- a/src/world/area_kpa/kpa_52/kpa_52_4_npc.c +++ b/src/world/area_kpa/kpa_52/kpa_52_4_npc.c @@ -1,16 +1,13 @@ #include "kpa_52.h" -#include "world/common/enemy/complete/HammerBros.inc.c" +#include "world/common/enemy/HammerBros_Wander.inc.c" -StaticNpc N(NpcData_HammerBros_01)[] = { +NpcData N(NpcData_HammerBros_01)[] = { { .id = NPC_HammerBros_01, - .settings = &N(NpcSettings_HammerBros), .pos = { 190.0f, 0.0f, -27.0f }, .yaw = 270, - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, - .drops = HAMMER_BROS_DROPS, .territory = { .wander = { .isFlying = FALSE, @@ -23,6 +20,9 @@ StaticNpc N(NpcData_HammerBros_01)[] = { .detectSize = { 300 }, } }, + .settings = &N(NpcSettings_HammerBros_Wander), + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = HAMMER_BROS_DROPS, .animations = HAMMER_BROS_ANIMS, }, HAMMER_BROS_HAMMER_HITBOX(NPC_HammerBros_01 + 1), @@ -33,14 +33,11 @@ StaticNpc N(NpcData_HammerBros_01)[] = { HAMMER_BROS_HAMMER_HITBOX(NPC_HammerBros_01 + 6), }; -StaticNpc N(NpcData_HammerBros_02)[] = { +NpcData N(NpcData_HammerBros_02)[] = { { .id = NPC_HammerBros_02, - .settings = &N(NpcSettings_HammerBros), .pos = { 190.0f, 120.0f, -145.0f }, .yaw = 270, - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, - .drops = HAMMER_BROS_DROPS, .territory = { .wander = { .isFlying = FALSE, @@ -53,6 +50,9 @@ StaticNpc N(NpcData_HammerBros_02)[] = { .detectSize = { 140, 40 }, } }, + .settings = &N(NpcSettings_HammerBros_Wander), + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = HAMMER_BROS_DROPS, .animations = HAMMER_BROS_ANIMS, }, HAMMER_BROS_HAMMER_HITBOX(NPC_HammerBros_02 + 1), diff --git a/src/world/area_kpa/kpa_53/kpa_53_3_npc.c b/src/world/area_kpa/kpa_53/kpa_53_3_npc.c index fbc3b8eb99..d25919f90d 100644 --- a/src/world/area_kpa/kpa_53/kpa_53_3_npc.c +++ b/src/world/area_kpa/kpa_53/kpa_53_3_npc.c @@ -26,11 +26,7 @@ API_CALLABLE(N(UpdateFollowerPosition)) { return ApiStatus_DONE2; } -NpcSettings N(NpcSettings_Peach) = { - .height = 46, - .radius = 36, - .level = 99, -}; +#include "world/common/npc/Peach.inc.c" NpcSettings N(NpcSettings_Duplighost) = { .height = 30, @@ -343,70 +339,36 @@ EvtScript N(EVS_NpcInit_Guardian) = { EVT_END }; -StaticNpc N(NpcData_Imposter)[] = { +NpcData N(NpcData_Imposter)[] = { { .id = NPC_Follower, - .settings = &N(NpcSettings_Peach), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_20000 | ENEMY_FLAG_40000 | ENEMY_FLAG_200000 | ENEMY_FLAG_NO_DROPS, .init = &N(EVS_NpcInit_Follower), - .drops = NPC_NO_DROPS, - .animations = { - .idle = ANIM_Peach_A0000, - .walk = ANIM_Peach_A0000, - .run = ANIM_Peach_A0000, - .chase = ANIM_Peach_A0000, - .anim_4 = ANIM_Peach_A0000, - .anim_5 = ANIM_Peach_A0000, - .death = ANIM_Peach_A0000, - .hit = ANIM_Peach_A0000, - .anim_8 = ANIM_Peach_A0000, - .anim_9 = ANIM_Peach_A0000, - .anim_A = ANIM_Peach_A0000, - .anim_B = ANIM_Peach_A0000, - .anim_C = ANIM_Peach_A0000, - .anim_D = ANIM_Peach_A0000, - .anim_E = ANIM_Peach_A0000, - .anim_F = ANIM_Peach_A0000, - }, + .settings = &N(NpcSettings_Peach), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_20000 | ENEMY_FLAG_40000 | ENEMY_FLAG_200000 | ENEMY_FLAG_NO_DROPS, + .drops = NO_DROPS, + .animations = PEACH_ANIMS, .tattle = MSG_NpcTattle_KPA_FakePrincessPeach, }, { .id = NPC_Guardian, - .settings = &N(NpcSettings_Peach), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 270, - .flags = ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH, .init = &N(EVS_NpcInit_Guardian), - .drops = NPC_NO_DROPS, - .animations = { - .idle = ANIM_Peach_A0000, - .walk = ANIM_Peach_A0000, - .run = ANIM_Peach_A0000, - .chase = ANIM_Peach_A0000, - .anim_4 = ANIM_Peach_A0000, - .anim_5 = ANIM_Peach_A0000, - .death = ANIM_Peach_A0000, - .hit = ANIM_Peach_A0000, - .anim_8 = ANIM_Peach_A0000, - .anim_9 = ANIM_Peach_A0000, - .anim_A = ANIM_Peach_A0000, - .anim_B = ANIM_Peach_A0000, - .anim_C = ANIM_Peach_A0000, - .anim_D = ANIM_Peach_A0000, - .anim_E = ANIM_Peach_A0000, - .anim_F = ANIM_Peach_A0000, - }, + .settings = &N(NpcSettings_Peach), + .flags = ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH, + .drops = NO_DROPS, + .animations = PEACH_ANIMS, .tattle = MSG_NpcTattle_KPA_FakePrincessPeach, }, { .id = NPC_Duplighost, - .settings = &N(NpcSettings_Duplighost), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 270, - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_40000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS, .init = &N(EVS_NpcInit_Duplighost), + .settings = &N(NpcSettings_Duplighost), + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_40000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS, .drops = { .dropFlags = NPC_DROP_FLAG_80, .itemDropChance = 5, diff --git a/src/world/area_kpa/kpa_60/kpa_60_3_main.c b/src/world/area_kpa/kpa_60/kpa_60_3_main.c index c0be2a0ee1..326a8344bb 100644 --- a/src/world/area_kpa/kpa_60/kpa_60_3_main.c +++ b/src/world/area_kpa/kpa_60/kpa_60_3_main.c @@ -1,7 +1,6 @@ #include "kpa_60.h" #include "world/common/atomic/TexturePan.inc.c" -#include "world/common/atomic/TexturePan.data.inc.c" EvtScript N(EVS_OpenAirshipDockDoor) = { EVT_CALL(PlaySoundAtCollider, COLLIDER_deilitts, SOUND_1DF, SOUND_SPACE_MODE_0) diff --git a/src/world/area_kpa/kpa_61/kpa_61_2_main.c b/src/world/area_kpa/kpa_61/kpa_61_2_main.c index c7268db2e8..0874882652 100644 --- a/src/world/area_kpa/kpa_61/kpa_61_2_main.c +++ b/src/world/area_kpa/kpa_61/kpa_61_2_main.c @@ -1,7 +1,6 @@ #include "kpa_61.h" #include "world/common/atomic/TexturePan.inc.c" -#include "world/common/atomic/TexturePan.data.inc.c" EvtScript N(EVS_ExitDoors_kpa_82_1) = EVT_EXIT_DOUBLE_DOOR(kpa_61_ENTRY_0, "kpa_82", kpa_82_ENTRY_1, COLLIDER_tts, MODEL_o34, MODEL_o33); EvtScript N(EVS_ExitDoors_kpa_33_1) = EVT_EXIT_DOUBLE_DOOR(kpa_61_ENTRY_1, "kpa_33", kpa_33_ENTRY_1, COLLIDER_ttsw, MODEL_o37, MODEL_o38); diff --git a/src/world/area_kpa/kpa_61/kpa_61_3_npc.c b/src/world/area_kpa/kpa_61/kpa_61_3_npc.c index 1a0ba677c4..eb66ab6c05 100644 --- a/src/world/area_kpa/kpa_61/kpa_61_3_npc.c +++ b/src/world/area_kpa/kpa_61/kpa_61_3_npc.c @@ -1,15 +1,12 @@ #include "kpa_61.h" -#include "world/common/enemy/complete/Koopatrol_Wander.inc.c" -#include "world/common/enemy/complete/FlyingMagikoopa.inc.c" +#include "world/common/enemy/Koopatrol_Wander.inc.c" +#include "world/common/enemy/FlyingMagikoopa.inc.c" -StaticNpc N(NpcData_Koopatrol_01) = { +NpcData N(NpcData_Koopatrol_01) = { .id = NPC_Koopatrol_01, - .settings = &N(NpcSettings_Koopatrol_Wander), .pos = { 300.0f, -160.0f, 140.0f }, .yaw = 270, - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, - .drops = KOOPATROL_DROPS, .territory = { .wander = { .isFlying = FALSE, @@ -22,16 +19,16 @@ StaticNpc N(NpcData_Koopatrol_01) = { .detectSize = { 200 }, } }, + .settings = &N(NpcSettings_Koopatrol_Wander), + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = KOOPATROL_DROPS, .animations = KOOPATROL_ANIMS, }; -StaticNpc N(NpcData_Koopatrol_02) = { +NpcData N(NpcData_Koopatrol_02) = { .id = NPC_Koopatrol_02, - .settings = &N(NpcSettings_Koopatrol_Wander), .pos = { 850.0f, -160.0f, 390.0f }, .yaw = 270, - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, - .drops = KOOPATROL_DROPS, .territory = { .wander = { .isFlying = FALSE, @@ -44,17 +41,17 @@ StaticNpc N(NpcData_Koopatrol_02) = { .detectSize = { 200 }, } }, + .settings = &N(NpcSettings_Koopatrol_Wander), + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = KOOPATROL_DROPS, .animations = KOOPATROL_ANIMS, }; -StaticNpc N(NpcData_FlyingMagikoopa_01)[] = { +NpcData N(NpcData_FlyingMagikoopa_01)[] = { { .id = NPC_FlyingMagikoopa_01, - .settings = &N(NpcSettings_FlyingMagikoopa), .pos = { 500.0f, 250.0f, -50.0f }, .yaw = 90, - .flags = ENEMY_FLAG_800, - .drops = FLYING_MAGIKOOPA_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -67,6 +64,9 @@ StaticNpc N(NpcData_FlyingMagikoopa_01)[] = { .detectSize = { 200 }, } }, + .settings = &N(NpcSettings_FlyingMagikoopa), + .flags = ENEMY_FLAG_800, + .drops = FLYING_MAGINO_DROPS, .animations = FLYING_MAGIKOOPA_ANIMS, .extraAnimations = N(ExtraAnims_FlyingMagikoopa), .aiDetectFlags = AI_DETECT_SIGHT | AI_DETECT_SENSITIVE_MOTION, @@ -74,14 +74,11 @@ StaticNpc N(NpcData_FlyingMagikoopa_01)[] = { FLYING_MAGIKOOPA_SPELL_HITBOX(NPC_FlyingMagikoopa_01_Spell), }; -StaticNpc N(NpcData_FlyingMagikoopa_02)[] = { +NpcData N(NpcData_FlyingMagikoopa_02)[] = { { .id = NPC_FlyingMagikoopa_02, - .settings = &N(NpcSettings_FlyingMagikoopa), .pos = { 200.0f, 250.0f, -50.0f }, .yaw = 90, - .flags = ENEMY_FLAG_800, - .drops = FLYING_MAGIKOOPA_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -94,6 +91,9 @@ StaticNpc N(NpcData_FlyingMagikoopa_02)[] = { .detectSize = { 200 }, } }, + .settings = &N(NpcSettings_FlyingMagikoopa), + .flags = ENEMY_FLAG_800, + .drops = FLYING_MAGINO_DROPS, .animations = FLYING_MAGIKOOPA_ANIMS, .extraAnimations = N(ExtraAnims_FlyingMagikoopa), .aiDetectFlags = AI_DETECT_SIGHT | AI_DETECT_SENSITIVE_MOTION, diff --git a/src/world/area_kpa/kpa_62/kpa_62_3_main.c b/src/world/area_kpa/kpa_62/kpa_62_3_main.c index c9927d47c1..c4cc96c9bb 100644 --- a/src/world/area_kpa/kpa_62/kpa_62_3_main.c +++ b/src/world/area_kpa/kpa_62/kpa_62_3_main.c @@ -1,7 +1,6 @@ #include "kpa_62.h" #include "world/common/atomic/TexturePan.inc.c" -#include "world/common/atomic/TexturePan.data.inc.c" EvtScript N(EVS_OpenAirshipDockDoor) = { EVT_CALL(PlaySoundAtCollider, COLLIDER_deilitts, SOUND_1DF, SOUND_SPACE_MODE_0) diff --git a/src/world/area_kpa/kpa_70/kpa_70.h b/src/world/area_kpa/kpa_70/kpa_70.h index aeccc7a1a0..38c8775642 100644 --- a/src/world/area_kpa/kpa_70/kpa_70.h +++ b/src/world/area_kpa/kpa_70/kpa_70.h @@ -25,6 +25,6 @@ extern NpcGroupList N(DefaultNPCs); extern StaticAnimatorNode* N(ChainDriveSkeleton)[]; extern AnimScript N(AS_ChainDriveAnim); -ApiStatus InitAnimatedModels(Evt* script, s32 isInitialCall); -ApiStatus SetAnimatedModelRenderMode(Evt* script, s32 isInitialCall); -ApiStatus DeleteAnimatedModel(Evt* script, s32 isInitialCall); +API_CALLABLE(InitAnimatedModels); +API_CALLABLE(SetAnimatedModelRenderMode); +API_CALLABLE(DeleteAnimatedModel); diff --git a/src/world/area_kpa/kpa_70/kpa_70_2_main.c b/src/world/area_kpa/kpa_70/kpa_70_2_main.c index 389c3b12fd..718a8d6bd0 100644 --- a/src/world/area_kpa/kpa_70/kpa_70_2_main.c +++ b/src/world/area_kpa/kpa_70/kpa_70_2_main.c @@ -1,7 +1,6 @@ #include "kpa_70.h" #include "world/common/atomic/TexturePan.inc.c" -#include "world/common/atomic/TexturePan.data.inc.c" EvtScript N(EVS_SetupChainDrive) = { EVT_CALL(LoadAnimatedModel, 0, EVT_PTR(N(ChainDriveSkeleton))) diff --git a/src/world/area_kpa/kpa_70/kpa_70_3_npc.c b/src/world/area_kpa/kpa_70/kpa_70_3_npc.c index e6069a49ae..7124434d07 100644 --- a/src/world/area_kpa/kpa_70/kpa_70_3_npc.c +++ b/src/world/area_kpa/kpa_70/kpa_70_3_npc.c @@ -1,14 +1,11 @@ #include "kpa_70.h" -#include "world/common/enemy/complete/Koopatrol_Wander.inc.c" +#include "world/common/enemy/Koopatrol_Wander.inc.c" -StaticNpc N(NpcData_Koopatrol_01) = { +NpcData N(NpcData_Koopatrol_01) = { .id = NPC_Koopatrol_01, - .settings = &N(NpcSettings_Koopatrol_Wander), .pos = { 435.0f, 10.0f, 125.0f }, .yaw = 270, - .flags = ENEMY_FLAG_400, - .drops = KOOPATROL_DROPS, .territory = { .wander = { .isFlying = FALSE, @@ -21,16 +18,16 @@ StaticNpc N(NpcData_Koopatrol_01) = { .detectSize = { 200 }, } }, + .settings = &N(NpcSettings_Koopatrol_Wander), + .flags = ENEMY_FLAG_400, + .drops = KOOPATROL_DROPS, .animations = KOOPATROL_ANIMS, }; -StaticNpc N(NpcData_Koopatrol_02) = { +NpcData N(NpcData_Koopatrol_02) = { .id = NPC_Koopatrol_02, - .settings = &N(NpcSettings_Koopatrol_Wander), .pos = { 815.0f, 10.0f, 125.0f }, .yaw = 270, - .flags = ENEMY_FLAG_400, - .drops = KOOPATROL_DROPS, .territory = { .wander = { .isFlying = FALSE, @@ -43,6 +40,9 @@ StaticNpc N(NpcData_Koopatrol_02) = { .detectSize = { 200 }, } }, + .settings = &N(NpcSettings_Koopatrol_Wander), + .flags = ENEMY_FLAG_400, + .drops = KOOPATROL_DROPS, .animations = KOOPATROL_ANIMS, }; diff --git a/src/world/area_kpa/kpa_81/kpa_81_3_npc.c b/src/world/area_kpa/kpa_81/kpa_81_3_npc.c index 63a7e214b5..30ae0070c1 100644 --- a/src/world/area_kpa/kpa_81/kpa_81_3_npc.c +++ b/src/world/area_kpa/kpa_81/kpa_81_3_npc.c @@ -213,14 +213,14 @@ EvtScript N(EVS_NpcInit_Door) = { EVT_END }; -StaticNpc N(NpcData_Door) = { +NpcData N(NpcData_Door) = { .id = NPC_Door, - .settings = &N(NpcSettings_Toad_Stationary), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_4000 | ENEMY_FLAG_100000 | ENEMY_FLAG_400000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, .init = &N(EVS_NpcInit_Door), - .drops = NPC_NO_DROPS, + .settings = &N(NpcSettings_Toad_Stationary), + .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_4000 | ENEMY_FLAG_100000 | ENEMY_FLAG_400000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, + .drops = NO_DROPS, .animations = TOAD_RED_ANIMS, }; 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 4b058cd7d9..f454fcd22f 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 @@ -1,9 +1,9 @@ #include "kpa_82.h" -#include "world/common/enemy/complete/Goomba.h" -#include "world/common/enemy/complete/KoopaTroopa.h" -#include "world/common/enemy/complete/DarkTroopa.h" -#include "world/common/enemy/complete/ShyGuy.h" +#include "world/common/enemy/Goomba.h" +#include "world/common/enemy/KoopaTroopa.h" +#include "world/common/enemy/DarkTroopa.h" +#include "world/common/enemy/ShyGuy.h" enum { ANSWER_CORRECT = 0, @@ -1271,19 +1271,15 @@ EvtScript N(EVS_NpcInit_AntiGuy) = { EVT_END }; -StaticNpc N(NpcData_AntiGuys)[] = { +NpcData N(NpcData_AntiGuys)[] = { { .id = NPC_Dummy, - .settings = &N(NpcSettings_AntiGuy), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_4000 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, .init = &N(EVS_NpcInit_Door), - .drops = { - .dropFlags = NPC_DROP_FLAG_80, - .heartDrops = NO_DROPS, - .flowerDrops = NO_DROPS, - }, + .settings = &N(NpcSettings_AntiGuy), + .flags = ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_4000 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, + .drops = NO_DROPS, .animations = { .idle = ANIM_ShyGuy_Black_Anim01, .walk = ANIM_ShyGuy_Black_Anim02, @@ -1305,16 +1301,12 @@ StaticNpc N(NpcData_AntiGuys)[] = { }, { .id = NPC_AntiGuy_01, - .settings = &N(NpcSettings_AntiGuy), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, .init = &N(EVS_NpcInit_AntiGuy), - .drops = { - .dropFlags = NPC_DROP_FLAG_80, - .heartDrops = NO_DROPS, - .flowerDrops = NO_DROPS, - }, + .settings = &N(NpcSettings_AntiGuy), + .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, + .drops = NO_DROPS, .animations = { .idle = ANIM_ShyGuy_Black_Anim01, .walk = ANIM_ShyGuy_Black_Anim02, @@ -1336,16 +1328,12 @@ StaticNpc N(NpcData_AntiGuys)[] = { }, { .id = NPC_AntiGuy_02, - .settings = &N(NpcSettings_AntiGuy), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, .init = &N(EVS_NpcInit_AntiGuy), - .drops = { - .dropFlags = NPC_DROP_FLAG_80, - .heartDrops = NO_DROPS, - .flowerDrops = NO_DROPS, - }, + .settings = &N(NpcSettings_AntiGuy), + .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, + .drops = NO_DROPS, .animations = { .idle = ANIM_ShyGuy_Black_Anim01, .walk = ANIM_ShyGuy_Black_Anim02, @@ -1367,16 +1355,12 @@ StaticNpc N(NpcData_AntiGuys)[] = { }, { .id = NPC_AntiGuy_03, - .settings = &N(NpcSettings_AntiGuy), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, .init = &N(EVS_NpcInit_AntiGuy), - .drops = { - .dropFlags = NPC_DROP_FLAG_80, - .heartDrops = NO_DROPS, - .flowerDrops = NO_DROPS, - }, + .settings = &N(NpcSettings_AntiGuy), + .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, + .drops = NO_DROPS, .animations = { .idle = ANIM_ShyGuy_Black_Anim01, .walk = ANIM_ShyGuy_Black_Anim02, @@ -1398,15 +1382,11 @@ StaticNpc N(NpcData_AntiGuys)[] = { }, }; -StaticNpc N(NpcData_Goombas)[] = { +NpcData N(NpcData_Goombas)[] = { { .id = NPC_Goomba_01, - .settings = &N(NpcSettings_Short), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, - .init = &N(EVS_NpcInit_Goomba), - .drops = GOOMBA_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -1419,16 +1399,16 @@ StaticNpc N(NpcData_Goombas)[] = { .detectSize = { 130, 100 }, } }, + .init = &N(EVS_NpcInit_Goomba), + .settings = &N(NpcSettings_Short), + .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, + .drops = GOOMBA_DROPS, .animations = GOOMBA_ANIMS, }, { .id = NPC_Goomba_02, - .settings = &N(NpcSettings_Short), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, - .init = &N(EVS_NpcInit_Goomba), - .drops = GOOMBA_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -1441,16 +1421,16 @@ StaticNpc N(NpcData_Goombas)[] = { .detectSize = { 130, 100 }, } }, + .init = &N(EVS_NpcInit_Goomba), + .settings = &N(NpcSettings_Short), + .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, + .drops = GOOMBA_DROPS, .animations = GOOMBA_ANIMS, }, { .id = NPC_Goomba_03, - .settings = &N(NpcSettings_Short), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, - .init = &N(EVS_NpcInit_Goomba), - .drops = GOOMBA_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -1463,16 +1443,16 @@ StaticNpc N(NpcData_Goombas)[] = { .detectSize = { 130, 100 }, } }, + .init = &N(EVS_NpcInit_Goomba), + .settings = &N(NpcSettings_Short), + .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, + .drops = GOOMBA_DROPS, .animations = GOOMBA_ANIMS, }, { .id = NPC_Goomba_04, - .settings = &N(NpcSettings_Short), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, - .init = &N(EVS_NpcInit_Goomba), - .drops = GOOMBA_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -1485,16 +1465,16 @@ StaticNpc N(NpcData_Goombas)[] = { .detectSize = { 130, 100 }, } }, + .init = &N(EVS_NpcInit_Goomba), + .settings = &N(NpcSettings_Short), + .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, + .drops = GOOMBA_DROPS, .animations = GOOMBA_ANIMS, }, { .id = NPC_Goomba_05, - .settings = &N(NpcSettings_Short), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, - .init = &N(EVS_NpcInit_Goomba), - .drops = GOOMBA_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -1507,18 +1487,34 @@ StaticNpc N(NpcData_Goombas)[] = { .detectSize = { 130, 100 }, } }, + .init = &N(EVS_NpcInit_Goomba), + .settings = &N(NpcSettings_Short), + .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, + .drops = GOOMBA_DROPS, .animations = GOOMBA_ANIMS, }, }; -StaticNpc N(NpcData_RedShyGuys)[] = { +NpcData N(NpcData_RedShyGuys)[] = { { .id = NPC_RedShyGuy_01, - .settings = &N(NpcSettings_ShyGuy), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_RECT, + .centerPos = { 0, 0, 150 }, + .wanderSize = { 130, 100 }, + .detectShape = SHAPE_RECT, + .detectPos = { 0, 0, 150 }, + .detectSize = { 130, 100 }, + } + }, .init = &N(EVS_NpcInit_ShyGuy), + .settings = &N(NpcSettings_ShyGuy), + .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, .drops = { .dropFlags = NPC_DROP_FLAG_80, .itemDropChance = 5, @@ -1536,27 +1532,27 @@ StaticNpc N(NpcData_RedShyGuys)[] = { .minCoinBonus = 0, .maxCoinBonus = 2, }, - .territory = { - .wander = { - .isFlying = TRUE, - .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, - .wanderShape = SHAPE_RECT, - .centerPos = { 0, 0, 150 }, - .wanderSize = { 130, 100 }, - .detectShape = SHAPE_RECT, - .detectPos = { 0, 0, 150 }, - .detectSize = { 130, 100 }, - } - }, .animations = RED_SHY_GUY_ANIMS, }, { .id = NPC_RedShyGuy_02, - .settings = &N(NpcSettings_ShyGuy), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_RECT, + .centerPos = { 0, 0, 150 }, + .wanderSize = { 130, 100 }, + .detectShape = SHAPE_RECT, + .detectPos = { 0, 0, 150 }, + .detectSize = { 130, 100 }, + } + }, .init = &N(EVS_NpcInit_ShyGuy), + .settings = &N(NpcSettings_ShyGuy), + .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, .drops = { .dropFlags = NPC_DROP_FLAG_80, .itemDropChance = 5, @@ -1574,27 +1570,27 @@ StaticNpc N(NpcData_RedShyGuys)[] = { .minCoinBonus = 0, .maxCoinBonus = 2, }, - .territory = { - .wander = { - .isFlying = TRUE, - .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, - .wanderShape = SHAPE_RECT, - .centerPos = { 0, 0, 150 }, - .wanderSize = { 130, 100 }, - .detectShape = SHAPE_RECT, - .detectPos = { 0, 0, 150 }, - .detectSize = { 130, 100 }, - } - }, .animations = RED_SHY_GUY_ANIMS, }, { .id = NPC_RedShyGuy_03, - .settings = &N(NpcSettings_ShyGuy), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_RECT, + .centerPos = { 0, 0, 150 }, + .wanderSize = { 130, 100 }, + .detectShape = SHAPE_RECT, + .detectPos = { 0, 0, 150 }, + .detectSize = { 130, 100 }, + } + }, .init = &N(EVS_NpcInit_ShyGuy), + .settings = &N(NpcSettings_ShyGuy), + .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, .drops = { .dropFlags = NPC_DROP_FLAG_80, .itemDropChance = 5, @@ -1612,27 +1608,27 @@ StaticNpc N(NpcData_RedShyGuys)[] = { .minCoinBonus = 0, .maxCoinBonus = 2, }, - .territory = { - .wander = { - .isFlying = TRUE, - .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, - .wanderShape = SHAPE_RECT, - .centerPos = { 0, 0, 150 }, - .wanderSize = { 130, 100 }, - .detectShape = SHAPE_RECT, - .detectPos = { 0, 0, 150 }, - .detectSize = { 130, 100 }, - } - }, .animations = RED_SHY_GUY_ANIMS, }, { .id = NPC_RedShyGuy_04, - .settings = &N(NpcSettings_ShyGuy), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_RECT, + .centerPos = { 0, 0, 150 }, + .wanderSize = { 130, 100 }, + .detectShape = SHAPE_RECT, + .detectPos = { 0, 0, 150 }, + .detectSize = { 130, 100 }, + } + }, .init = &N(EVS_NpcInit_ShyGuy), + .settings = &N(NpcSettings_ShyGuy), + .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, .drops = { .dropFlags = NPC_DROP_FLAG_80, .itemDropChance = 5, @@ -1650,27 +1646,27 @@ StaticNpc N(NpcData_RedShyGuys)[] = { .minCoinBonus = 0, .maxCoinBonus = 2, }, - .territory = { - .wander = { - .isFlying = TRUE, - .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, - .wanderShape = SHAPE_RECT, - .centerPos = { 0, 0, 150 }, - .wanderSize = { 130, 100 }, - .detectShape = SHAPE_RECT, - .detectPos = { 0, 0, 150 }, - .detectSize = { 130, 100 }, - } - }, .animations = RED_SHY_GUY_ANIMS, }, { .id = NPC_RedShyGuy_05, - .settings = &N(NpcSettings_ShyGuy), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_RECT, + .centerPos = { 0, 0, 150 }, + .wanderSize = { 130, 100 }, + .detectShape = SHAPE_RECT, + .detectPos = { 0, 0, 150 }, + .detectSize = { 130, 100 }, + } + }, .init = &N(EVS_NpcInit_ShyGuy), + .settings = &N(NpcSettings_ShyGuy), + .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, .drops = { .dropFlags = NPC_DROP_FLAG_80, .itemDropChance = 5, @@ -1688,30 +1684,30 @@ StaticNpc N(NpcData_RedShyGuys)[] = { .minCoinBonus = 0, .maxCoinBonus = 2, }, - .territory = { - .wander = { - .isFlying = TRUE, - .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, - .wanderShape = SHAPE_RECT, - .centerPos = { 0, 0, 150 }, - .wanderSize = { 130, 100 }, - .detectShape = SHAPE_RECT, - .detectPos = { 0, 0, 150 }, - .detectSize = { 130, 100 }, - } - }, .animations = RED_SHY_GUY_ANIMS, }, }; -StaticNpc N(NpcData_BlueShyGuys)[] = { +NpcData N(NpcData_BlueShyGuys)[] = { { .id = NPC_BlueShyGuy_01, - .settings = &N(NpcSettings_ShyGuy), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_RECT, + .centerPos = { 0, 0, 150 }, + .wanderSize = { 130, 100 }, + .detectShape = SHAPE_RECT, + .detectPos = { 0, 0, 150 }, + .detectSize = { 130, 100 }, + } + }, .init = &N(EVS_NpcInit_ShyGuy), + .settings = &N(NpcSettings_ShyGuy), + .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, .drops = { .dropFlags = NPC_DROP_FLAG_80, .itemDropChance = 5, @@ -1729,27 +1725,27 @@ StaticNpc N(NpcData_BlueShyGuys)[] = { .minCoinBonus = 0, .maxCoinBonus = 2, }, - .territory = { - .wander = { - .isFlying = TRUE, - .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, - .wanderShape = SHAPE_RECT, - .centerPos = { 0, 0, 150 }, - .wanderSize = { 130, 100 }, - .detectShape = SHAPE_RECT, - .detectPos = { 0, 0, 150 }, - .detectSize = { 130, 100 }, - } - }, .animations = BLUE_SHY_GUY_ANIMS, }, { .id = NPC_BlueShyGuy_02, - .settings = &N(NpcSettings_ShyGuy), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_RECT, + .centerPos = { 0, 0, 150 }, + .wanderSize = { 130, 100 }, + .detectShape = SHAPE_RECT, + .detectPos = { 0, 0, 150 }, + .detectSize = { 130, 100 }, + } + }, .init = &N(EVS_NpcInit_ShyGuy), + .settings = &N(NpcSettings_ShyGuy), + .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, .drops = { .dropFlags = NPC_DROP_FLAG_80, .itemDropChance = 5, @@ -1767,27 +1763,27 @@ StaticNpc N(NpcData_BlueShyGuys)[] = { .minCoinBonus = 0, .maxCoinBonus = 2, }, - .territory = { - .wander = { - .isFlying = TRUE, - .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, - .wanderShape = SHAPE_RECT, - .centerPos = { 0, 0, 150 }, - .wanderSize = { 130, 100 }, - .detectShape = SHAPE_RECT, - .detectPos = { 0, 0, 150 }, - .detectSize = { 130, 100 }, - } - }, .animations = BLUE_SHY_GUY_ANIMS, }, { .id = NPC_BlueShyGuy_03, - .settings = &N(NpcSettings_ShyGuy), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_RECT, + .centerPos = { 0, 0, 150 }, + .wanderSize = { 130, 100 }, + .detectShape = SHAPE_RECT, + .detectPos = { 0, 0, 150 }, + .detectSize = { 130, 100 }, + } + }, .init = &N(EVS_NpcInit_ShyGuy), + .settings = &N(NpcSettings_ShyGuy), + .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, .drops = { .dropFlags = NPC_DROP_FLAG_80, .itemDropChance = 5, @@ -1805,27 +1801,27 @@ StaticNpc N(NpcData_BlueShyGuys)[] = { .minCoinBonus = 0, .maxCoinBonus = 2, }, - .territory = { - .wander = { - .isFlying = TRUE, - .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, - .wanderShape = SHAPE_RECT, - .centerPos = { 0, 0, 150 }, - .wanderSize = { 130, 100 }, - .detectShape = SHAPE_RECT, - .detectPos = { 0, 0, 150 }, - .detectSize = { 130, 100 }, - } - }, .animations = BLUE_SHY_GUY_ANIMS, }, { .id = NPC_BlueShyGuy_04, - .settings = &N(NpcSettings_ShyGuy), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_RECT, + .centerPos = { 0, 0, 150 }, + .wanderSize = { 130, 100 }, + .detectShape = SHAPE_RECT, + .detectPos = { 0, 0, 150 }, + .detectSize = { 130, 100 }, + } + }, .init = &N(EVS_NpcInit_ShyGuy), + .settings = &N(NpcSettings_ShyGuy), + .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, .drops = { .dropFlags = NPC_DROP_FLAG_80, .itemDropChance = 5, @@ -1843,27 +1839,27 @@ StaticNpc N(NpcData_BlueShyGuys)[] = { .minCoinBonus = 0, .maxCoinBonus = 2, }, - .territory = { - .wander = { - .isFlying = TRUE, - .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, - .wanderShape = SHAPE_RECT, - .centerPos = { 0, 0, 150 }, - .wanderSize = { 130, 100 }, - .detectShape = SHAPE_RECT, - .detectPos = { 0, 0, 150 }, - .detectSize = { 130, 100 }, - } - }, .animations = BLUE_SHY_GUY_ANIMS, }, { .id = NPC_BlueShyGuy_05, - .settings = &N(NpcSettings_ShyGuy), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_RECT, + .centerPos = { 0, 0, 150 }, + .wanderSize = { 130, 100 }, + .detectShape = SHAPE_RECT, + .detectPos = { 0, 0, 150 }, + .detectSize = { 130, 100 }, + } + }, .init = &N(EVS_NpcInit_ShyGuy), + .settings = &N(NpcSettings_ShyGuy), + .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, .drops = { .dropFlags = NPC_DROP_FLAG_80, .itemDropChance = 5, @@ -1881,30 +1877,30 @@ StaticNpc N(NpcData_BlueShyGuys)[] = { .minCoinBonus = 0, .maxCoinBonus = 2, }, - .territory = { - .wander = { - .isFlying = TRUE, - .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, - .wanderShape = SHAPE_RECT, - .centerPos = { 0, 0, 150 }, - .wanderSize = { 130, 100 }, - .detectShape = SHAPE_RECT, - .detectPos = { 0, 0, 150 }, - .detectSize = { 130, 100 }, - } - }, .animations = BLUE_SHY_GUY_ANIMS, }, }; -StaticNpc N(NpcData_GreenShyGuys)[] = { +NpcData N(NpcData_GreenShyGuys)[] = { { .id = NPC_GreenShyGuy_01, - .settings = &N(NpcSettings_ShyGuy), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_RECT, + .centerPos = { 0, 0, 150 }, + .wanderSize = { 130, 100 }, + .detectShape = SHAPE_RECT, + .detectPos = { 0, 0, 150 }, + .detectSize = { 130, 100 }, + } + }, .init = &N(EVS_NpcInit_ShyGuy), + .settings = &N(NpcSettings_ShyGuy), + .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, .drops = { .dropFlags = NPC_DROP_FLAG_80, .itemDropChance = 5, @@ -1922,27 +1918,27 @@ StaticNpc N(NpcData_GreenShyGuys)[] = { .minCoinBonus = 0, .maxCoinBonus = 2, }, - .territory = { - .wander = { - .isFlying = TRUE, - .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, - .wanderShape = SHAPE_RECT, - .centerPos = { 0, 0, 150 }, - .wanderSize = { 130, 100 }, - .detectShape = SHAPE_RECT, - .detectPos = { 0, 0, 150 }, - .detectSize = { 130, 100 }, - } - }, .animations = GREEN_SHY_GUY_ANIMS, }, { .id = NPC_GreenShyGuy_02, - .settings = &N(NpcSettings_ShyGuy), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_RECT, + .centerPos = { 0, 0, 150 }, + .wanderSize = { 130, 100 }, + .detectShape = SHAPE_RECT, + .detectPos = { 0, 0, 150 }, + .detectSize = { 130, 100 }, + } + }, .init = &N(EVS_NpcInit_ShyGuy), + .settings = &N(NpcSettings_ShyGuy), + .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, .drops = { .dropFlags = NPC_DROP_FLAG_80, .itemDropChance = 5, @@ -1960,27 +1956,27 @@ StaticNpc N(NpcData_GreenShyGuys)[] = { .minCoinBonus = 0, .maxCoinBonus = 2, }, - .territory = { - .wander = { - .isFlying = TRUE, - .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, - .wanderShape = SHAPE_RECT, - .centerPos = { 0, 0, 150 }, - .wanderSize = { 130, 100 }, - .detectShape = SHAPE_RECT, - .detectPos = { 0, 0, 150 }, - .detectSize = { 130, 100 }, - } - }, .animations = GREEN_SHY_GUY_ANIMS, }, { .id = NPC_GreenShyGuy_03, - .settings = &N(NpcSettings_ShyGuy), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_RECT, + .centerPos = { 0, 0, 150 }, + .wanderSize = { 130, 100 }, + .detectShape = SHAPE_RECT, + .detectPos = { 0, 0, 150 }, + .detectSize = { 130, 100 }, + } + }, .init = &N(EVS_NpcInit_ShyGuy), + .settings = &N(NpcSettings_ShyGuy), + .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, .drops = { .dropFlags = NPC_DROP_FLAG_80, .itemDropChance = 5, @@ -1998,27 +1994,27 @@ StaticNpc N(NpcData_GreenShyGuys)[] = { .minCoinBonus = 0, .maxCoinBonus = 2, }, - .territory = { - .wander = { - .isFlying = TRUE, - .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, - .wanderShape = SHAPE_RECT, - .centerPos = { 0, 0, 150 }, - .wanderSize = { 130, 100 }, - .detectShape = SHAPE_RECT, - .detectPos = { 0, 0, 150 }, - .detectSize = { 130, 100 }, - } - }, .animations = GREEN_SHY_GUY_ANIMS, }, { .id = NPC_GreenShyGuy_04, - .settings = &N(NpcSettings_ShyGuy), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_RECT, + .centerPos = { 0, 0, 150 }, + .wanderSize = { 130, 100 }, + .detectShape = SHAPE_RECT, + .detectPos = { 0, 0, 150 }, + .detectSize = { 130, 100 }, + } + }, .init = &N(EVS_NpcInit_ShyGuy), + .settings = &N(NpcSettings_ShyGuy), + .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, .drops = { .dropFlags = NPC_DROP_FLAG_80, .itemDropChance = 5, @@ -2036,27 +2032,27 @@ StaticNpc N(NpcData_GreenShyGuys)[] = { .minCoinBonus = 0, .maxCoinBonus = 2, }, - .territory = { - .wander = { - .isFlying = TRUE, - .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, - .wanderShape = SHAPE_RECT, - .centerPos = { 0, 0, 150 }, - .wanderSize = { 130, 100 }, - .detectShape = SHAPE_RECT, - .detectPos = { 0, 0, 150 }, - .detectSize = { 130, 100 }, - } - }, .animations = GREEN_SHY_GUY_ANIMS, }, { .id = NPC_GreenShyGuy_05, - .settings = &N(NpcSettings_ShyGuy), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_RECT, + .centerPos = { 0, 0, 150 }, + .wanderSize = { 130, 100 }, + .detectShape = SHAPE_RECT, + .detectPos = { 0, 0, 150 }, + .detectSize = { 130, 100 }, + } + }, .init = &N(EVS_NpcInit_ShyGuy), + .settings = &N(NpcSettings_ShyGuy), + .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, .drops = { .dropFlags = NPC_DROP_FLAG_80, .itemDropChance = 5, @@ -2074,6 +2070,15 @@ StaticNpc N(NpcData_GreenShyGuys)[] = { .minCoinBonus = 0, .maxCoinBonus = 2, }, + .animations = GREEN_SHY_GUY_ANIMS, + }, +}; + +NpcData N(NpcData_DarkTroopas)[] = { + { + .id = NPC_DarkTroopa_01, + .pos = { NPC_DISPOSE_LOCATION }, + .yaw = 0, .territory = { .wander = { .isFlying = TRUE, @@ -2086,18 +2091,9 @@ StaticNpc N(NpcData_GreenShyGuys)[] = { .detectSize = { 130, 100 }, } }, - .animations = GREEN_SHY_GUY_ANIMS, - }, -}; - -StaticNpc N(NpcData_DarkTroopas)[] = { - { - .id = NPC_DarkTroopa_01, - .settings = &N(NpcSettings_KoopaTroopa), - .pos = { NPC_DISPOSE_LOCATION }, - .yaw = 0, - .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, .init = &N(EVS_NpcInit_KoopaTroopa), + .settings = &N(NpcSettings_KoopaTroopa), + .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, .drops = { .dropFlags = NPC_DROP_FLAG_80, .itemDropChance = 5, @@ -2110,39 +2106,12 @@ StaticNpc N(NpcData_DarkTroopas)[] = { .minCoinBonus = 1, .maxCoinBonus = 1, }, - .territory = { - .wander = { - .isFlying = TRUE, - .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, - .wanderShape = SHAPE_RECT, - .centerPos = { 0, 0, 150 }, - .wanderSize = { 130, 100 }, - .detectShape = SHAPE_RECT, - .detectPos = { 0, 0, 150 }, - .detectSize = { 130, 100 }, - } - }, .animations = DARK_TROOPA_ANIMS, }, { .id = NPC_DarkTroopa_02, - .settings = &N(NpcSettings_KoopaTroopa), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, - .init = &N(EVS_NpcInit_KoopaTroopa), - .drops = { - .dropFlags = NPC_DROP_FLAG_80, - .itemDropChance = 5, - .itemDrops = { - { ITEM_MUSHROOM, 3, 0 }, - { ITEM_KOOPA_LEAF, 7, 0 }, - }, - .heartDrops = STANDARD_HEART_DROPS(2), - .flowerDrops = STANDARD_FLOWER_DROPS(2), - .minCoinBonus = 1, - .maxCoinBonus = 1, - }, .territory = { .wander = { .isFlying = TRUE, @@ -2155,27 +2124,27 @@ StaticNpc N(NpcData_DarkTroopas)[] = { .detectSize = { 130, 100 }, } }, + .init = &N(EVS_NpcInit_KoopaTroopa), + .settings = &N(NpcSettings_KoopaTroopa), + .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, + .drops = { + .dropFlags = NPC_DROP_FLAG_80, + .itemDropChance = 5, + .itemDrops = { + { ITEM_MUSHROOM, 3, 0 }, + { ITEM_KOOPA_LEAF, 7, 0 }, + }, + .heartDrops = STANDARD_HEART_DROPS(2), + .flowerDrops = STANDARD_FLOWER_DROPS(2), + .minCoinBonus = 1, + .maxCoinBonus = 1, + }, .animations = DARK_TROOPA_ANIMS, }, { .id = NPC_DarkTroopa_03, - .settings = &N(NpcSettings_KoopaTroopa), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, - .init = &N(EVS_NpcInit_KoopaTroopa), - .drops = { - .dropFlags = NPC_DROP_FLAG_80, - .itemDropChance = 5, - .itemDrops = { - { ITEM_MUSHROOM, 3, 0 }, - { ITEM_KOOPA_LEAF, 7, 0 }, - }, - .heartDrops = STANDARD_HEART_DROPS(2), - .flowerDrops = STANDARD_FLOWER_DROPS(2), - .minCoinBonus = 1, - .maxCoinBonus = 1, - }, .territory = { .wander = { .isFlying = TRUE, @@ -2188,27 +2157,27 @@ StaticNpc N(NpcData_DarkTroopas)[] = { .detectSize = { 130, 100 }, } }, + .init = &N(EVS_NpcInit_KoopaTroopa), + .settings = &N(NpcSettings_KoopaTroopa), + .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, + .drops = { + .dropFlags = NPC_DROP_FLAG_80, + .itemDropChance = 5, + .itemDrops = { + { ITEM_MUSHROOM, 3, 0 }, + { ITEM_KOOPA_LEAF, 7, 0 }, + }, + .heartDrops = STANDARD_HEART_DROPS(2), + .flowerDrops = STANDARD_FLOWER_DROPS(2), + .minCoinBonus = 1, + .maxCoinBonus = 1, + }, .animations = DARK_TROOPA_ANIMS, }, { .id = NPC_DarkTroopa_04, - .settings = &N(NpcSettings_KoopaTroopa), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, - .init = &N(EVS_NpcInit_KoopaTroopa), - .drops = { - .dropFlags = NPC_DROP_FLAG_80, - .itemDropChance = 5, - .itemDrops = { - { ITEM_MUSHROOM, 3, 0 }, - { ITEM_KOOPA_LEAF, 7, 0 }, - }, - .heartDrops = STANDARD_HEART_DROPS(2), - .flowerDrops = STANDARD_FLOWER_DROPS(2), - .minCoinBonus = 1, - .maxCoinBonus = 1, - }, .territory = { .wander = { .isFlying = TRUE, @@ -2221,27 +2190,27 @@ StaticNpc N(NpcData_DarkTroopas)[] = { .detectSize = { 130, 100 }, } }, + .init = &N(EVS_NpcInit_KoopaTroopa), + .settings = &N(NpcSettings_KoopaTroopa), + .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, + .drops = { + .dropFlags = NPC_DROP_FLAG_80, + .itemDropChance = 5, + .itemDrops = { + { ITEM_MUSHROOM, 3, 0 }, + { ITEM_KOOPA_LEAF, 7, 0 }, + }, + .heartDrops = STANDARD_HEART_DROPS(2), + .flowerDrops = STANDARD_FLOWER_DROPS(2), + .minCoinBonus = 1, + .maxCoinBonus = 1, + }, .animations = DARK_TROOPA_ANIMS, }, { .id = NPC_DarkTroopa_05, - .settings = &N(NpcSettings_KoopaTroopa), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, - .init = &N(EVS_NpcInit_KoopaTroopa), - .drops = { - .dropFlags = NPC_DROP_FLAG_80, - .itemDropChance = 5, - .itemDrops = { - { ITEM_MUSHROOM, 3, 0 }, - { ITEM_KOOPA_LEAF, 7, 0 }, - }, - .heartDrops = STANDARD_HEART_DROPS(2), - .flowerDrops = STANDARD_FLOWER_DROPS(2), - .minCoinBonus = 1, - .maxCoinBonus = 1, - }, .territory = { .wander = { .isFlying = TRUE, @@ -2254,30 +2223,30 @@ StaticNpc N(NpcData_DarkTroopas)[] = { .detectSize = { 130, 100 }, } }, + .init = &N(EVS_NpcInit_KoopaTroopa), + .settings = &N(NpcSettings_KoopaTroopa), + .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, + .drops = { + .dropFlags = NPC_DROP_FLAG_80, + .itemDropChance = 5, + .itemDrops = { + { ITEM_MUSHROOM, 3, 0 }, + { ITEM_KOOPA_LEAF, 7, 0 }, + }, + .heartDrops = STANDARD_HEART_DROPS(2), + .flowerDrops = STANDARD_FLOWER_DROPS(2), + .minCoinBonus = 1, + .maxCoinBonus = 1, + }, .animations = DARK_TROOPA_ANIMS, }, }; -StaticNpc N(NpcData_KoopaTroopas)[] = { +NpcData N(NpcData_KoopaTroopas)[] = { { .id = NPC_KoopaTroopa_01, - .settings = &N(NpcSettings_KoopaTroopa), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, - .init = &N(EVS_NpcInit_KoopaTroopa), - .drops = { - .dropFlags = NPC_DROP_FLAG_80, - .itemDropChance = 5, - .itemDrops = { - { ITEM_MUSHROOM, 3, 0 }, - { ITEM_KOOPA_LEAF, 7, 0 }, - }, - .heartDrops = STANDARD_HEART_DROPS(2), - .flowerDrops = STANDARD_FLOWER_DROPS(2), - .minCoinBonus = 1, - .maxCoinBonus = 1, - }, .territory = { .wander = { .isFlying = TRUE, @@ -2290,27 +2259,27 @@ StaticNpc N(NpcData_KoopaTroopas)[] = { .detectSize = { 130, 100 }, } }, + .init = &N(EVS_NpcInit_KoopaTroopa), + .settings = &N(NpcSettings_KoopaTroopa), + .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, + .drops = { + .dropFlags = NPC_DROP_FLAG_80, + .itemDropChance = 5, + .itemDrops = { + { ITEM_MUSHROOM, 3, 0 }, + { ITEM_KOOPA_LEAF, 7, 0 }, + }, + .heartDrops = STANDARD_HEART_DROPS(2), + .flowerDrops = STANDARD_FLOWER_DROPS(2), + .minCoinBonus = 1, + .maxCoinBonus = 1, + }, .animations = KOOPA_TROOPA_ANIMS, }, { .id = NPC_KoopaTroopa_02, - .settings = &N(NpcSettings_KoopaTroopa), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, - .init = &N(EVS_NpcInit_KoopaTroopa), - .drops = { - .dropFlags = NPC_DROP_FLAG_80, - .itemDropChance = 5, - .itemDrops = { - { ITEM_MUSHROOM, 3, 0 }, - { ITEM_KOOPA_LEAF, 7, 0 }, - }, - .heartDrops = STANDARD_HEART_DROPS(2), - .flowerDrops = STANDARD_FLOWER_DROPS(2), - .minCoinBonus = 1, - .maxCoinBonus = 1, - }, .territory = { .wander = { .isFlying = TRUE, @@ -2323,27 +2292,27 @@ StaticNpc N(NpcData_KoopaTroopas)[] = { .detectSize = { 130, 100 }, } }, + .init = &N(EVS_NpcInit_KoopaTroopa), + .settings = &N(NpcSettings_KoopaTroopa), + .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, + .drops = { + .dropFlags = NPC_DROP_FLAG_80, + .itemDropChance = 5, + .itemDrops = { + { ITEM_MUSHROOM, 3, 0 }, + { ITEM_KOOPA_LEAF, 7, 0 }, + }, + .heartDrops = STANDARD_HEART_DROPS(2), + .flowerDrops = STANDARD_FLOWER_DROPS(2), + .minCoinBonus = 1, + .maxCoinBonus = 1, + }, .animations = KOOPA_TROOPA_ANIMS, }, { .id = NPC_KoopaTroopa_03, - .settings = &N(NpcSettings_KoopaTroopa), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, - .init = &N(EVS_NpcInit_KoopaTroopa), - .drops = { - .dropFlags = NPC_DROP_FLAG_80, - .itemDropChance = 5, - .itemDrops = { - { ITEM_MUSHROOM, 3, 0 }, - { ITEM_KOOPA_LEAF, 7, 0 }, - }, - .heartDrops = STANDARD_HEART_DROPS(2), - .flowerDrops = STANDARD_FLOWER_DROPS(2), - .minCoinBonus = 1, - .maxCoinBonus = 1, - }, .territory = { .wander = { .isFlying = TRUE, @@ -2356,27 +2325,27 @@ StaticNpc N(NpcData_KoopaTroopas)[] = { .detectSize = { 130, 100 }, } }, + .init = &N(EVS_NpcInit_KoopaTroopa), + .settings = &N(NpcSettings_KoopaTroopa), + .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, + .drops = { + .dropFlags = NPC_DROP_FLAG_80, + .itemDropChance = 5, + .itemDrops = { + { ITEM_MUSHROOM, 3, 0 }, + { ITEM_KOOPA_LEAF, 7, 0 }, + }, + .heartDrops = STANDARD_HEART_DROPS(2), + .flowerDrops = STANDARD_FLOWER_DROPS(2), + .minCoinBonus = 1, + .maxCoinBonus = 1, + }, .animations = KOOPA_TROOPA_ANIMS, }, { .id = NPC_KoopaTroopa_04, - .settings = &N(NpcSettings_KoopaTroopa), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, - .init = &N(EVS_NpcInit_KoopaTroopa), - .drops = { - .dropFlags = NPC_DROP_FLAG_80, - .itemDropChance = 5, - .itemDrops = { - { ITEM_MUSHROOM, 3, 0 }, - { ITEM_KOOPA_LEAF, 7, 0 }, - }, - .heartDrops = STANDARD_HEART_DROPS(2), - .flowerDrops = STANDARD_FLOWER_DROPS(2), - .minCoinBonus = 1, - .maxCoinBonus = 1, - }, .territory = { .wander = { .isFlying = TRUE, @@ -2389,15 +2358,42 @@ StaticNpc N(NpcData_KoopaTroopas)[] = { .detectSize = { 130, 100 }, } }, + .init = &N(EVS_NpcInit_KoopaTroopa), + .settings = &N(NpcSettings_KoopaTroopa), + .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, + .drops = { + .dropFlags = NPC_DROP_FLAG_80, + .itemDropChance = 5, + .itemDrops = { + { ITEM_MUSHROOM, 3, 0 }, + { ITEM_KOOPA_LEAF, 7, 0 }, + }, + .heartDrops = STANDARD_HEART_DROPS(2), + .flowerDrops = STANDARD_FLOWER_DROPS(2), + .minCoinBonus = 1, + .maxCoinBonus = 1, + }, .animations = KOOPA_TROOPA_ANIMS, }, { .id = NPC_KoopaTroopa_05, - .settings = &N(NpcSettings_KoopaTroopa), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_RECT, + .centerPos = { 0, 0, 150 }, + .wanderSize = { 130, 100 }, + .detectShape = SHAPE_RECT, + .detectPos = { 0, 0, 150 }, + .detectSize = { 130, 100 }, + } + }, .init = &N(EVS_NpcInit_KoopaTroopa), + .settings = &N(NpcSettings_KoopaTroopa), + .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, .drops = { .dropFlags = NPC_DROP_FLAG_80, .itemDropChance = 5, @@ -2410,35 +2406,15 @@ StaticNpc N(NpcData_KoopaTroopas)[] = { .minCoinBonus = 1, .maxCoinBonus = 1, }, - .territory = { - .wander = { - .isFlying = TRUE, - .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, - .wanderShape = SHAPE_RECT, - .centerPos = { 0, 0, 150 }, - .wanderSize = { 130, 100 }, - .detectShape = SHAPE_RECT, - .detectPos = { 0, 0, 150 }, - .detectSize = { 130, 100 }, - } - }, .animations = KOOPA_TROOPA_ANIMS, }, }; -StaticNpc N(NpcData_Bobombs)[] = { +NpcData N(NpcData_Bobombs)[] = { { .id = NPC_Bobomb_01, - .settings = &N(NpcSettings_Short), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, - .init = &N(EVS_NpcInit_Bobomb), - .drops = { - .dropFlags = NPC_DROP_FLAG_80, - .heartDrops = NO_DROPS, - .flowerDrops = NO_DROPS, - }, .territory = { .wander = { .isFlying = TRUE, @@ -2451,6 +2427,10 @@ StaticNpc N(NpcData_Bobombs)[] = { .detectSize = { 130, 100 }, } }, + .init = &N(EVS_NpcInit_Bobomb), + .settings = &N(NpcSettings_Short), + .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, + .drops = NO_DROPS, .animations = { .idle = ANIM_WorldBobomb_Green_Idle, .walk = ANIM_WorldBobomb_Green_Walk, @@ -2472,16 +2452,8 @@ StaticNpc N(NpcData_Bobombs)[] = { }, { .id = NPC_Bobomb_02, - .settings = &N(NpcSettings_Short), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, - .init = &N(EVS_NpcInit_Bobomb), - .drops = { - .dropFlags = NPC_DROP_FLAG_80, - .heartDrops = NO_DROPS, - .flowerDrops = NO_DROPS, - }, .territory = { .wander = { .isFlying = TRUE, @@ -2494,6 +2466,10 @@ StaticNpc N(NpcData_Bobombs)[] = { .detectSize = { 130, 100 }, } }, + .init = &N(EVS_NpcInit_Bobomb), + .settings = &N(NpcSettings_Short), + .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, + .drops = NO_DROPS, .animations = { .idle = ANIM_WorldBobomb_Green_Idle, .walk = ANIM_WorldBobomb_Green_Walk, @@ -2515,16 +2491,8 @@ StaticNpc N(NpcData_Bobombs)[] = { }, { .id = NPC_Bobomb_03, - .settings = &N(NpcSettings_Short), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, - .init = &N(EVS_NpcInit_Bobomb), - .drops = { - .dropFlags = NPC_DROP_FLAG_80, - .heartDrops = NO_DROPS, - .flowerDrops = NO_DROPS, - }, .territory = { .wander = { .isFlying = TRUE, @@ -2537,6 +2505,10 @@ StaticNpc N(NpcData_Bobombs)[] = { .detectSize = { 130, 100 }, } }, + .init = &N(EVS_NpcInit_Bobomb), + .settings = &N(NpcSettings_Short), + .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, + .drops = NO_DROPS, .animations = { .idle = ANIM_WorldBobomb_Green_Idle, .walk = ANIM_WorldBobomb_Green_Walk, @@ -2558,16 +2530,8 @@ StaticNpc N(NpcData_Bobombs)[] = { }, { .id = NPC_Bobomb_04, - .settings = &N(NpcSettings_Short), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, - .init = &N(EVS_NpcInit_Bobomb), - .drops = { - .dropFlags = NPC_DROP_FLAG_80, - .heartDrops = NO_DROPS, - .flowerDrops = NO_DROPS, - }, .territory = { .wander = { .isFlying = TRUE, @@ -2580,6 +2544,10 @@ StaticNpc N(NpcData_Bobombs)[] = { .detectSize = { 130, 100 }, } }, + .init = &N(EVS_NpcInit_Bobomb), + .settings = &N(NpcSettings_Short), + .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, + .drops = NO_DROPS, .animations = { .idle = ANIM_WorldBobomb_Green_Idle, .walk = ANIM_WorldBobomb_Green_Walk, @@ -2601,16 +2569,8 @@ StaticNpc N(NpcData_Bobombs)[] = { }, { .id = NPC_Bobomb_05, - .settings = &N(NpcSettings_Short), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, - .init = &N(EVS_NpcInit_Bobomb), - .drops = { - .dropFlags = NPC_DROP_FLAG_80, - .heartDrops = NO_DROPS, - .flowerDrops = NO_DROPS, - }, .territory = { .wander = { .isFlying = TRUE, @@ -2623,6 +2583,10 @@ StaticNpc N(NpcData_Bobombs)[] = { .detectSize = { 130, 100 }, } }, + .init = &N(EVS_NpcInit_Bobomb), + .settings = &N(NpcSettings_Short), + .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, + .drops = NO_DROPS, .animations = { .idle = ANIM_WorldBobomb_Green_Idle, .walk = ANIM_WorldBobomb_Green_Walk, diff --git a/src/world/area_kpa/kpa_83/kpa_83_3_npc.c b/src/world/area_kpa/kpa_83/kpa_83_3_npc.c index a30f5e8742..5f5d9a1ef6 100644 --- a/src/world/area_kpa/kpa_83/kpa_83_3_npc.c +++ b/src/world/area_kpa/kpa_83/kpa_83_3_npc.c @@ -498,7 +498,7 @@ EvtScript N(EVS_NpcInit_JrTroopa) = { EVT_END }; -s32 N(ExtraAnims_KoopaBros)[] = { +AnimID N(ExtraAnims_KoopaBros)[] = { ANIM_KoopaBros_Black_Anim1E, ANIM_KoopaBros_Black_Anim04, ANIM_KoopaBros_Black_Anim05, @@ -507,62 +507,62 @@ s32 N(ExtraAnims_KoopaBros)[] = { ANIM_KoopaBros_Black_Anim14, ANIM_KoopaBros_Black_Anim10, ANIM_KoopaBros_Black_Anim15, - -1 + ANIM_LIST_END }; -StaticNpc N(NpcData_Enemies)[] = { +NpcData N(NpcData_Enemies)[] = { { .id = NPC_KoopaBrosBlk, - .settings = &N(NpcSettings_KoopaBros), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 270, - .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | 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 | ENEMY_FLAG_IGNORE_JUMP, .init = &N(EVS_NpcInit_KoopaBros), - .drops = KOOPA_BROS_DROPS, + .settings = &N(NpcSettings_KoopaBros), + .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | 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 | ENEMY_FLAG_IGNORE_JUMP, + .drops = NO_DROPS, .animations = BLACK_KOOPA_BROS_ANIMS, .extraAnimations = N(ExtraAnims_KoopaBros), }, { .id = NPC_KoopaBrosRed, - .settings = &N(NpcSettings_KoopaBros), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 270, - .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | 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 | ENEMY_FLAG_IGNORE_JUMP, .init = &N(EVS_NpcInit_KoopaBros), - .drops = KOOPA_BROS_DROPS, + .settings = &N(NpcSettings_KoopaBros), + .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | 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 | ENEMY_FLAG_IGNORE_JUMP, + .drops = NO_DROPS, .animations = RED_KOOPA_BROS_ANIMS, .extraAnimations = N(ExtraAnims_KoopaBros), }, { .id = NPC_KoopaBrosYlw, - .settings = &N(NpcSettings_KoopaBros), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 270, - .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, .init = &N(EVS_NpcInit_KoopaBros), - .drops = KOOPA_BROS_DROPS, + .settings = &N(NpcSettings_KoopaBros), + .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, + .drops = NO_DROPS, .animations = YELLOW_KOOPA_BROS_ANIMS, .extraAnimations = N(ExtraAnims_KoopaBros), }, { .id = NPC_KoopaBrosGrn, - .settings = &N(NpcSettings_KoopaBros), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 270, - .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | 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 | ENEMY_FLAG_IGNORE_JUMP, .init = &N(EVS_NpcInit_KoopaBros), - .drops = KOOPA_BROS_DROPS, + .settings = &N(NpcSettings_KoopaBros), + .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | 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 | ENEMY_FLAG_IGNORE_JUMP, + .drops = NO_DROPS, .animations = GREEN_KOOPA_BROS_ANIMS, .extraAnimations = N(ExtraAnims_KoopaBros), }, { .id = NPC_JrTroopa, - .settings = &N(NpcSettings_JrTroopa), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 90, - .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | 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 | ENEMY_FLAG_IGNORE_JUMP, .init = &N(EVS_NpcInit_JrTroopa), - .drops = NPC_NO_DROPS, + .settings = &N(NpcSettings_JrTroopa), + .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | 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 | ENEMY_FLAG_IGNORE_JUMP, + .drops = NO_DROPS, .animations = { .idle = ANIM_JrTroopa_Idle, .walk = ANIM_JrTroopa_Walk, @@ -584,12 +584,12 @@ StaticNpc N(NpcData_Enemies)[] = { }, { .id = NPC_Door, - .settings = &N(NpcSettings_Toad_Stationary), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_4000 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, .init = &N(EVS_NpcInit_Door), - .drops = NPC_NO_DROPS, + .settings = &N(NpcSettings_Toad_Stationary), + .flags = ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_4000 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, + .drops = NO_DROPS, .animations = TOAD_RED_ANIMS, }, }; diff --git a/src/world/area_kpa/kpa_91/kpa_91_3_npc.c b/src/world/area_kpa/kpa_91/kpa_91_3_npc.c index c90e23e354..9a9ecb7b7e 100644 --- a/src/world/area_kpa/kpa_91/kpa_91_3_npc.c +++ b/src/world/area_kpa/kpa_91/kpa_91_3_npc.c @@ -2,7 +2,7 @@ #include "world/common/npc/Toad_Stationary.inc.c" #include "world/common/npc/Dryite_Stationary.inc.c" -#include "world/common/enemy/complete/Koopatrol_Patrol.inc.c" +#include "world/common/enemy/Koopatrol_Patrol.inc.c" #include "world/common/complete/ToadHouseBlanketAnim.inc.c" #include "world/common/atomic/ToadHouse.inc.c" @@ -152,48 +152,48 @@ EvtScript N(EVS_NpcInit_Dryite) = { EVT_END }; -StaticNpc N(NpcData_Prisoners)[] = { +NpcData N(NpcData_Prisoners)[] = { { .id = NPC_Toad_01, - .settings = &N(NpcSettings_Toad_Stationary), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_Toad_01), - .drops = TOAD_DROPS, + .settings = &N(NpcSettings_Toad_Stationary), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = NO_DROPS, .animations = TOAD_RED_ANIMS, .tattle = MSG_NpcTattle_KPA_ToadHouseToadA, }, { .id = NPC_Toad_02, - .settings = &N(NpcSettings_Toad_Stationary), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_Toad_02), - .drops = TOAD_DROPS, + .settings = &N(NpcSettings_Toad_Stationary), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = NO_DROPS, .animations = TOAD_RED_ANIMS, .tattle = MSG_NpcTattle_KPA_CaptiveToadC, }, { .id = NPC_ToadGuard, - .settings = &N(NpcSettings_Toad_Stationary), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_ToadGuard), - .drops = TOAD_DROPS, + .settings = &N(NpcSettings_Toad_Stationary), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = NO_DROPS, .animations = TOAD_GUARD_RED_ANIMS, .tattle = MSG_NpcTattle_KPA_CaptiveSoldierB, }, { .id = NPC_Dryite, - .settings = &N(NpcSettings_Dryite), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_Dryite), - .drops = DRYITE_DROPS, + .settings = &N(NpcSettings_Dryite), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = NO_DROPS, .animations = DRYITE_GREEN_ANIMS, .tattle = MSG_NpcTattle_KPA_CaptiveDryite, }, @@ -229,14 +229,10 @@ EvtScript N(EVS_NpcInit_Koopatrol) = { EVT_END }; -StaticNpc N(NpcData_Koopatrol) = { +NpcData N(NpcData_Koopatrol) = { .id = NPC_Koopatrol, - .settings = &N(NpcSettings_Koopatrol_Patrol), .pos = { 60.0f, 0.0f, 55.0f }, .yaw = 270, - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_40000 | ENEMY_FLAG_NO_DROPS, - .init = &N(EVS_NpcInit_Koopatrol), - .drops = KOOPATROL_NO_DROPS, .territory = { .patrol = { .isFlying = TRUE, @@ -251,6 +247,10 @@ StaticNpc N(NpcData_Koopatrol) = { .detectSize = { 200 }, } }, + .init = &N(EVS_NpcInit_Koopatrol), + .settings = &N(NpcSettings_Koopatrol_Patrol), + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_40000 | ENEMY_FLAG_NO_DROPS, + .drops = NO_DROPS, .animations = KOOPATROL_ANIMS, }; diff --git a/src/world/area_kpa/kpa_95/kpa_95_4_npc.c b/src/world/area_kpa/kpa_95/kpa_95_4_npc.c index d473e8bfd1..332571101f 100644 --- a/src/world/area_kpa/kpa_95/kpa_95_4_npc.c +++ b/src/world/area_kpa/kpa_95/kpa_95_4_npc.c @@ -3,7 +3,7 @@ #include "world/common/npc/Toad_Stationary.inc.c" #include "world/common/npc/Penguin.inc.c" -#include "world/common/enemy/complete/Koopatrol_Patrol.inc.c" +#include "world/common/enemy/Koopatrol_Patrol.inc.c" #include "world/common/complete/ToadHouseBlanketAnim.inc.c" #include "world/common/atomic/ToadHouse.inc.c" @@ -153,48 +153,48 @@ EvtScript N(EVS_NpcInit_Penguin) = { EVT_END }; -StaticNpc N(NpcData_Prisoners)[] = { +NpcData N(NpcData_Prisoners)[] = { { .id = NPC_Toad_01, - .settings = &N(NpcSettings_Toad_Stationary), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_Toad_01), - .drops = TOAD_DROPS, + .settings = &N(NpcSettings_Toad_Stationary), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = NO_DROPS, .animations = TOAD_RED_ANIMS, .tattle = MSG_NpcTattle_KPA_ToadHouseToadB, }, { .id = NPC_Toad_02, - .settings = &N(NpcSettings_Toad_Stationary), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_Toad_02), - .drops = TOAD_DROPS, + .settings = &N(NpcSettings_Toad_Stationary), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = NO_DROPS, .animations = TOAD_RED_ANIMS, .tattle = MSG_NpcTattle_KPA_CaptiveToadD, }, { .id = NPC_ToadGuard, - .settings = &N(NpcSettings_Toad_Stationary), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_ToadGuard), - .drops = TOAD_DROPS, + .settings = &N(NpcSettings_Toad_Stationary), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = NO_DROPS, .animations = TOAD_GUARD_RED_ANIMS, .tattle = MSG_NpcTattle_KPA_CaptiveSoldierC, }, { .id = NPC_Penguin, - .settings = &N(NpcSettings_Penguin), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_Penguin), - .drops = PENGUIN_DROPS, + .settings = &N(NpcSettings_Penguin), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = NO_DROPS, .animations = PENGUIN_ANIMS, .tattle = MSG_NpcTattle_KPA_CaptivePenguin, }, @@ -230,14 +230,10 @@ EvtScript N(EVS_NpcInit_Koopatrol) = { EVT_END }; -StaticNpc N(NpcData_Koopatrol) = { +NpcData N(NpcData_Koopatrol) = { .id = NPC_Koopatrol, - .settings = &N(NpcSettings_Koopatrol_Patrol), .pos = { -70.0f, 0.0f, 55.0f }, .yaw = 270, - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_40000 | ENEMY_FLAG_NO_DROPS, - .init = &N(EVS_NpcInit_Koopatrol), - .drops = NPC_NO_DROPS, .territory = { .patrol = { .isFlying = TRUE, @@ -252,6 +248,10 @@ StaticNpc N(NpcData_Koopatrol) = { .detectSize = { 200 }, } }, + .init = &N(EVS_NpcInit_Koopatrol), + .settings = &N(NpcSettings_Koopatrol_Patrol), + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_40000 | ENEMY_FLAG_NO_DROPS, + .drops = NO_DROPS, .animations = KOOPATROL_ANIMS, }; diff --git a/src/world/area_kpa/kpa_96/kpa_96_3_npc.c b/src/world/area_kpa/kpa_96/kpa_96_3_npc.c index 0ed1cc1ee0..f10609d9c2 100644 --- a/src/world/area_kpa/kpa_96/kpa_96_3_npc.c +++ b/src/world/area_kpa/kpa_96/kpa_96_3_npc.c @@ -140,14 +140,14 @@ EvtScript N(EVS_NpcInit_SpikedGoomba) = { EVT_END }; -StaticNpc N(NpcData_SpikedGoomba) = { +NpcData N(NpcData_SpikedGoomba) = { .id = NPC_SpikedGoomba, - .settings = &N(NpcSettings_SpikedGoomba), .pos = { -122.0f, 0.0f, 163.0f }, .yaw = 90, - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_10000 | ENEMY_FLAG_100000 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_SpikedGoomba), - .drops = NPC_NO_DROPS, + .settings = &N(NpcSettings_SpikedGoomba), + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_10000 | ENEMY_FLAG_100000 | ENEMY_FLAG_400000, + .drops = NO_DROPS, .animations = { .idle = ANIM_SpikedGoomba_Idle, .walk = ANIM_SpikedGoomba_Walk, diff --git a/src/world/area_kzn/common/SmokeTexPanners.inc.c b/src/world/area_kzn/common/SmokeTexPanners.inc.c index 1b9b27f591..a9f255a120 100644 --- a/src/world/area_kzn/common/SmokeTexPanners.inc.c +++ b/src/world/area_kzn/common/SmokeTexPanners.inc.c @@ -1,7 +1,6 @@ #include "common.h" #include "world/common/atomic/TexturePan.inc.c" -#include "world/common/atomic/TexturePan.data.inc.c" EvtScript N(EVS_StartTexPanner_SmokeLeft) = { EVT_SET_GROUP(EVT_GROUP_00) diff --git a/src/world/area_kzn/kzn.h b/src/world/area_kzn/kzn.h index 9805455862..41ecbc43ce 100644 --- a/src/world/area_kzn/kzn.h +++ b/src/world/area_kzn/kzn.h @@ -4,6 +4,20 @@ enum { AB_KZN_LastZiplineNpc1 = AreaByte(0), AB_KZN_LastZiplineNpc2 = AreaByte(1), + AB_KZN_Unused_2 = AreaByte(2), + AB_KZN_Unused_3 = AreaByte(3), + AB_KZN_Unused_4 = AreaByte(4), + AB_KZN_Unused_5 = AreaByte(5), + AB_KZN_Unused_6 = AreaByte(6), + AB_KZN_Unused_7 = AreaByte(7), + AB_KZN_Unused_8 = AreaByte(8), + AB_KZN_Unused_9 = AreaByte(9), + AB_KZN_Unused_A = AreaByte(10), + AB_KZN_Unused_B = AreaByte(11), + AB_KZN_Unused_C = AreaByte(12), + AB_KZN_Unused_D = AreaByte(13), + AB_KZN_Unused_E = AreaByte(14), + AB_KZN_Unused_F = AreaByte(15), }; enum { diff --git a/src/world/area_kzn/kzn_01/kzn_01_2_npc.c b/src/world/area_kzn/kzn_01/kzn_01_2_npc.c index 9b55af1053..64c3010e6b 100644 --- a/src/world/area_kzn/kzn_01/kzn_01_2_npc.c +++ b/src/world/area_kzn/kzn_01/kzn_01_2_npc.c @@ -1,6 +1,6 @@ #include "kzn_01.h" -#include "world/common/enemy/complete/PutridPiranhaSentinel.inc.c" +#include "world/common/enemy/PutridPiranhaSentinel.inc.c" EvtScript N(EVS_NpcIdle_PutridPiranha) = { EVT_LABEL(0) @@ -45,14 +45,14 @@ EvtScript N(EVS_NpcInit_PutridPiranha) = { EVT_END }; -StaticNpc N(NpcPutridPiranha) = { +NpcData N(NpcPutridPiranha) = { .id = NPC_PutridPiranha, - .settings = &N(NpcSettings_PutridPiranhaSentinel), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 270, - .flags = ENEMY_FLAG_4 | ENEMY_FLAG_200000, .init = &N(EVS_NpcInit_PutridPiranha), - .drops = PIRANHA_SENTINEL_DROPS, + .settings = &N(NpcSettings_PutridPiranhaSentinel), + .flags = ENEMY_FLAG_4 | ENEMY_FLAG_200000, + .drops = PIRANHA_NO_DROPS, .animations = PIRANHA_SENTINEL_ANIMS, }; diff --git a/src/world/area_kzn/kzn_02/kzn_02_1_main.c b/src/world/area_kzn/kzn_02/kzn_02_1_main.c index 499bf69740..98b659ea4f 100644 --- a/src/world/area_kzn/kzn_02/kzn_02_1_main.c +++ b/src/world/area_kzn/kzn_02/kzn_02_1_main.c @@ -1,7 +1,6 @@ #include "kzn_02.h" #include "world/common/atomic/TexturePan.inc.c" -#include "world/common/atomic/TexturePan.data.inc.c" EvtScript N(EVS_UpdateTexPanner3) = { EVT_SET_GROUP(EVT_GROUP_00) diff --git a/src/world/area_kzn/kzn_02/kzn_02_3_npc.c b/src/world/area_kzn/kzn_02/kzn_02_3_npc.c index edc0895a65..a88d1fd550 100644 --- a/src/world/area_kzn/kzn_02/kzn_02_3_npc.c +++ b/src/world/area_kzn/kzn_02/kzn_02_3_npc.c @@ -1,6 +1,6 @@ #include "kzn_02.h" -#include "world/common/enemy/complete/LavaBubble.inc.c" +#include "world/common/enemy/LavaBubble.inc.c" #include "world/common/npc/Kolorado.inc.c" @@ -62,20 +62,20 @@ EvtScript N(EVS_NpcIdle_Kolorado) = { EVT_SET(LVar0, 2) EVT_LOOP(3) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Kolorado_Panic) - EVT_CALL(ShowSweat, NPC_Kolorado, 1, 45, 1, 0, 0, 0, 0, 20) + EVT_CALL(ShowSweat, NPC_Kolorado, 1, 45, EMOTER_NPC, 0, 0, 0, 0, 20) EVT_CALL(InterpNpcYaw, NPC_SELF, 270, 1) EVT_CALL(NpcMoveTo, NPC_SELF, -655, 0, LVar0) - EVT_CALL(ShowSweat, NPC_Kolorado, 1, -45, 1, 0, 0, 0, 0, 20) + EVT_CALL(ShowSweat, NPC_Kolorado, 1, -45, EMOTER_NPC, 0, 0, 0, 0, 20) EVT_CALL(InterpNpcYaw, NPC_SELF, 90, 1) EVT_CALL(NpcMoveTo, NPC_SELF, -635, 0, LVar0) EVT_MUL(LVar0, 2) EVT_END_LOOP - EVT_CALL(ShowSweat, NPC_Kolorado, 0, 45, 1, 0, 0, 0, 0, 20) + EVT_CALL(ShowSweat, NPC_Kolorado, 0, 45, EMOTER_NPC, 0, 0, 0, 0, 20) EVT_CALL(InterpNpcYaw, NPC_SELF, 270, 2) - EVT_CALL(ShowSweat, NPC_Kolorado, 0, -45, 1, 0, 0, 0, 0, 20) + EVT_CALL(ShowSweat, NPC_Kolorado, 0, -45, EMOTER_NPC, 0, 0, 0, 0, 20) EVT_CALL(InterpNpcYaw, NPC_SELF, 90, 2) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Kolorado_Hurt) - EVT_CALL(ShowSweat, NPC_Kolorado, 0, -45, 1, 0, 0, 0, 0, 20) + EVT_CALL(ShowSweat, NPC_Kolorado, 0, -45, EMOTER_NPC, 0, 0, 0, 0, 20) EVT_CALL(SetSelfVar, 0, 1) EVT_THREAD EVT_LABEL(15) @@ -162,25 +162,22 @@ EvtScript N(EVS_NpcInit_Kolorado) = { EVT_END }; -StaticNpc N(NpcData_Kolorado) = { +NpcData N(NpcData_Kolorado) = { .id = NPC_Kolorado, - .settings = &N(NpcSettings_Kolorado), .pos = { -740.0f, 20.0f, 0.0f }, .yaw = 90, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_10000 | ENEMY_FLAG_100000, .init = &N(EVS_NpcInit_Kolorado), - .drops = KOLORADO_DROPS, + .settings = &N(NpcSettings_Kolorado), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_10000 | ENEMY_FLAG_100000, + .drops = NO_DROPS, .animations = KOLORADO_ANIMS, .tattle = MSG_NpcTattle_Kolorado, }; -StaticNpc N(NpcData_LavaBubble) = { +NpcData N(NpcData_LavaBubble) = { .id = NPC_LavaBubble, - .settings = &N(NpcSettings_LavaBubble), .pos = { 250.0f, 50.0f, 0.0f }, .yaw = 90, - .flags = ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, - .drops = LAVA_BUBBLE_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -193,6 +190,9 @@ StaticNpc N(NpcData_LavaBubble) = { .detectSize = { 70, 200 }, } }, + .settings = &N(NpcSettings_LavaBubble), + .flags = ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = LAVA_BUBBLE_DROPS, .animations = LAVA_BUBBLE_ANIMS, .aiDetectFlags = AI_DETECT_SENSITIVE_MOTION, }; diff --git a/src/world/area_kzn/kzn_03/kzn_03_2_npc.c b/src/world/area_kzn/kzn_03/kzn_03_2_npc.c index 76ccb81dad..c00033a921 100644 --- a/src/world/area_kzn/kzn_03/kzn_03_2_npc.c +++ b/src/world/area_kzn/kzn_03/kzn_03_2_npc.c @@ -1,7 +1,7 @@ #include "kzn_03.h" -#include "world/common/enemy/complete/SpikeTop.inc.c" -#include "world/common/enemy/complete/PutridPiranha.inc.c" +#include "world/common/enemy/SpikeTop.inc.c" +#include "world/common/enemy/PutridPiranha.inc.c" #include "world/common/npc/Dummy.inc.c" #include "world/common/npc/Kolorado.inc.c" @@ -157,49 +157,46 @@ EvtScript N(EVS_NpcInit_ZiplineDummy) = { EVT_END }; -StaticNpc N(NpcData_PassiveNPCs)[] = { +NpcData N(NpcData_PassiveNPCs)[] = { { .id = NPC_Kolorado, - .settings = &N(NpcSettings_Kolorado), .pos = { 392.0f, 470.0f, 218.0f }, .yaw = 90, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_10000 | ENEMY_FLAG_100000, .init = &N(EVS_NpcInit_Kolorado), - .drops = KOLORADO_DROPS, + .settings = &N(NpcSettings_Kolorado), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_10000 | ENEMY_FLAG_100000, + .drops = NO_DROPS, .animations = KOLORADO_ANIMS, .tattle = MSG_NpcTattle_Kolorado, }, { .id = NPC_ZiplineDummy1, - .settings = &N(NpcSettings_Dummy), .pos = { 392.0f, 470.0f, 218.0f }, .yaw = 90, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_200000, .init = &N(EVS_NpcInit_ZiplineDummy), - .drops = KOLORADO_DROPS, + .settings = &N(NpcSettings_Dummy), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_200000, + .drops = NO_DROPS, .animations = KOLORADO_ANIMS, .tattle = MSG_NpcTattle_Kolorado, }, { .id = NPC_ZiplineDummy2, - .settings = &N(NpcSettings_Dummy), .pos = { 392.0f, 470.0f, 218.0f }, .yaw = 90, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_200000, .init = &N(EVS_NpcInit_ZiplineDummy), - .drops = KOLORADO_DROPS, + .settings = &N(NpcSettings_Dummy), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_200000, + .drops = NO_DROPS, .animations = KOLORADO_ANIMS, .tattle = MSG_NpcTattle_Kolorado, }, }; -StaticNpc N(NpcData_SpikeTop_01) = { +NpcData N(NpcData_SpikeTop_01) = { .id = NPC_SpikeTop_01, - .settings = &N(NpcSettings_SpikeTop), .pos = { 140.0f, 670.0f, -20.0f }, .yaw = 90, - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, - .drops = SPIKE_TOP_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -212,17 +209,17 @@ StaticNpc N(NpcData_SpikeTop_01) = { .detectSize = { 240, 115 }, } }, + .settings = &N(NpcSettings_SpikeTop), + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .drops = SPIKE_TOP_DROPS, .animations = SPIKE_TOP_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT | AI_DETECT_SENSITIVE_MOTION, }; -StaticNpc N(NpcData_SpikeTop_02) = { +NpcData N(NpcData_SpikeTop_02) = { .id = NPC_SpikeTop_02, - .settings = &N(NpcSettings_SpikeTop), .pos = { -200.0f, 670.0f, -35.0f }, .yaw = 270, - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, - .drops = SPIKE_TOP_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -235,17 +232,17 @@ StaticNpc N(NpcData_SpikeTop_02) = { .detectSize = { 240, 115 }, } }, + .settings = &N(NpcSettings_SpikeTop), + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .drops = SPIKE_TOP_DROPS, .animations = SPIKE_TOP_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT | AI_DETECT_SENSITIVE_MOTION, }; -StaticNpc N(NpcData_SpikeTop_03) = { +NpcData N(NpcData_SpikeTop_03) = { .id = NPC_SpikeTop_03, - .settings = &N(NpcSettings_SpikeTop), .pos = { 30.0f, 20.0f, 320.0f }, .yaw = 270, - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, - .drops = SPIKE_TOP_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -258,18 +255,18 @@ StaticNpc N(NpcData_SpikeTop_03) = { .detectSize = { 180, 95 }, } }, + .settings = &N(NpcSettings_SpikeTop), + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .drops = SPIKE_TOP_DROPS, .animations = SPIKE_TOP_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT | AI_DETECT_SENSITIVE_MOTION, }; -StaticNpc N(NpcData_PutridPiranha)[] = { +NpcData N(NpcData_PutridPiranha)[] = { { .id = NPC_Piranha, - .settings = &N(NpcSettings_PutridPiranha), .pos = { 260.0f, 20.0f, 255.0f }, .yaw = 270, - .flags = ENEMY_FLAG_400, - .drops = PUTRID_PIRANHA_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -282,6 +279,9 @@ StaticNpc N(NpcData_PutridPiranha)[] = { .detectSize = { 100, 50 }, } }, + .settings = &N(NpcSettings_PutridPiranha), + .flags = ENEMY_FLAG_400, + .drops = PUTRID_PIRANHA_DROPS, .animations = PUTRID_PIRANHA_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT | AI_DETECT_SENSITIVE_MOTION, }, diff --git a/src/world/area_kzn/kzn_04/kzn_04_3_npc.c b/src/world/area_kzn/kzn_04/kzn_04_3_npc.c index b6a6fd6651..0d5056e53d 100644 --- a/src/world/area_kzn/kzn_04/kzn_04_3_npc.c +++ b/src/world/area_kzn/kzn_04/kzn_04_3_npc.c @@ -142,130 +142,130 @@ NpcSettings N(NpcSettings_FireBar_Extra) = { .flags = ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, }; -StaticNpc N(NpcData_FireBar_01)[] = { +NpcData N(NpcData_FireBar_01)[] = { { .id = NPC_FireBar_1A, - .settings = &N(NpcSettings_FireBar_01), .pos = { 0.0f, 0.0f, 0.0f }, .yaw = 0, - .flags = ENEMY_FLAG_PASSIVE, .init = (void*) 0x00004003, + .settings = &N(NpcSettings_FireBar_01), + .flags = ENEMY_FLAG_PASSIVE, .animations = { }, }, { .id = NPC_FireBar_1B, - .settings = &N(NpcSettings_FireBar_Extra), .pos = { 0.0f, 0.0f, 0.0f }, .yaw = 0, - .flags = ENEMY_FLAG_PASSIVE, .init = (void*) 0x00004003, + .settings = &N(NpcSettings_FireBar_Extra), + .flags = ENEMY_FLAG_PASSIVE, .animations = { }, }, { .id = NPC_FireBar_1C, - .settings = &N(NpcSettings_FireBar_Extra), .pos = { 0.0f, 0.0f, 0.0f }, .yaw = 0, - .flags = ENEMY_FLAG_PASSIVE, .init = (void*) 0x00004003, + .settings = &N(NpcSettings_FireBar_Extra), + .flags = ENEMY_FLAG_PASSIVE, .animations = { }, }, { .id = NPC_FireBar_1D, - .settings = &N(NpcSettings_FireBar_Extra), .pos = { 0.0f, 0.0f, 0.0f }, .yaw = 0, - .flags = ENEMY_FLAG_PASSIVE, .init = (void*) 0x00004003, + .settings = &N(NpcSettings_FireBar_Extra), + .flags = ENEMY_FLAG_PASSIVE, .animations = { }, }, }; -StaticNpc N(NpcData_FireBar_02)[] = { +NpcData N(NpcData_FireBar_02)[] = { { .id = NPC_FireBar_2A, - .settings = &N(NpcSettings_FireBar_02), .pos = { 0.0f, 0.0f, 0.0f }, .yaw = 0, - .flags = ENEMY_FLAG_PASSIVE, .init = (void*) 0x00004003, + .settings = &N(NpcSettings_FireBar_02), + .flags = ENEMY_FLAG_PASSIVE, .animations = { }, }, { .id = NPC_FireBar_2B, - .settings = &N(NpcSettings_FireBar_Extra), .pos = { 0.0f, 0.0f, 0.0f }, .yaw = 0, - .flags = ENEMY_FLAG_PASSIVE, .init = (void*) 0x00004003, + .settings = &N(NpcSettings_FireBar_Extra), + .flags = ENEMY_FLAG_PASSIVE, .animations = { }, }, { .id = NPC_FireBar_2C, - .settings = &N(NpcSettings_FireBar_Extra), .pos = { 0.0f, 0.0f, 0.0f }, .yaw = 0, - .flags = ENEMY_FLAG_PASSIVE, .init = (void*) 0x00004003, + .settings = &N(NpcSettings_FireBar_Extra), + .flags = ENEMY_FLAG_PASSIVE, .animations = { }, }, { .id = NPC_FireBar_2D, - .settings = &N(NpcSettings_FireBar_Extra), .pos = { 0.0f, 0.0f, 0.0f }, .yaw = 0, - .flags = ENEMY_FLAG_PASSIVE, .init = (void*) 0x00004003, + .settings = &N(NpcSettings_FireBar_Extra), + .flags = ENEMY_FLAG_PASSIVE, .animations = { }, }, }; -StaticNpc N(NpcData_FireBar_03)[] = { +NpcData N(NpcData_FireBar_03)[] = { { .id = NPC_FireBar_3A, - .settings = &N(NpcSettings_FireBar_03), .pos = { 0.0f, 0.0f, 0.0f }, .yaw = 0, - .flags = ENEMY_FLAG_PASSIVE, .init = (void*) 0x00004003, + .settings = &N(NpcSettings_FireBar_03), + .flags = ENEMY_FLAG_PASSIVE, .animations = { }, }, { .id = NPC_FireBar_3B, - .settings = &N(NpcSettings_FireBar_Extra), .pos = { 0.0f, 0.0f, 0.0f }, .yaw = 0, - .flags = ENEMY_FLAG_PASSIVE, .init = (void*) 0x00004003, + .settings = &N(NpcSettings_FireBar_Extra), + .flags = ENEMY_FLAG_PASSIVE, .animations = { }, }, { .id = NPC_FireBar_3C, - .settings = &N(NpcSettings_FireBar_Extra), .pos = { 0.0f, 0.0f, 0.0f }, .yaw = 0, - .flags = ENEMY_FLAG_PASSIVE, .init = (void*) 0x00004003, + .settings = &N(NpcSettings_FireBar_Extra), + .flags = ENEMY_FLAG_PASSIVE, .animations = { }, }, { .id = NPC_FireBar_3D, - .settings = &N(NpcSettings_FireBar_Extra), .pos = { 0.0f, 0.0f, 0.0f }, .yaw = 0, - .flags = ENEMY_FLAG_PASSIVE, .init = (void*) 0x00004003, + .settings = &N(NpcSettings_FireBar_Extra), + .flags = ENEMY_FLAG_PASSIVE, .animations = { }, }, diff --git a/src/world/area_kzn/kzn_06/kzn_06_1_main.c b/src/world/area_kzn/kzn_06/kzn_06_1_main.c index de7a4e71df..c8a77d7111 100644 --- a/src/world/area_kzn/kzn_06/kzn_06_1_main.c +++ b/src/world/area_kzn/kzn_06/kzn_06_1_main.c @@ -1,7 +1,6 @@ #include "kzn_06.h" #include "world/common/atomic/TexturePan.inc.c" -#include "world/common/atomic/TexturePan.data.inc.c" EvtScript N(EVS_ExitWalk_kzn_05) = EVT_EXIT_WALK(60, kzn_06_ENTRY_0, "kzn_05", kzn_05_ENTRY_0); EvtScript N(EVS_ExitWalk_kzn_08) = EVT_EXIT_WALK(60, kzn_06_ENTRY_2, "kzn_08", kzn_08_ENTRY_0); diff --git a/src/world/area_kzn/kzn_07/kzn_07_2_main.c b/src/world/area_kzn/kzn_07/kzn_07_2_main.c index 3e7ce84e9e..f49c46d0a8 100644 --- a/src/world/area_kzn/kzn_07/kzn_07_2_main.c +++ b/src/world/area_kzn/kzn_07/kzn_07_2_main.c @@ -4,7 +4,6 @@ #include "../common/LavaGlowLighting.inc.c" #include "world/common/atomic/TexturePan.inc.c" -#include "world/common/atomic/TexturePan.data.inc.c" ModelIDList N(LavaModelIDs) = { .count = 1, diff --git a/src/world/area_kzn/kzn_07/kzn_07_4_npc.c b/src/world/area_kzn/kzn_07/kzn_07_4_npc.c index 054655a583..dbc7f8ec24 100644 --- a/src/world/area_kzn/kzn_07/kzn_07_4_npc.c +++ b/src/world/area_kzn/kzn_07/kzn_07_4_npc.c @@ -1,15 +1,12 @@ #include "kzn_07.h" #include "effects.h" -#include "world/common/enemy/complete/LavaBubble.inc.c" +#include "world/common/enemy/LavaBubble.inc.c" -StaticNpc N(NpcData_LavaBubble_01) = { +NpcData N(NpcData_LavaBubble_01) = { .id = NPC_Bubble_01, - .settings = &N(NpcSettings_LavaBubble), .pos = { -200.0f, 50.0f, 150.0f }, .yaw = 90, - .flags = ENEMY_FLAG_400, - .drops = LAVA_BUBBLE_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -22,17 +19,17 @@ StaticNpc N(NpcData_LavaBubble_01) = { .detectSize = { 300 }, } }, + .settings = &N(NpcSettings_LavaBubble), + .flags = ENEMY_FLAG_400, + .drops = LAVA_BUBBLE_DROPS, .animations = LAVA_BUBBLE_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT | AI_DETECT_SENSITIVE_MOTION, }; -StaticNpc N(NpcData_LavaBubble_02) = { +NpcData N(NpcData_LavaBubble_02) = { .id = NPC_Bubble_02, - .settings = &N(NpcSettings_LavaBubble), .pos = { -250.0f, 80.0f, 50.0f }, .yaw = 90, - .flags = ENEMY_FLAG_400, - .drops = LAVA_BUBBLE_DROPS, .territory = { .wander = { .isFlying = FALSE, @@ -45,6 +42,9 @@ StaticNpc N(NpcData_LavaBubble_02) = { .detectSize = { 300 }, } }, + .settings = &N(NpcSettings_LavaBubble), + .flags = ENEMY_FLAG_400, + .drops = LAVA_BUBBLE_DROPS, .animations = LAVA_BUBBLE_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT | AI_DETECT_SENSITIVE_MOTION, }; diff --git a/src/world/area_kzn/kzn_08/kzn_08_1_main.c b/src/world/area_kzn/kzn_08/kzn_08_1_main.c index 585f03d46b..0ff9e82ae2 100644 --- a/src/world/area_kzn/kzn_08/kzn_08_1_main.c +++ b/src/world/area_kzn/kzn_08/kzn_08_1_main.c @@ -4,7 +4,6 @@ #include "../common/LavaGlowLighting.inc.c" #include "world/common/atomic/TexturePan.inc.c" -#include "world/common/atomic/TexturePan.data.inc.c" // can't use kzn_SmokeTexPanners include in this file because of this function API_CALLABLE(func_80240718_C71B98) { diff --git a/src/world/area_kzn/kzn_08/kzn_08_3_npc.c b/src/world/area_kzn/kzn_08/kzn_08_3_npc.c index a4a43e40b2..6c3754e384 100644 --- a/src/world/area_kzn/kzn_08/kzn_08_3_npc.c +++ b/src/world/area_kzn/kzn_08/kzn_08_3_npc.c @@ -1,16 +1,13 @@ #include "kzn_08.h" -#include "world/common/enemy/complete/LavaBubble.inc.c" -#include "world/common/enemy/complete/PutridPiranha.inc.c" +#include "world/common/enemy/LavaBubble.inc.c" +#include "world/common/enemy/PutridPiranha.inc.c" -StaticNpc N(NpcData_PutridPiranha)[] = { +NpcData N(NpcData_PutridPiranha)[] = { { .id = NPC_PutridPiranha, - .settings = &N(NpcSettings_PutridPiranha), .pos = { 80.0f, 0.0f, 135.0f }, .yaw = 270, - .flags = ENEMY_FLAG_100 | ENEMY_FLAG_400, - .drops = PUTRID_PIRANHA_DROPS, .territory = { .wander = { .isFlying = FALSE, @@ -23,6 +20,9 @@ StaticNpc N(NpcData_PutridPiranha)[] = { .detectSize = { 130, 60 }, } }, + .settings = &N(NpcSettings_PutridPiranha), + .flags = ENEMY_FLAG_100 | ENEMY_FLAG_400, + .drops = PUTRID_PIRANHA_DROPS, .animations = PUTRID_PIRANHA_ANIMS, .aiDetectFlags = AI_DETECT_SENSITIVE_MOTION, }, diff --git a/src/world/area_kzn/kzn_09/kzn_09_4_npc.c b/src/world/area_kzn/kzn_09/kzn_09_4_npc.c index a598749f35..4535160ab9 100644 --- a/src/world/area_kzn/kzn_09/kzn_09_4_npc.c +++ b/src/world/area_kzn/kzn_09/kzn_09_4_npc.c @@ -2,8 +2,8 @@ #include "world/common/npc/Kolorado.inc.c" -#include "world/common/enemy/complete/PutridPiranha.inc.c" -#include "world/common/enemy/complete/SpikeTop.inc.c" +#include "world/common/enemy/PutridPiranha.inc.c" +#include "world/common/enemy/SpikeTop.inc.c" NpcSettings N(NpcSettings_Zipline) = { .height = 24, @@ -117,7 +117,7 @@ EvtScript N(EVS_Scene_KoloradoFallsDown) = { EVT_CALL(SetSelfVar, 0, 1) EVT_THREAD EVT_LABEL(3) - EVT_CALL(ShowSweat, NPC_SELF, 1, -45, 1, 0, 0, 0, 0, 20) + EVT_CALL(ShowSweat, NPC_SELF, 1, -45, EMOTER_NPC, 0, 0, 0, 0, 20) EVT_CALL(GetSelfVar, 0, LVar0) EVT_IF_EQ(LVar0, 1) EVT_WAIT(25) @@ -225,38 +225,35 @@ EvtScript N(EVS_Dummy_Init) = { EVT_END }; -StaticNpc N(NpcData_PassiveNPCs)[] = { +NpcData N(NpcData_PassiveNPCs)[] = { { .id = NPC_Kolorado, - .settings = &N(NpcSettings_Kolorado), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 90, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_10000 | ENEMY_FLAG_100000 | ENEMY_FLAG_400000, .init = &N(EVS_Kolorado_Init), - .drops = KOLORADO_DROPS, + .settings = &N(NpcSettings_Kolorado), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_10000 | ENEMY_FLAG_100000 | ENEMY_FLAG_400000, + .drops = NO_DROPS, .animations = KOLORADO_ANIMS, .tattle = MSG_NpcTattle_Kolorado, }, { .id = NPC_ZiplineDummy, - .settings = &N(NpcSettings_Zipline), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 90, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_200000, .init = &N(EVS_Dummy_Init), - .drops = KOLORADO_DROPS, + .settings = &N(NpcSettings_Zipline), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_200000, + .drops = NO_DROPS, .animations = KOLORADO_ANIMS, .tattle = MSG_NpcTattle_Kolorado, }, }; -StaticNpc N(NpcData_SpikeTop) = { +NpcData N(NpcData_SpikeTop) = { .id = NPC_SpikeTop, - .settings = &N(NpcSettings_SpikeTop), .pos = { -100.0f, 350.0f, 50.0f }, .yaw = 270, - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, - .drops = SPIKE_TOP_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -269,18 +266,18 @@ StaticNpc N(NpcData_SpikeTop) = { .detectSize = { 200 }, } }, + .settings = &N(NpcSettings_SpikeTop), + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .drops = SPIKE_TOP_DROPS, .animations = SPIKE_TOP_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT | AI_DETECT_SENSITIVE_MOTION, }; -StaticNpc N(NpcData_PutridPiranha)[] = { +NpcData N(NpcData_PutridPiranha)[] = { { .id = NPC_Piranha, - .settings = &N(NpcSettings_PutridPiranha), .pos = { 200.0f, 350.0f, 100.0f }, .yaw = 270, - .flags = ENEMY_FLAG_400, - .drops = PUTRID_PIRANHA_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -293,6 +290,9 @@ StaticNpc N(NpcData_PutridPiranha)[] = { .detectSize = { 220, 165 }, } }, + .settings = &N(NpcSettings_PutridPiranha), + .flags = ENEMY_FLAG_400, + .drops = PUTRID_PIRANHA_DROPS, .animations = PUTRID_PIRANHA_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT | AI_DETECT_SENSITIVE_MOTION, }, diff --git a/src/world/area_kzn/kzn_11/kzn_11_3_npc.c b/src/world/area_kzn/kzn_11/kzn_11_3_npc.c index 5e9d5ee63f..30d0aadfb8 100644 --- a/src/world/area_kzn/kzn_11/kzn_11_3_npc.c +++ b/src/world/area_kzn/kzn_11/kzn_11_3_npc.c @@ -1,6 +1,6 @@ #include "kzn_11.h" -#include "world/common/enemy/complete/LavaBubble.inc.c" +#include "world/common/enemy/LavaBubble.inc.c" #include "sprite/npc/Fire.h" #include "world/common/enemy/ai/FireBarAI.inc.c" @@ -143,142 +143,139 @@ NpcSettings N(NpcSettings_FireBar_Extra) = { .flags = ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, }; -StaticNpc N(NpcData_FireBar_01)[] = { +NpcData N(NpcData_FireBar_01)[] = { { .id = NPC_FireBar_1A, - .settings = &N(NpcSettings_FireBar_01), .pos = { 0.0f, 0.0f, 0.0f }, .yaw = 0, - .flags = ENEMY_FLAG_PASSIVE, .init = (void*) 0x00004003, + .settings = &N(NpcSettings_FireBar_01), + .flags = ENEMY_FLAG_PASSIVE, .animations = { }, }, { .id = NPC_FireBar_1B, - .settings = &N(NpcSettings_FireBar_Extra), .pos = { 0.0f, 0.0f, 0.0f }, .yaw = 0, - .flags = ENEMY_FLAG_PASSIVE, .init = (void*) 0x00004003, + .settings = &N(NpcSettings_FireBar_Extra), + .flags = ENEMY_FLAG_PASSIVE, .animations = { }, }, { .id = NPC_FireBar_1C, - .settings = &N(NpcSettings_FireBar_Extra), .pos = { 0.0f, 0.0f, 0.0f }, .yaw = 0, - .flags = ENEMY_FLAG_PASSIVE, .init = (void*) 0x00004003, + .settings = &N(NpcSettings_FireBar_Extra), + .flags = ENEMY_FLAG_PASSIVE, .animations = { }, }, { .id = NPC_FireBar_1D, - .settings = &N(NpcSettings_FireBar_Extra), .pos = { 0.0f, 0.0f, 0.0f }, .yaw = 0, - .flags = ENEMY_FLAG_PASSIVE, .init = (void*) 0x00004003, + .settings = &N(NpcSettings_FireBar_Extra), + .flags = ENEMY_FLAG_PASSIVE, .animations = { }, }, }; -StaticNpc N(NpcData_FireBar_02)[] = { +NpcData N(NpcData_FireBar_02)[] = { { .id = NPC_FireBar_2A, - .settings = &N(NpcSettings_FireBar_02), .pos = { 0.0f, 0.0f, 0.0f }, .yaw = 0, - .flags = ENEMY_FLAG_PASSIVE, .init = (void*) 0x00004003, + .settings = &N(NpcSettings_FireBar_02), + .flags = ENEMY_FLAG_PASSIVE, .animations = { }, }, { .id = NPC_FireBar_2B, - .settings = &N(NpcSettings_FireBar_Extra), .pos = { 0.0f, 0.0f, 0.0f }, .yaw = 0, - .flags = ENEMY_FLAG_PASSIVE, .init = (void*) 0x00004003, + .settings = &N(NpcSettings_FireBar_Extra), + .flags = ENEMY_FLAG_PASSIVE, .animations = { }, }, { .id = NPC_FireBar_2C, - .settings = &N(NpcSettings_FireBar_Extra), .pos = { 0.0f, 0.0f, 0.0f }, .yaw = 0, - .flags = ENEMY_FLAG_PASSIVE, .init = (void*) 0x00004003, + .settings = &N(NpcSettings_FireBar_Extra), + .flags = ENEMY_FLAG_PASSIVE, .animations = { }, }, { .id = NPC_FireBar_2D, - .settings = &N(NpcSettings_FireBar_Extra), .pos = { 0.0f, 0.0f, 0.0f }, .yaw = 0, - .flags = ENEMY_FLAG_PASSIVE, .init = (void*) 0x00004003, + .settings = &N(NpcSettings_FireBar_Extra), + .flags = ENEMY_FLAG_PASSIVE, .animations = { }, }, }; -StaticNpc N(NpcData_FireBar_03)[] = { +NpcData N(NpcData_FireBar_03)[] = { { .id = NPC_FireBar_3A, - .settings = &N(NpcSettings_FireBar_03), .pos = { 0.0f, 0.0f, 0.0f }, .yaw = 0, - .flags = ENEMY_FLAG_PASSIVE, .init = (void*) 0x00004003, + .settings = &N(NpcSettings_FireBar_03), + .flags = ENEMY_FLAG_PASSIVE, .animations = { }, }, { .id = NPC_FireBar_3B, - .settings = &N(NpcSettings_FireBar_Extra), .pos = { 0.0f, 0.0f, 0.0f }, .yaw = 0, - .flags = ENEMY_FLAG_PASSIVE, .init = (void*) 0x00004003, + .settings = &N(NpcSettings_FireBar_Extra), + .flags = ENEMY_FLAG_PASSIVE, .animations = { }, }, { .id = NPC_FireBar_3C, - .settings = &N(NpcSettings_FireBar_Extra), .pos = { 0.0f, 0.0f, 0.0f }, .yaw = 0, - .flags = ENEMY_FLAG_PASSIVE, .init = (void*) 0x00004003, + .settings = &N(NpcSettings_FireBar_Extra), + .flags = ENEMY_FLAG_PASSIVE, .animations = { }, }, { .id = NPC_FireBar_3D, - .settings = &N(NpcSettings_FireBar_Extra), .pos = { 0.0f, 0.0f, 0.0f }, .yaw = 0, - .flags = ENEMY_FLAG_PASSIVE, .init = (void*) 0x00004003, + .settings = &N(NpcSettings_FireBar_Extra), + .flags = ENEMY_FLAG_PASSIVE, .animations = { }, }, }; -StaticNpc N(NpcData_Bubble_01) = { +NpcData N(NpcData_Bubble_01) = { .id = NPC_Bubble_01, - .settings = &N(NpcSettings_LavaBubble), .pos = { -150.0f, 50.0f, 10.0f }, .yaw = 90, - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, - .drops = LAVA_BUBBLE_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -291,17 +288,17 @@ StaticNpc N(NpcData_Bubble_01) = { .detectSize = { 150 }, } }, + .settings = &N(NpcSettings_LavaBubble), + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = LAVA_BUBBLE_DROPS, .animations = LAVA_BUBBLE_ANIMS, .aiDetectFlags = AI_DETECT_SENSITIVE_MOTION, }; -StaticNpc N(NpcData_Bubble_02) = { +NpcData N(NpcData_Bubble_02) = { .id = NPC_Bubble_02, - .settings = &N(NpcSettings_LavaBubble), .pos = { 150.0f, 50.0f, 10.0f }, .yaw = 270, - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, - .drops = LAVA_BUBBLE_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -314,6 +311,9 @@ StaticNpc N(NpcData_Bubble_02) = { .detectSize = { 150 }, } }, + .settings = &N(NpcSettings_LavaBubble), + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = LAVA_BUBBLE_DROPS, .animations = LAVA_BUBBLE_ANIMS, .aiDetectFlags = AI_DETECT_SENSITIVE_MOTION, }; 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 2702b0e2a9..48822a9477 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 @@ -2,8 +2,8 @@ #include "world/common/npc/Kolorado.inc.c" -#include "world/common/enemy/complete/PutridPiranha.inc.c" -#include "world/common/enemy/complete/SpikeTop.inc.c" +#include "world/common/enemy/PutridPiranha.inc.c" +#include "world/common/enemy/SpikeTop.inc.c" #include "world/common/complete/LetterDelivery.inc.c" @@ -133,26 +133,23 @@ EvtScript N(EVS_NpcInit_Kolorado) = { EVT_END }; -StaticNpc N(NpcData_Kolorado) = { +NpcData N(NpcData_Kolorado) = { .id = NPC_Kolorado, - .settings = &N(NpcSettings_Kolorado), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 90, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_10000 | ENEMY_FLAG_100000 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_Kolorado), - .drops = KOLORADO_DROPS, + .settings = &N(NpcSettings_Kolorado), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_10000 | ENEMY_FLAG_100000 | ENEMY_FLAG_400000, + .drops = NO_DROPS, .animations = KOLORADO_ANIMS, .tattle = MSG_NpcTattle_Kolorado, }; -StaticNpc N(NpcData_Piranha)[] = { +NpcData N(NpcData_Piranha)[] = { { .id = NPC_Piranha, - .settings = &N(NpcSettings_PutridPiranha), .pos = { -325.0f, 0.0f, 150.0f }, .yaw = 270, - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, - .drops = PUTRID_PIRANHA_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -165,19 +162,19 @@ StaticNpc N(NpcData_Piranha)[] = { .detectSize = { 270, 130 }, } }, + .settings = &N(NpcSettings_PutridPiranha), + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = PUTRID_PIRANHA_DROPS, .animations = PUTRID_PIRANHA_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT | AI_DETECT_SENSITIVE_MOTION, }, PUTRID_PIRANHA_HITBOX(NPC_Piranha_Hitbox) }; -StaticNpc N(NpcData_SpikeTop) = { +NpcData N(NpcData_SpikeTop) = { .id = NPC_SpikeTop, - .settings = &N(NpcSettings_SpikeTop), .pos = { -450.0f, 0.0f, 100.0f }, .yaw = 270, - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, - .drops = SPIKE_TOP_DROPS, .territory = { .wander = { .isFlying = FALSE, @@ -190,6 +187,9 @@ StaticNpc N(NpcData_SpikeTop) = { .detectSize = { 270, 130 }, } }, + .settings = &N(NpcSettings_SpikeTop), + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = SPIKE_TOP_DROPS, .animations = SPIKE_TOP_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT | AI_DETECT_SENSITIVE_MOTION, }; diff --git a/src/world/area_kzn/kzn_18/kzn_18_2_npc.c b/src/world/area_kzn/kzn_18/kzn_18_2_npc.c index 0b0a426e36..b5a7ff6431 100644 --- a/src/world/area_kzn/kzn_18/kzn_18_2_npc.c +++ b/src/world/area_kzn/kzn_18/kzn_18_2_npc.c @@ -1,7 +1,7 @@ #include "kzn_18.h" #include "world/common/npc/Kolorado.inc.c" -#include "world/common/enemy/complete/PutridPiranhaSentinel.inc.c" +#include "world/common/enemy/PutridPiranhaSentinel.inc.c" #include "world/common/todo/SetCamera0Flag1000.inc.c" #include "world/common/todo/UnsetCamera0Flag1000.inc.c" @@ -143,26 +143,26 @@ EvtScript N(EVS_NpcInit_Piranha) = { EVT_END }; -StaticNpc N(NpcData_Kolorado) = { +NpcData N(NpcData_Kolorado) = { .id = NPC_Kolorado, - .settings = &N(NpcSettings_Kolorado), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 90, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_10000 | ENEMY_FLAG_100000, .init = &N(EVS_NpcInit_Kolorado), - .drops = KOLORADO_DROPS, + .settings = &N(NpcSettings_Kolorado), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_10000 | ENEMY_FLAG_100000, + .drops = NO_DROPS, .animations = KOLORADO_ANIMS, .tattle = MSG_NpcTattle_Kolorado, }; -StaticNpc N(NpcData_Piranha) = { +NpcData N(NpcData_Piranha) = { .id = NPC_PutridPiranha, - .settings = &N(NpcSettings_PutridPiranhaSentinel), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 270, - .flags = ENEMY_FLAG_4 | ENEMY_FLAG_200000, .init = &N(EVS_NpcInit_Piranha), - .drops = PIRANHA_SENTINEL_DROPS, + .settings = &N(NpcSettings_PutridPiranhaSentinel), + .flags = ENEMY_FLAG_4 | ENEMY_FLAG_200000, + .drops = PIRANHA_NO_DROPS, .animations = PIRANHA_SENTINEL_ANIMS, }; diff --git a/src/world/area_kzn/kzn_19/kzn_19.h b/src/world/area_kzn/kzn_19/kzn_19.h index e99892f7e9..209bccf89a 100644 --- a/src/world/area_kzn/kzn_19/kzn_19.h +++ b/src/world/area_kzn/kzn_19/kzn_19.h @@ -19,6 +19,7 @@ enum { }; enum { + MV_Unk_01 = MapVar(1), MV_VinesData = MapVar(0), MV_BossDefeated = MapVar(10), }; 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 2e97640218..ff74623999 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 @@ -2,6 +2,7 @@ #include "../common/SmokeTexPanners.inc.c" +#define STAR_SPIRIT_DATA_VAR MV_Unk_01 #include "world/common/todo/StarSpiritEffectFunc.inc.c" EvtScript N(EVS_TrySpawningStarCard) = { diff --git a/src/world/area_kzn/kzn_19/kzn_19_3_npc_settings.c b/src/world/area_kzn/kzn_19/kzn_19_3_npc_settings.c index 60312805ff..c2488db38d 100644 --- a/src/world/area_kzn/kzn_19/kzn_19_3_npc_settings.c +++ b/src/world/area_kzn/kzn_19/kzn_19_3_npc_settings.c @@ -2,4 +2,4 @@ #include "world/common/npc/Kolorado.inc.c" #include "world/common/npc/StarSpirit.inc.c" -#include "world/common/enemy/complete/LavaPiranha.inc.c" +#include "world/common/enemy/LavaPiranha.inc.c" 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 c996caba9e..9f10b3cb88 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 @@ -3,7 +3,7 @@ #include "world/common/npc/Kolorado.h" #include "world/common/npc/StarSpirit.h" -#include "world/common/enemy/complete/LavaPiranha.h" +#include "world/common/enemy/LavaPiranha.h" #include "world/common/lava_piranha/part1.inc.c" @@ -613,48 +613,48 @@ EvtScript N(EVS_NpcInit_LavaBud) = { EVT_END }; -StaticNpc N(NpcData_Kolorado) = { +NpcData N(NpcData_Kolorado) = { .id = NPC_Kolorado, - .settings = &N(NpcSettings_Kolorado), .pos = { 380.0f, 250.0f, -330.0f }, .yaw = 90, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_10000 | ENEMY_FLAG_100000 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_Kolorado), - .drops = KOLORADO_DROPS, + .settings = &N(NpcSettings_Kolorado), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_10000 | ENEMY_FLAG_100000 | ENEMY_FLAG_400000, + .drops = NO_DROPS, .animations = KOLORADO_ANIMS, .tattle = MSG_NpcTattle_Kolorado, }; -StaticNpc N(NpcData_Misstar) = { +NpcData N(NpcData_Misstar) = { .id = NPC_Misstar, - .settings = &N(NpcSettings_StarSpirit), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 270, + .settings = &N(NpcSettings_StarSpirit), .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_400000, - .drops = MISSTAR_DROPS, + .drops = NO_DROPS, .animations = MISSTAR_ANIMS, .tattle = MSG_NpcTattle_Misstar, }; -s32 N(ExtraAnims_LavaPiranha)[] = { +AnimID N(ExtraAnims_LavaPiranha)[] = { ANIM_LavaPiranha_Anim03, ANIM_LavaPiranha_Anim0E, - -1 + ANIM_LIST_END }; -s32 N(ExtraAnims_LavaBud)[] = { +AnimID N(ExtraAnims_LavaBud)[] = { ANIM_LavaBud_Anim03, - -1 + ANIM_LIST_END }; -StaticNpc N(NpcData_LavaPiranha)[] = { +NpcData N(NpcData_LavaPiranha)[] = { { .id = NPC_LavaPiranhaHead, - .settings = &N(NpcSettings_LavaPiranhaHead), .pos = { 400.0f, 25.0f, -30.0f }, .yaw = 270, - .flags = ENEMY_FLAG_4 | ENEMY_FLAG_800 | ENEMY_FLAG_40000, .init = &N(EVS_NpcInit_LavaPiranha), + .settings = &N(NpcSettings_LavaPiranhaHead), + .flags = ENEMY_FLAG_4 | ENEMY_FLAG_800 | ENEMY_FLAG_40000, .drops = LAVA_PIRANHA_DROPS, .animations = LAVA_PIRANHA_HEAD_ANIMS, .extraAnimations = N(ExtraAnims_LavaPiranha), @@ -662,11 +662,11 @@ StaticNpc N(NpcData_LavaPiranha)[] = { }, { .id = NPC_LavaBud_01, - .settings = &N(NpcSettings_LavaPiranhaHead), .pos = { 400.0f, 25.0f, -30.0f }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_40000, .init = &N(EVS_NpcInit_LavaBud), + .settings = &N(NpcSettings_LavaPiranhaHead), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_40000, .drops = LAVA_PIRANHA_DROPS, .animations = LAVA_PIRANHA_BUD_ANIMS, .extraAnimations = N(ExtraAnims_LavaBud), @@ -674,11 +674,11 @@ StaticNpc N(NpcData_LavaPiranha)[] = { }, { .id = NPC_LavaBud_02, - .settings = &N(NpcSettings_LavaPiranhaHead), .pos = { 400.0f, 25.0f, -30.0f }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_40000, .init = &N(EVS_NpcInit_LavaBud), + .settings = &N(NpcSettings_LavaPiranhaHead), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_40000, .drops = LAVA_PIRANHA_DROPS, .animations = LAVA_PIRANHA_BUD_ANIMS, .extraAnimations = N(ExtraAnims_LavaBud), diff --git a/src/world/area_kzn/kzn_20/kzn_20_2_main.c b/src/world/area_kzn/kzn_20/kzn_20_2_main.c index 9ed28b2f99..00150c5d61 100644 --- a/src/world/area_kzn/kzn_20/kzn_20_2_main.c +++ b/src/world/area_kzn/kzn_20/kzn_20_2_main.c @@ -2,7 +2,6 @@ #include "effects.h" #include "world/common/atomic/TexturePan.inc.c" -#include "world/common/atomic/TexturePan.data.inc.c" EvtScript N(EVS_ExitWalk_kzn_19_2) = EVT_EXIT_WALK(60, kzn_20_ENTRY_0, "kzn_19", kzn_19_ENTRY_2); EvtScript N(EVS_ExitWalk_kzn_22_0) = EVT_EXIT_WALK(60, kzn_20_ENTRY_1, "kzn_22", kzn_22_ENTRY_0); diff --git a/src/world/area_kzn/kzn_20/kzn_20_3_npc.c b/src/world/area_kzn/kzn_20/kzn_20_3_npc.c index 935a7915e7..280140364d 100644 --- a/src/world/area_kzn/kzn_20/kzn_20_3_npc.c +++ b/src/world/area_kzn/kzn_20/kzn_20_3_npc.c @@ -525,26 +525,26 @@ EvtScript N(EVS_NpcInit_Misstar) = { EVT_END }; -StaticNpc N(NpcData_Kolorado) = { +NpcData N(NpcData_Kolorado) = { .id = NPC_Kolorado, - .settings = &N(NpcSettings_Kolorado), .pos = { -65.0f, 0.0f, 190.0f }, .yaw = 90, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_10000 | ENEMY_FLAG_100000 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_Kolorado), - .drops = KOLORADO_DROPS, + .settings = &N(NpcSettings_Kolorado), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_10000 | ENEMY_FLAG_100000 | ENEMY_FLAG_400000, + .drops = NO_DROPS, .animations = KOLORADO_ANIMS, .tattle = MSG_NpcTattle_Kolorado, }; -StaticNpc N(NpcData_Misstar) = { +NpcData N(NpcData_Misstar) = { .id = NPC_Misstar, - .settings = &N(NpcSettings_StarSpirit), .pos = { 100.0f, 160.0f, 0.0f }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_Misstar), - .drops = MISSTAR_DROPS, + .settings = &N(NpcSettings_StarSpirit), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_400000, + .drops = NO_DROPS, .animations = MISSTAR_ANIMS, .tattle = MSG_NpcTattle_Misstar, }; 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 92b6540f30..581701e325 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 @@ -262,26 +262,26 @@ EvtScript N(EVS_NpcInit_Misstar) = { EVT_END }; -StaticNpc N(NpcData_Kolorado) = { +NpcData N(NpcData_Kolorado) = { .id = NPC_Kolorado, - .settings = &N(NpcSettings_Kolorado), .pos = { 445.0f, 150.0f, 175.0f }, .yaw = 90, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_10000 | ENEMY_FLAG_100000, .init = &N(EVS_NpcInit_Kolorado), - .drops = KOLORADO_DROPS, + .settings = &N(NpcSettings_Kolorado), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_10000 | ENEMY_FLAG_100000, + .drops = NO_DROPS, .animations = KOLORADO_ANIMS, .tattle = MSG_NpcTattle_Kolorado, }; -StaticNpc N(NpcData_Misstar) = { +NpcData N(NpcData_Misstar) = { .id = NPC_Misstar, - .settings = &N(NpcSettings_StarSpirit), .pos = { 285.0f, 160.0f, 80.0f }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_10000 | ENEMY_FLAG_100000, .init = &N(EVS_NpcInit_Misstar), - .drops = MISSTAR_DROPS, + .settings = &N(NpcSettings_StarSpirit), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_10000 | ENEMY_FLAG_100000, + .drops = NO_DROPS, .animations = MISSTAR_ANIMS, .tattle = MSG_NpcTattle_Misstar, }; 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 c82a8b2e96..424628835f 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 @@ -275,26 +275,26 @@ EvtScript N(EVS_NpcInit_Misstar) = { EVT_END }; -StaticNpc N(NpcData_Kolorado) = { +NpcData N(NpcData_Kolorado) = { .id = NPC_Kolorado, - .settings = &N(NpcSettings_Kolorado), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 90, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_10000 | ENEMY_FLAG_100000, .init = &N(EVS_NpcInit_Kolorado), - .drops = KOLORADO_DROPS, + .settings = &N(NpcSettings_Kolorado), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_10000 | ENEMY_FLAG_100000, + .drops = NO_DROPS, .animations = KOLORADO_ANIMS, .tattle = MSG_NpcTattle_Kolorado, }; -StaticNpc N(NpcData_Misstar) = { +NpcData N(NpcData_Misstar) = { .id = NPC_Misstar, - .settings = &N(NpcSettings_StarSpirit), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 270, - .flags = ENEMY_FLAG_4 | ENEMY_FLAG_100000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_8000000 | ENEMY_FLAG_10000000, .init = &N(EVS_NpcInit_Misstar), - .drops = MISSTAR_DROPS, + .settings = &N(NpcSettings_StarSpirit), + .flags = ENEMY_FLAG_4 | ENEMY_FLAG_100000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_8000000 | ENEMY_FLAG_10000000, + .drops = NO_DROPS, .animations = MISSTAR_ANIMS, }; diff --git a/src/world/area_mac/mac.h b/src/world/area_mac/mac.h index 5048817a4b..d383b08123 100644 --- a/src/world/area_mac/mac.h +++ b/src/world/area_mac/mac.h @@ -2,22 +2,22 @@ #define _WORLD_AREA_MAC_MAC_H_ enum { - AB_MAC_0 = AreaByte(0), - AB_MAC_1 = AreaByte(1), - AB_MAC_2 = AreaByte(2), - AB_MAC_3 = AreaByte(3), - AB_MAC_4 = AreaByte(4), - AB_MAC_5 = AreaByte(5), - AB_MAC_6 = AreaByte(6), - AB_MAC_7 = AreaByte(7), - AB_MAC_8 = AreaByte(8), - AB_MAC_9 = AreaByte(9), - AB_MAC_A = AreaByte(10), - AB_MAC_B = AreaByte(11), - AB_MAC_C = AreaByte(12), - AB_MAC_D = AreaByte(13), - AB_MAC_E = AreaByte(14), - AB_MAC_F = AreaByte(15), + AB_MAC_Unused_0 = AreaByte(0), + AB_MAC_Unused_1 = AreaByte(1), + AB_MAC_Unused_2 = AreaByte(2), + AB_MAC_Unused_3 = AreaByte(3), + AB_MAC_Unused_4 = AreaByte(4), + AB_MAC_Unused_5 = AreaByte(5), + AB_MAC_Unused_6 = AreaByte(6), + AB_MAC_Unused_7 = AreaByte(7), + AB_MAC_Unused_8 = AreaByte(8), + AB_MAC_Unused_9 = AreaByte(9), + AB_MAC_Unused_A = AreaByte(10), + AB_MAC_Unused_B = AreaByte(11), + AB_MAC_Unused_C = AreaByte(12), + AB_MAC_Unused_D = AreaByte(13), + AB_MAC_Unused_E = AreaByte(14), + AB_MAC_Unused_F = AreaByte(15), }; enum { diff --git a/src/world/area_mac/mac_00/mac_00_10_shared_npc.c b/src/world/area_mac/mac_00/mac_00_10_shared_npc.c index aafa7c0706..4b7641f04d 100644 --- a/src/world/area_mac/mac_00/mac_00_10_shared_npc.c +++ b/src/world/area_mac/mac_00/mac_00_10_shared_npc.c @@ -572,26 +572,22 @@ EvtScript N(EVS_NpcInit_DojoFan) = { EVT_END }; -StaticNpc N(NpcData_SharedTownsfolk)[] = { +NpcData N(NpcData_SharedTownsfolk)[] = { { .id = NPC_Toad_04, - .settings = &N(NpcSettings_Toad_Stationary_Shared), .pos = { -150.0f, 0.0f, -275.0f }, .yaw = 90, - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_10000 | ENEMY_FLAG_100000, .init = &N(EVS_NpcInit_Toad_04), - .drops = TOAD_DROPS, + .settings = &N(NpcSettings_Toad_Stationary_Shared), + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_10000 | ENEMY_FLAG_100000, + .drops = NO_DROPS, .animations = TOAD_RED_ANIMS, .tattle = MSG_NpcTattle_MAC_GateGuardian, }, { .id = NPC_Toad_05, - .settings = &N(NpcSettings_Toad_Wander_Shared), .pos = { 219.0f, 0.0f, -45.0f }, .yaw = 90, - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_10000, - .init = &N(EVS_NpcInit_Toad_05), - .drops = TOAD_DROPS, .territory = { .patrol = { .isFlying = TRUE, @@ -609,17 +605,17 @@ StaticNpc N(NpcData_SharedTownsfolk)[] = { .detectSize = { 200 }, } }, + .init = &N(EVS_NpcInit_Toad_05), + .settings = &N(NpcSettings_Toad_Wander_Shared), + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_10000, + .drops = NO_DROPS, .animations = TOAD_RED_ANIMS, .tattle = MSG_NpcTattle_MAC_ShopLoiterer, }, { .id = NPC_Toad_06, - .settings = &N(NpcSettings_Toad_Patrol_Shared), .pos = { -290.0f, 0.0f, -120.0f }, .yaw = 90, - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_10000, - .init = &N(EVS_NpcInit_Toad_06), - .drops = TOAD_DROPS, .territory = { .patrol = { .isFlying = TRUE, @@ -634,83 +630,87 @@ StaticNpc N(NpcData_SharedTownsfolk)[] = { .detectSize = { 200 }, } }, + .init = &N(EVS_NpcInit_Toad_06), + .settings = &N(NpcSettings_Toad_Patrol_Shared), + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_10000, + .drops = NO_DROPS, .animations = TOAD_YELLOW_ANIMS, .tattle = MSG_NpcTattle_MAC_NewsEnthusiast, }, { .id = NPC_FickleLover, - .settings = &N(NpcSettings_Toad_Stationary_Shared), .pos = { -40.0f, 0.0f, 61.0f }, .yaw = 90, - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_10000 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_FickleLover), - .drops = TOAD_DROPS, + .settings = &N(NpcSettings_Toad_Stationary_Shared), + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_10000 | ENEMY_FLAG_400000, + .drops = NO_DROPS, .animations = TOAD_BLUE_ANIMS, .tattle = MSG_NpcTattle_MAC_FickleLovers, }, { .id = NPC_ShamelessLover, - .settings = &N(NpcSettings_Toad_Stationary_Shared), .pos = { -15.0f, 0.0f, 60.0f }, .yaw = 270, - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_10000 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_ShamelessLover), - .drops = TOADETTE_DROPS, + .settings = &N(NpcSettings_Toad_Stationary_Shared), + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_10000 | ENEMY_FLAG_400000, + .drops = NO_DROPS, .animations = TOADETTE_PINK_ANIMS, .tattle = MSG_NpcTattle_MAC_ShamelessLover, }, { .id = NPC_KrisT, - .settings = &N(NpcSettings_Toad_Stationary_Shared), .pos = { 426.0f, 20.0f, 268.0f }, .yaw = 90, - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_10000, .init = &N(EVS_NpcInit_KrisT), - .drops = TOADETTE_DROPS, + .settings = &N(NpcSettings_Toad_Stationary_Shared), + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_10000, + .drops = NO_DROPS, .animations = TOADETTE_GREEN_ANIMS, .tattle = MSG_NpcTattle_MAC_ThreeSisters_Eldest, }, { .id = NPC_MissT, - .settings = &N(NpcSettings_Toad_Stationary_Shared), .pos = { 381.0f, 20.0f, 326.0f }, .yaw = 180, - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_10000, .init = &N(EVS_NpcInit_MissT), - .drops = TOADETTE_DROPS, + .settings = &N(NpcSettings_Toad_Stationary_Shared), + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_10000, + .drops = NO_DROPS, .animations = TOADETTE_ORANGE_ANIMS, .tattle = MSG_NpcTattle_MAC_ThreeSisters_Middle, }, { .id = NPC_FelissaT, - .settings = &N(NpcSettings_Toad_Stationary_Shared), .pos = { 476.0f, 20.0f, 326.0f }, .yaw = 270, - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_10000, .init = &N(EVS_NpcInit_FelissaT), - .drops = TOADETTE_DROPS, + .settings = &N(NpcSettings_Toad_Stationary_Shared), + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_10000, + .drops = NO_DROPS, .animations = TOADETTE_PURPLE_ANIMS, .tattle = MSG_NpcTattle_MAC_ThreeSisters_Youngest, }, { .id = NPC_DojoSpectator, - .settings = &N(NpcSettings_Toad_Stationary_Shared), .pos = { 424.0f, 20.0f, -85.0f }, .yaw = 270, - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_10000, .init = &N(EVS_NpcInit_DojoSpectator), - .drops = TOAD_DROPS, + .settings = &N(NpcSettings_Toad_Stationary_Shared), + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_10000, + .drops = NO_DROPS, .animations = TOAD_BLUE_ANIMS, .tattle = MSG_NpcTattle_MAC_DojoSpectator, }, { .id = NPC_DojoFan, - .settings = &N(NpcSettings_Toad_Stationary_Shared), .pos = { 373.0f, 0.0f, 22.0f }, .yaw = 270, - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_10000, .init = &N(EVS_NpcInit_DojoFan), - .drops = TOAD_DROPS, + .settings = &N(NpcSettings_Toad_Stationary_Shared), + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_10000, + .drops = NO_DROPS, .animations = TOAD_YELLOW_ANIMS, .tattle = MSG_NpcTattle_MAC_DojoFanToad, }, diff --git a/src/world/area_mac/mac_00/mac_00_11_intro_npc.c b/src/world/area_mac/mac_00/mac_00_11_intro_npc.c index af0fc420a2..56099e9c06 100644 --- a/src/world/area_mac/mac_00/mac_00_11_intro_npc.c +++ b/src/world/area_mac/mac_00/mac_00_11_intro_npc.c @@ -20,47 +20,44 @@ EvtScript N(EVS_NpcInit_Lee_Intro) = { EVT_END }; -s32 N(ExtraAnims_Chan_Intro)[] = { +AnimID N(ExtraAnims_Chan_Intro)[] = { ANIM_Chan_Still, ANIM_Chan_Idle, ANIM_Chan_Run, - -1 + ANIM_LIST_END }; -s32 N(ExtraAnims_Lee_Intro)[] = { +AnimID N(ExtraAnims_Lee_Intro)[] = { ANIM_Lee_Still, ANIM_Lee_Idle, ANIM_Lee_Talk, - -1 + ANIM_LIST_END }; -StaticNpc N(NpcData_IntroNPCs)[] = { +NpcData N(NpcData_IntroNPCs)[] = { { .id = NPC_Luigi_Intro, - .settings = &N(NpcSettings_Luigi_Intro), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 90, + .settings = &N(NpcSettings_Luigi_Intro), .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, - .drops = LUIGI_DROPS, + .drops = NO_DROPS, .animations = LUIGI_ANIMS, }, { .id = NPC_Toad_01, - .settings = &N(NpcSettings_Toad_Stationary_Intro), .pos = { -150.0f, 0.0f, -275.0f }, .yaw = 90, + .settings = &N(NpcSettings_Toad_Stationary_Intro), .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_10000 | ENEMY_FLAG_100000, - .drops = TOAD_DROPS, + .drops = NO_DROPS, .animations = TOAD_RED_ANIMS, .tattle = MSG_NpcTattle_MAC_GateGuardian, }, { .id = NPC_Toad_02, - .settings = &N(NpcSettings_Toad_Wander_Intro), .pos = { 219.0f, 0.0f, -45.0f }, .yaw = 90, - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_10000, - .drops = TOAD_DROPS, .territory = { .patrol = { .isFlying = TRUE, @@ -78,31 +75,30 @@ StaticNpc N(NpcData_IntroNPCs)[] = { .detectSize = { 200 }, } }, + .settings = &N(NpcSettings_Toad_Wander_Intro), + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_10000, + .drops = NO_DROPS, .animations = TOAD_RED_ANIMS, .tattle = MSG_NpcTattle_MAC_ShopLoiterer, }, { .id = NPC_Toad_03, - .settings = &N(NpcSettings_Toad_Stationary_Intro), .pos = { 424.0f, 20.0f, -85.0f }, .yaw = 270, + .settings = &N(NpcSettings_Toad_Stationary_Intro), .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_10000, - .drops = TOAD_DROPS, + .drops = NO_DROPS, .animations = TOAD_BLUE_ANIMS, .tattle = MSG_NpcTattle_MAC_DojoSpectator, }, { .id = NPC_Chan, - .settings = &N(NpcSettings_Toad_Stationary_Intro), .pos = { 310.0f, 115.0f, -390.0f }, .yaw = 45, - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_10000 | ENEMY_FLAG_100000, .init = &N(EVS_NpcInit_Chan_Intro), - .drops = { - .dropFlags = NPC_DROP_FLAG_80, - .heartDrops = NO_DROPS, - .flowerDrops = NO_DROPS, - }, + .settings = &N(NpcSettings_Toad_Stationary_Intro), + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_10000 | ENEMY_FLAG_100000, + .drops = NO_DROPS, .animations = { .idle = ANIM_Chan_Idle, }, @@ -111,16 +107,12 @@ StaticNpc N(NpcData_IntroNPCs)[] = { }, { .id = NPC_Lee, - .settings = &N(NpcSettings_Toad_Stationary_Intro), .pos = { 330.0f, 115.0f, -410.0f }, .yaw = 45, - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_10000 | ENEMY_FLAG_100000, .init = &N(EVS_NpcInit_Lee_Intro), - .drops = { - .dropFlags = NPC_DROP_FLAG_80, - .heartDrops = NO_DROPS, - .flowerDrops = NO_DROPS, - }, + .settings = &N(NpcSettings_Toad_Stationary_Intro), + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_10000 | ENEMY_FLAG_100000, + .drops = NO_DROPS, .animations = { .idle = ANIM_Lee_Idle, }, diff --git a/src/world/area_mac/mac_00/mac_00_13_epilogue_npc.c b/src/world/area_mac/mac_00/mac_00_13_epilogue_npc.c index 3d52707adc..334452fbaf 100644 --- a/src/world/area_mac/mac_00/mac_00_13_epilogue_npc.c +++ b/src/world/area_mac/mac_00/mac_00_13_epilogue_npc.c @@ -137,113 +137,109 @@ EvtScript N(EVS_NpcInit_HarryT_Epilogue) = { EVT_END }; -s32 N(ExtraAnims_Luigi_Epilogue)[] = { +AnimID N(ExtraAnims_Luigi_Epilogue)[] = { ANIM_Luigi_Still, ANIM_Luigi_Idle, ANIM_Luigi_Walk, ANIM_Luigi_Run, ANIM_Luigi_Talk, - -1 + ANIM_LIST_END }; -StaticNpc N(NpcData_Luigi_Epilogue) = { +NpcData N(NpcData_Luigi_Epilogue) = { .id = NPC_Luigi_Epilogue, - .settings = &N(NpcSettings_Luigi_Epilogue), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 90, + .settings = &N(NpcSettings_Luigi_Epilogue), .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, - .drops = LUIGI_DROPS, + .drops = NO_DROPS, .animations = LUIGI_ANIMS, .extraAnimations = N(ExtraAnims_Luigi_Epilogue), }; -s32 N(ExtraAnims_Goompapa_Epilogue)[] = { +AnimID N(ExtraAnims_Goompapa_Epilogue)[] = { ANIM_Goompapa_Still, ANIM_Goompapa_Idle, ANIM_Goompapa_Talk, - -1 + ANIM_LIST_END }; -s32 N(ExtraAnims_Goomama_Epilogue)[] = { +AnimID N(ExtraAnims_Goomama_Epilogue)[] = { ANIM_Goomama_Still, ANIM_Goomama_Idle, ANIM_Goomama_Talk, - -1 + ANIM_LIST_END }; -s32 N(ExtraAnims_Gooma_Epilogue)[] = { +AnimID N(ExtraAnims_Gooma_Epilogue)[] = { ANIM_Gooma_Still, ANIM_Gooma_Idle, ANIM_Gooma_Talk, - -1 + ANIM_LIST_END }; -StaticNpc N(NpcData_GoombaFamilypa_Epilogue)[] = { +NpcData N(NpcData_GoombaFamilypa_Epilogue)[] = { { .id = NPC_Goompapa_Epilogue, - .settings = &N(NpcSettings_GoombaFamily_Epilogue), .pos = { 70.0f, 0.0f, -30.0f }, .yaw = 90, - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_10000, .init = &N(EVS_NpcInit_Goompapa_Epilogue), - .drops = GOOMPAPA_DROPS, + .settings = &N(NpcSettings_GoombaFamily_Epilogue), + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_10000, + .drops = NO_DROPS, .animations = GOOMPAPA_ANIMS, .extraAnimations = N(ExtraAnims_Goompapa_Epilogue), .tattle = MSG_NpcTattle_Goompapa, }, { .id = NPC_Goomama_Epilogue, - .settings = &N(NpcSettings_GoombaFamily_Epilogue), .pos = { 40.0f, 0.0f, 20.0f }, .yaw = 90, - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_10000, .init = &N(EVS_NpcInit_Goomama_Epilogue), - .drops = GOOMAMA_DROPS, + .settings = &N(NpcSettings_GoombaFamily_Epilogue), + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_10000, + .drops = NO_DROPS, .animations = GOOMAMA_ANIMS, .extraAnimations = N(ExtraAnims_Goomama_Epilogue), .tattle = MSG_NpcTattle_Goomama, }, { .id = NPC_Gooma_Epilogue, - .settings = &N(NpcSettings_GoombaFamily_Epilogue), .pos = { 20.0f, 0.0f, -35.0f }, .yaw = 90, - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_10000, .init = &N(EVS_NpcInit_Gooma_Epilogue), - .drops = GOOMA_DROPS, + .settings = &N(NpcSettings_GoombaFamily_Epilogue), + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_10000, + .drops = NO_DROPS, .animations = GOOMA_ANIMS, .extraAnimations = N(ExtraAnims_Gooma_Epilogue), .tattle = MSG_NpcTattle_Gooma, }, }; -s32 N(ExtraAnims_Quizmo_Epilogue)[] = { +AnimID N(ExtraAnims_Quizmo_Epilogue)[] = { ANIM_ChuckQuizmo_Still, ANIM_ChuckQuizmo_Idle, ANIM_ChuckQuizmo_Talk, - -1 + ANIM_LIST_END }; -s32 N(ExtraAnims_VannaT_Epilogue)[] = { +AnimID N(ExtraAnims_VannaT_Epilogue)[] = { ANIM_VannaT_Still, ANIM_VannaT_Happy, ANIM_VannaT_Wave, - -1 + ANIM_LIST_END }; -StaticNpc N(NpcData_ChuckQuizmo_Epilogue)[] = { +NpcData N(NpcData_ChuckQuizmo_Epilogue)[] = { { .id = NPC_ChuckQuizmo, - .settings = &N(NpcSettings_Luigi_Epilogue), .pos = { 545.0f, 20.0f, 150.0f }, .yaw = 30, - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_ChuckQuizmo_Epilogue), - .drops = { - .dropFlags = NPC_DROP_FLAG_80, - .heartDrops = NO_DROPS, - .flowerDrops = NO_DROPS, - }, + .settings = &N(NpcSettings_Luigi_Epilogue), + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, + .drops = NO_DROPS, .animations = { .idle = ANIM_ChuckQuizmo_Idle, .walk = ANIM_ChuckQuizmo_Walk, @@ -267,16 +263,12 @@ StaticNpc N(NpcData_ChuckQuizmo_Epilogue)[] = { }, { .id = NPC_VannaT_Epilogue, - .settings = &N(NpcSettings_Toad_Stationary_Epilogue), .pos = { 500.0f, 20.0f, -130.0f }, .yaw = 270, - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_VannaT_Epilogue), - .drops = { - .dropFlags = NPC_DROP_FLAG_80, - .heartDrops = NO_DROPS, - .flowerDrops = NO_DROPS, - }, + .settings = &N(NpcSettings_Toad_Stationary_Epilogue), + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, + .drops = NO_DROPS, .animations = { .idle = ANIM_VannaT_Still, .walk = ANIM_VannaT_Walk, @@ -321,19 +313,15 @@ s32 N(D_80254964_7FF674_Epilogue)[] = { -1 }; -StaticNpc N(NpcData_DojoMembers_Epilogue)[] = { +NpcData N(NpcData_DojoMembers_Epilogue)[] = { { .id = NPC_TheMaster, - .settings = &N(NpcSettings_Luigi_Epilogue), .pos = { 375.0f, 115.0f, -440.0f }, .yaw = 225, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_10000, .init = &N(EVS_NpcInit_TheMaster_Epilogue), - .drops = { - .dropFlags = NPC_DROP_FLAG_80, - .heartDrops = NO_DROPS, - .flowerDrops = NO_DROPS, - }, + .settings = &N(NpcSettings_Luigi_Epilogue), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_10000, + .drops = NO_DROPS, .animations = { .idle = ANIM_TheMaster_Idle, .walk = ANIM_TheMaster_Still, @@ -357,16 +345,12 @@ StaticNpc N(NpcData_DojoMembers_Epilogue)[] = { }, { .id = NPC_Chan, - .settings = &N(NpcSettings_Luigi_Epilogue), .pos = { 310.0f, 115.0f, -390.0f }, .yaw = 45, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_10000, .init = &N(EVS_NpcInit_Chan_Epilogue), - .drops = { - .dropFlags = NPC_DROP_FLAG_80, - .heartDrops = NO_DROPS, - .flowerDrops = NO_DROPS, - }, + .settings = &N(NpcSettings_Luigi_Epilogue), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_10000, + .drops = NO_DROPS, .animations = { .idle = ANIM_Chan_Idle, }, @@ -375,16 +359,12 @@ StaticNpc N(NpcData_DojoMembers_Epilogue)[] = { }, { .id = NPC_Lee, - .settings = &N(NpcSettings_Luigi_Epilogue), .pos = { 330.0f, 115.0f, -410.0f }, .yaw = 45, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_10000, .init = &N(EVS_NpcInit_Lee_Epilogue), - .drops = { - .dropFlags = NPC_DROP_FLAG_80, - .heartDrops = NO_DROPS, - .flowerDrops = NO_DROPS, - }, + .settings = &N(NpcSettings_Luigi_Epilogue), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_10000, + .drops = NO_DROPS, .animations = { .idle = ANIM_Lee_Idle, }, @@ -393,26 +373,22 @@ StaticNpc N(NpcData_DojoMembers_Epilogue)[] = { }, }; -s32 N(ExtraAnims_HarryT_Epilogue)[] = { +AnimID N(ExtraAnims_HarryT_Epilogue)[] = { ANIM_HarryT_Still, ANIM_HarryT_Idle, ANIM_HarryT_Talk, - -1 + ANIM_LIST_END }; -StaticNpc N(NpcData_Toad_01_Epilogue)[] = { +NpcData N(NpcData_Toad_01_Epilogue)[] = { { .id = NPC_Toad_01, - .settings = &N(NpcSettings_Toad_Stationary_Epilogue), .pos = { 430.0f, 20.0f, -373.0f }, .yaw = 223, - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_10000 | ENEMY_FLAG_100000, .init = &N(EVS_NpcInit_Toad_01_Epilogue), - .drops = { - .dropFlags = NPC_DROP_FLAG_80, - .heartDrops = NO_DROPS, - .flowerDrops = NO_DROPS, - }, + .settings = &N(NpcSettings_Toad_Stationary_Epilogue), + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_10000 | ENEMY_FLAG_100000, + .drops = NO_DROPS, .animations = { .idle = ANIM_HarryT_Idle, .walk = ANIM_HarryT_Walk, @@ -425,16 +401,12 @@ StaticNpc N(NpcData_Toad_01_Epilogue)[] = { }, { .id = NPC_HarryT, - .settings = &N(NpcSettings_Toad_Stationary_Epilogue), .pos = { 410.0f, 20.0f, -320.0f }, .yaw = 43, - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_10000 | ENEMY_FLAG_100000, .init = &N(EVS_NpcInit_HarryT_Epilogue), - .drops = { - .dropFlags = NPC_DROP_FLAG_80, - .heartDrops = NO_DROPS, - .flowerDrops = NO_DROPS, - }, + .settings = &N(NpcSettings_Toad_Stationary_Epilogue), + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_10000 | ENEMY_FLAG_100000, + .drops = NO_DROPS, .animations = { .idle = ANIM_HarryT_Idle, .walk = ANIM_HarryT_Walk, @@ -447,8 +419,8 @@ StaticNpc N(NpcData_Toad_01_Epilogue)[] = { }, }; -extern StaticNpc N(NpcData_SharedTownsfolk)[9]; //@bug this NPC list actually has 10 NPCs in it... -extern StaticNpc N(NpcData_Waterfront_Family)[4]; +extern NpcData N(NpcData_SharedTownsfolk)[9]; //@bug this NPC list actually has 10 NPCs in it... +extern NpcData N(NpcData_Waterfront_Family)[4]; NpcGroupList N(EpilogueNPCs) = { NPC_GROUP(N(NpcData_Luigi_Epilogue)), diff --git a/src/world/area_mac/mac_00/mac_00_2_main.c b/src/world/area_mac/mac_00/mac_00_2_main.c index 9032b89071..b9773a98e4 100644 --- a/src/world/area_mac/mac_00/mac_00_2_main.c +++ b/src/world/area_mac/mac_00/mac_00_2_main.c @@ -3,7 +3,6 @@ #include "world/common/entity/Pipe.inc.c" #include "world/common/atomic/TexturePan.inc.c" -#include "world/common/atomic/TexturePan.data.inc.c" API_CALLABLE(N(DummyColliderFunction)) { Bytecode* args = script->ptrReadPos; 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 4ed7d8b309..d3ce399a31 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_Stationary.inc.c" +#include "world/common/enemy/ShyGuy_Stationary.inc.c" #include "world/common/npc/Dummy.inc.c" #define CHUCK_QUIZMO_NPC_ID NPC_ChuckQuizmo @@ -28,9 +28,9 @@ EvtScript N(EVS_NpcAI_ShyGuy_03) = { EVT_CALL(NpcFacePlayer, NPC_ShyGuy_02, 0) EVT_WAIT(10) EVT_CALL(SpeakToPlayer, NPC_ShyGuy_02, ANIM_ShyGuy_Red_Anim11, ANIM_ShyGuy_Red_Anim01, 0, MSG_MAC_Gate_0002) - EVT_CALL(ShowSweat, 22, 1, 45, 1, 0, 0, 0, 0, 20) + EVT_CALL(ShowSweat, NPC_ShyGuy_02, 1, 45, EMOTER_NPC, 0, 0, 0, 0, 20) EVT_WAIT(10) - EVT_CALL(ShowSweat, 22, 1, 45, 1, 0, 0, 0, 0, 20) + EVT_CALL(ShowSweat, NPC_ShyGuy_02, 1, 45, EMOTER_NPC, 0, 0, 0, 0, 20) EVT_WAIT(10) EVT_THREAD EVT_CALL(SetPlayerSpeed, EVT_FLOAT(2.0)) @@ -184,53 +184,49 @@ EvtScript N(EVS_NpcInit_Toad_02) = { #include "npc/waterfront_family.inc.c" #include "npc/trading_toad.inc.c" -StaticNpc N(NpcData_ShyGuy_01)[] = { +NpcData N(NpcData_ShyGuy_01)[] = { { .id = NPC_ShyGuyThief, - .settings = &N(NpcSettings_ShyGuy_Stationary), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_10000 | ENEMY_FLAG_100000 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_ShyGuyThief), - .drops = SHY_GUY_NO_DROPS, + .settings = &N(NpcSettings_ShyGuy_Stationary), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_10000 | ENEMY_FLAG_100000 | ENEMY_FLAG_400000, + .drops = 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_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_10000 | ENEMY_FLAG_100000 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_ShyGuy_02), - .drops = SHY_GUY_NO_DROPS, + .settings = &N(NpcSettings_ShyGuy_Stationary), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_10000 | ENEMY_FLAG_100000 | ENEMY_FLAG_400000, + .drops = NO_DROPS, .animations = RED_SHY_GUY_ANIMS, .tattle = MSG_NpcTattle_MAC_ShyGuyShopOwner, }, { .id = NPC_GardenShyGuy1, - .settings = &N(NpcSettings_ShyGuy_Stationary), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 270, - .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_IGNORE_TOUCH, .init = &N(EVS_NpcInit_GardenShyGuy1), - .drops = SHY_GUY_NO_DROPS, + .settings = &N(NpcSettings_ShyGuy_Stationary), + .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_IGNORE_TOUCH, + .drops = NO_DROPS, .animations = RED_SHY_GUY_ANIMS, .tattle = MSG_NpcTattle_MAC_ShyGuyShopOwner, }, }; -StaticNpc N(NpcData_RussT) = { +NpcData N(NpcData_RussT) = { .id = NPC_RussT, - .settings = &N(NpcSettings_RussT), .pos = { -66.0f, 20.0f, -532.0f }, .yaw = 119, - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_10000 | ENEMY_FLAG_100000, .init = &N(EVS_NpcInit_RussT), - .drops = { - .dropFlags = NPC_DROP_FLAG_80, - .heartDrops = NO_DROPS, - .flowerDrops = NO_DROPS, - }, + .settings = &N(NpcSettings_RussT), + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_10000 | ENEMY_FLAG_100000, + .drops = NO_DROPS, .animations = { .idle = ANIM_RussT_Idle, .walk = ANIM_RussT_Idle, @@ -252,19 +248,15 @@ StaticNpc N(NpcData_RussT) = { .tattle = MSG_NpcTattle_RussT, }; -StaticNpc N(NpcData_Toad_01)[] = { +NpcData N(NpcData_Toad_01)[] = { { .id = NPC_Toad_01, - .settings = &N(NpcSettings_Toad_Stationary), .pos = { 430.0f, 20.0f, -373.0f }, .yaw = 223, - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_10000 | ENEMY_FLAG_100000, .init = &N(EVS_NpcInit_Toad_01), - .drops = { - .dropFlags = NPC_DROP_FLAG_80, - .heartDrops = NO_DROPS, - .flowerDrops = NO_DROPS, - }, + .settings = &N(NpcSettings_Toad_Stationary), + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_10000 | ENEMY_FLAG_100000, + .drops = NO_DROPS, .animations = { .idle = ANIM_HarryT_Idle, .walk = ANIM_HarryT_Walk, @@ -276,16 +268,12 @@ StaticNpc N(NpcData_Toad_01)[] = { }, { .id = NPC_Toad_02, - .settings = &N(NpcSettings_Toad_Stationary), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 223, - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_10000 | ENEMY_FLAG_100000, .init = &N(EVS_NpcInit_Toad_02), - .drops = { - .dropFlags = NPC_DROP_FLAG_80, - .heartDrops = NO_DROPS, - .flowerDrops = NO_DROPS, - }, + .settings = &N(NpcSettings_Toad_Stationary), + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_10000 | ENEMY_FLAG_100000, + .drops = NO_DROPS, .animations = { .idle = ANIM_HarryT_Idle, .walk = ANIM_HarryT_Walk, @@ -321,19 +309,15 @@ s32 N(D_8024D024_7F7D34)[] = { -1 }; -StaticNpc N(NpcData_Toad_03)[] = { +NpcData N(NpcData_Toad_03)[] = { { .id = NPC_TheMaster, - .settings = &N(NpcSettings_Dummy), .pos = { 375.0f, 115.0f, -440.0f }, .yaw = 225, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_10000 | ENEMY_FLAG_40000 | ENEMY_FLAG_NO_DROPS, .init = &N(EVS_NpcInit_TheMaster), - .drops = { - .dropFlags = NPC_DROP_FLAG_80, - .heartDrops = NO_DROPS, - .flowerDrops = NO_DROPS, - }, + .settings = &N(NpcSettings_Dummy), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_10000 | ENEMY_FLAG_40000 | ENEMY_FLAG_NO_DROPS, + .drops = NO_DROPS, .animations = { .idle = ANIM_TheMaster_Idle, .walk = ANIM_TheMaster_Still, @@ -357,16 +341,12 @@ StaticNpc N(NpcData_Toad_03)[] = { }, { .id = NPC_Chan, - .settings = &N(NpcSettings_Dummy), .pos = { 310.0f, 115.0f, -390.0f }, .yaw = 45, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_10000 | ENEMY_FLAG_40000 | ENEMY_FLAG_NO_DROPS, .init = &N(EVS_NpcInit_Chan), - .drops = { - .dropFlags = NPC_DROP_FLAG_80, - .heartDrops = NO_DROPS, - .flowerDrops = NO_DROPS, - }, + .settings = &N(NpcSettings_Dummy), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_10000 | ENEMY_FLAG_40000 | ENEMY_FLAG_NO_DROPS, + .drops = NO_DROPS, .animations = { .idle = ANIM_Chan_Idle, }, @@ -375,16 +355,12 @@ StaticNpc N(NpcData_Toad_03)[] = { }, { .id = NPC_Lee, - .settings = &N(NpcSettings_Dummy), .pos = { 330.0f, 115.0f, -410.0f }, .yaw = 45, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_10000 | ENEMY_FLAG_40000 | ENEMY_FLAG_NO_DROPS, .init = &N(EVS_NpcInit_Lee), - .drops = { - .dropFlags = NPC_DROP_FLAG_80, - .heartDrops = NO_DROPS, - .flowerDrops = NO_DROPS, - }, + .settings = &N(NpcSettings_Dummy), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_10000 | ENEMY_FLAG_40000 | ENEMY_FLAG_NO_DROPS, + .drops = NO_DROPS, .animations = { .idle = ANIM_Lee_Idle, }, @@ -393,74 +369,74 @@ StaticNpc N(NpcData_Toad_03)[] = { }, }; -StaticNpc N(NpcData_Quizmo_Unused) = { +NpcData N(NpcData_Quizmo_Unused) = { .id = NPC_ChuckQuizmo, - .settings = &N(NpcSettings_ChuckQuizmo), .pos = { 545.0f, 20.0f, 150.0f }, .yaw = 30, - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_4000, .initVarCount = 1, .initVar = { .bytes = { 0, QUIZ_AREA_MAC, QUIZ_COUNT_MAC, QUIZ_MAP_MAC_00 }}, - .drops = QUIZMO_DROPS, + .settings = &N(NpcSettings_ChuckQuizmo), + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_4000, + .drops = NO_DROPS, .animations = QUIZMO_ANIMS, .tattle = MSG_NpcTattle_ChuckQuizmo, }; -StaticNpc N(NpcData_Waterfront_Family)[] = { +NpcData N(NpcData_Waterfront_Family)[] = { { .id = NPC_Waterfront_Dad, - .settings = &N(NpcSettings_Toad_Stationary), .pos = { -496.0f, 20.0f, 218.0f }, .yaw = 133, - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_10000 | ENEMY_FLAG_100000, .init = &N(EVS_NpcInit_WaterfrontDad), - .drops = TOAD_DROPS, + .settings = &N(NpcSettings_Toad_Stationary), + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_10000 | ENEMY_FLAG_100000, + .drops = NO_DROPS, .animations = TOAD_GREEN_ANIMS, .tattle = MSG_NpcTattle_MAC_LuckyCastleWorker, }, { .id = NPC_Waterfront_Mom, - .settings = &N(NpcSettings_Toad_Stationary), .pos = { -566.0f, 20.0f, 267.0f }, .yaw = 133, - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_10000 | ENEMY_FLAG_100000, .init = &N(EVS_NpcInit_WaterfrontMom), - .drops = TOADETTE_DROPS, + .settings = &N(NpcSettings_Toad_Stationary), + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_10000 | ENEMY_FLAG_100000, + .drops = NO_DROPS, .animations = TOADETTE_ORANGE_ANIMS, .tattle = MSG_NpcTattle_MAC_Homemaker, }, { .id = NPC_Waterfront_Kid1, - .settings = &N(NpcSettings_Toad_Stationary), .pos = { -508.0f, 20.0f, 324.0f }, .yaw = 313, - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_10000 | ENEMY_FLAG_100000, .init = &N(EVS_NpcInit_WaterfrontKid1), - .drops = TOAD_KID_DROPS, + .settings = &N(NpcSettings_Toad_Stationary), + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_10000 | ENEMY_FLAG_100000, + .drops = NO_DROPS, .animations = TOAD_KID_GREEN_ANIMS, .tattle = MSG_NpcTattle_MAC_FriendlyToadKid, }, { .id = NPC_Waterfront_Kid2, - .settings = &N(NpcSettings_Toad_Stationary), .pos = { -480.0f, 20.0f, 329.0f }, .yaw = 313, - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_10000 | ENEMY_FLAG_100000, .init = &N(EVS_NpcInit_WaterfrontKid2), - .drops = TOAD_KID_DROPS, + .settings = &N(NpcSettings_Toad_Stationary), + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_10000 | ENEMY_FLAG_100000, + .drops = NO_DROPS, .animations = TOAD_KID_GREEN_ANIMS, .tattle = MSG_NpcTattle_MAC_PowerHungryToadKid, }, }; -StaticNpc N(NpcData_PrizeToad) = { +NpcData N(NpcData_PrizeToad) = { .id = NPC_Toad_11, - .settings = &N(NpcSettings_Toad_Stationary), .pos = { -112.0f, 0.0f, -62.0f }, .yaw = 90, - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_10000 | ENEMY_FLAG_100000, .init = &N(EVS_NpcInit_TradingToad), - .drops = TOAD_DROPS, + .settings = &N(NpcSettings_Toad_Stationary), + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_10000 | ENEMY_FLAG_100000, + .drops = NO_DROPS, .animations = { .idle = ANIM_Toad_Pink_Idle, .walk = ANIM_Toad_Pink_Walk, @@ -482,7 +458,7 @@ StaticNpc N(NpcData_PrizeToad) = { .tattle = MSG_NpcTattle_PrizeToad, }; -extern StaticNpc N(NpcData_SharedTownsfolk)[10]; +extern NpcData N(NpcData_SharedTownsfolk)[10]; NpcGroupList N(DefaultNPCs) = { NPC_GROUP(N(NpcData_Toad_03)), diff --git a/src/world/area_mac/mac_01/mac_01_10_intro_npc.c b/src/world/area_mac/mac_01/mac_01_10_intro_npc.c index 54ef8e8723..0932280f91 100644 --- a/src/world/area_mac/mac_01/mac_01_10_intro_npc.c +++ b/src/world/area_mac/mac_01/mac_01_10_intro_npc.c @@ -6,33 +6,30 @@ #include "world/common/npc/Toad_Stationary.inc.c" #define NAME_SUFFIX -StaticNpc N(NpcData_IntroNPCs)[] = { +NpcData N(NpcData_IntroNPCs)[] = { { .id = NPC_Luigi, - .settings = &N(NpcSettings_Luigi_Intro), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 90, + .settings = &N(NpcSettings_Luigi_Intro), .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, - .drops = LUIGI_DROPS, + .drops = NO_DROPS, .animations = LUIGI_ANIMS, }, { .id = NPC_IntroToad1, - .settings = &N(NpcSettings_Toad_Stationary_Intro), .pos = { -94.0f, 0.0f, -117.0f }, .yaw = 90, + .settings = &N(NpcSettings_Toad_Stationary_Intro), .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, - .drops = TOAD_DROPS, + .drops = NO_DROPS, .animations = TOAD_RED_ANIMS, .tattle = MSG_NpcTattle_MAC_RunsHisMouth, }, { .id = NPC_IntroToad2, - .settings = &N(NpcSettings_Toad_Stationary_Intro), .pos = { 40.0f, 0.0f, -300.0f }, .yaw = 270, - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, - .drops = TOAD_DROPS, .territory = { .patrol = { .isFlying = TRUE, @@ -47,16 +44,19 @@ StaticNpc N(NpcData_IntroNPCs)[] = { .detectSize = { 10 }, } }, + .settings = &N(NpcSettings_Toad_Stationary_Intro), + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, + .drops = NO_DROPS, .animations = TOAD_YELLOW_ANIMS, .tattle = MSG_NpcTattle_MAC_PrincessFan, }, { .id = NPC_IntroToad3, - .settings = &N(NpcSettings_Toad_Stationary_Intro), .pos = { -380.0f, 20.0f, -100.0f }, .yaw = 270, + .settings = &N(NpcSettings_Toad_Stationary_Intro), .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, - .drops = TOAD_DROPS, + .drops = NO_DROPS, .animations = TOAD_GREEN_ANIMS, .tattle = MSG_NpcTattle_MAC_SeeksTheSouth, }, diff --git a/src/world/area_mac/mac_01/mac_01_11_epilogue_npc.c b/src/world/area_mac/mac_01/mac_01_11_epilogue_npc.c index cc14013183..ca7794dfa0 100644 --- a/src/world/area_mac/mac_01/mac_01_11_epilogue_npc.c +++ b/src/world/area_mac/mac_01/mac_01_11_epilogue_npc.c @@ -160,119 +160,115 @@ EvtScript N(EVS_NpcInit_Composer) = { EVT_END }; -s32 N(ExtraAnims_Kolorado)[] = { +AnimID N(ExtraAnims_Kolorado)[] = { ANIM_Kolorado_Still, ANIM_Kolorado_Idle, ANIM_Kolorado_Talk, - -1 + ANIM_LIST_END }; -s32 N(ExtraAnims_KoloradoWife)[] = { +AnimID N(ExtraAnims_KoloradoWife)[] = { ANIM_KoloradoWife_Still, ANIM_KoloradoWife_Idle, ANIM_KoloradoWife_Talk, - -1 + ANIM_LIST_END }; -s32 N(ExtraAnims_KoopaKoot)[] = { +AnimID N(ExtraAnims_KoopaKoot)[] = { ANIM_KoopaKoot_Still, ANIM_KoopaKoot_Idle, ANIM_KoopaKoot_Talk, - -1 + ANIM_LIST_END }; -s32 N(ExtraAnims_Koopa)[] = { +AnimID N(ExtraAnims_Koopa)[] = { ANIM_Koopa_Still, ANIM_Koopa_Idle, ANIM_Koopa_Talk, - -1 + ANIM_LIST_END }; -s32 N(ExtraAnims_Bobomb)[] = { +AnimID N(ExtraAnims_Bobomb)[] = { ANIM_WorldBobomb_Green_Still, ANIM_WorldBobomb_Green_Idle, ANIM_WorldBobomb_Green_Talk, - -1 + ANIM_LIST_END }; -StaticNpc N(NpcData_Koopas)[] = { +NpcData N(NpcData_Koopas)[] = { { .id = NPC_Kolorado, - .settings = &N(NpcSettings_Kolorado), .pos = { 60.0f, 0.0f, -120.0f }, .yaw = 90, - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_Kolorado), - .drops = KOLORADO_DROPS, + .settings = &N(NpcSettings_Kolorado), + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, + .drops = NO_DROPS, .animations = KOLORADO_ANIMS, .extraAnimations = N(ExtraAnims_Kolorado), }, { .id = NPC_KoloradoWife, - .settings = &N(NpcSettings_KoloradoWife), .pos = { 100.0f, 0.0f, -110.0f }, .yaw = 270, - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_KoloradoWife), - .drops = KOLORADO_WIFE_DROPS, + .settings = &N(NpcSettings_KoloradoWife), + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, + .drops = NO_DROPS, .animations = KOLORADO_WIFE_ANIMS, .extraAnimations = N(ExtraAnims_KoloradoWife), }, { .id = NPC_KoopaKoot, - .settings = &N(NpcSettings_KoopaKoot), .pos = { -330.0f, 0.0f, 330.0f }, .yaw = 90, - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_KoopaKoot), - .drops = KOOPA_KOOT_DROPS, + .settings = &N(NpcSettings_KoopaKoot), + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, + .drops = NO_DROPS, .animations = KOOPA_KOOT_ANIMS, .extraAnimations = N(ExtraAnims_KoopaKoot), }, { .id = NPC_Koopa, - .settings = &N(NpcSettings_Koopa), .pos = { 300.0f, 20.0f, -100.0f }, .yaw = 270, - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_Koopa), - .drops = KOOPA_DROPS, + .settings = &N(NpcSettings_Koopa), + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, + .drops = NO_DROPS, .animations = KOOPA_ANIMS, .extraAnimations = N(ExtraAnims_Koopa), }, { .id = NPC_Bobomb, - .settings = &N(NpcSettings_Bobomb), .pos = { 252.0f, 20.0f, -100.0f }, .yaw = 90, - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_Bobomb), - .drops = BOBOMB_DROPS, + .settings = &N(NpcSettings_Bobomb), + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, + .drops = NO_DROPS, .animations = BOBOMB_BLUE_ANIMS, .extraAnimations = N(ExtraAnims_Bobomb), }, }; -s32 N(ExtraAnims_Rowf)[] = { +AnimID N(ExtraAnims_Rowf)[] = { ANIM_Rowf_Still, ANIM_Rowf_Idle, ANIM_Rowf_Talk, - -1 + ANIM_LIST_END }; -StaticNpc N(NpcData_RowfAndRhuff)[] = { +NpcData N(NpcData_RowfAndRhuff)[] = { { .id = NPC_Rowf, - .settings = &N(NpcSettings_Dummy), .pos = { -213.0f, -54.0f, 256.0f }, .yaw = 90, - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_Rowf), - .drops = { - .dropFlags = NPC_DROP_FLAG_80, - .heartDrops = NO_DROPS, - .flowerDrops = NO_DROPS, - }, + .settings = &N(NpcSettings_Dummy), + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, + .drops = NO_DROPS, .animations = { .idle = ANIM_Rowf_Idle, }, @@ -281,16 +277,12 @@ StaticNpc N(NpcData_RowfAndRhuff)[] = { }, { .id = NPC_Rhuff, - .settings = &N(NpcSettings_Dummy), .pos = { -250.0f, 0.0f, 263.0f }, .yaw = 90, - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_Rhuff), - .drops = { - .dropFlags = NPC_DROP_FLAG_80, - .heartDrops = NO_DROPS, - .flowerDrops = NO_DROPS, - }, + .settings = &N(NpcSettings_Dummy), + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, + .drops = NO_DROPS, .animations = { .idle = ANIM_Rowf_Idle, }, @@ -299,66 +291,62 @@ StaticNpc N(NpcData_RowfAndRhuff)[] = { }, }; -s32 N(ExtraAnims_Dryite)[] = { +AnimID N(ExtraAnims_Dryite)[] = { ANIM_Dryite_Green_Still, ANIM_Dryite_Green_Idle, ANIM_Dryite_Green_Talk, - -1 + ANIM_LIST_END }; -StaticNpc N(NpcData_Dryites)[] = { +NpcData N(NpcData_Dryites)[] = { { .id = NPC_Dryite_01, - .settings = &N(NpcSettings_Dryite), .pos = { -10.0f, 0.0f, 360.0f }, .yaw = 90, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_Dryite_01), - .drops = DRYITE_DROPS, + .settings = &N(NpcSettings_Dryite), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .drops = NO_DROPS, .animations = DRYITE_GREEN_ANIMS, .extraAnimations = N(ExtraAnims_Dryite), }, { .id = NPC_Dryite_02, - .settings = &N(NpcSettings_Dryite), .pos = { 25.0f, 0.0f, 300.0f }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_Dryite_02), - .drops = DRYITE_DROPS, + .settings = &N(NpcSettings_Dryite), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .drops = NO_DROPS, .animations = DRYITE_GREEN_ANIMS, .extraAnimations = N(ExtraAnims_Dryite), }, }; -s32 N(ExtraAnims_Chanterelle)[] = { +AnimID N(ExtraAnims_Chanterelle)[] = { ANIM_Chanterelle_Still, ANIM_Chanterelle_Idle, ANIM_Chanterelle_Sing, ANIM_Chanterelle_Talk, - -1 + ANIM_LIST_END }; -s32 N(ExtraAnims_Poet)[] = { +AnimID N(ExtraAnims_Poet)[] = { ANIM_Musician_Poet_Still, ANIM_Musician_Poet_Idle, ANIM_Musician_Poet_Talk, - -1 + ANIM_LIST_END }; -StaticNpc N(NpcData_Artists)[] = { +NpcData N(NpcData_Artists)[] = { { .id = NPC_Chanterelle, - .settings = &N(NpcSettings_Toad_Stationary), .pos = { 260.0f, 20.0f, 560.0f }, .yaw = 270, - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_Chanterelle), - .drops = { - .dropFlags = NPC_DROP_FLAG_80, - .heartDrops = NO_DROPS, - .flowerDrops = NO_DROPS, - }, + .settings = &N(NpcSettings_Toad_Stationary), + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, + .drops = NO_DROPS, .animations = { .idle = ANIM_Chanterelle_Idle, .walk = ANIM_Chanterelle_Still, @@ -382,16 +370,12 @@ StaticNpc N(NpcData_Artists)[] = { }, { .id = NPC_Poet, - .settings = &N(NpcSettings_Toad_Stationary), .pos = { 230.0f, 20.0f, 500.0f }, .yaw = 90, - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_Poet), - .drops = { - .dropFlags = NPC_DROP_FLAG_80, - .heartDrops = NO_DROPS, - .flowerDrops = NO_DROPS, - }, + .settings = &N(NpcSettings_Toad_Stationary), + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, + .drops = NO_DROPS, .animations = { .idle = ANIM_Musician_Poet_Idle, .walk = ANIM_Musician_Poet_Idle, @@ -415,16 +399,12 @@ StaticNpc N(NpcData_Artists)[] = { }, { .id = NPC_Composer, - .settings = &N(NpcSettings_Toad_Stationary), .pos = { 300.0f, 20.0f, 500.0f }, .yaw = 270, - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_Composer), - .drops = { - .dropFlags = NPC_DROP_FLAG_80, - .heartDrops = NO_DROPS, - .flowerDrops = NO_DROPS, - }, + .settings = &N(NpcSettings_Toad_Stationary), + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, + .drops = NO_DROPS, .animations = { .idle = ANIM_Musician_Composer_Idle, .walk = ANIM_Musician_Composer_Still, @@ -449,7 +429,7 @@ StaticNpc N(NpcData_Artists)[] = { }; #define NAME_SUFFIX -extern StaticNpc N(NpcData_Townsfolk)[10]; +extern NpcData N(NpcData_Townsfolk)[10]; NpcGroupList N(EpilogueNPCs) = { NPC_GROUP(N(NpcData_Koopas_Epilogue)), 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 44dea57177..5a42aa4bac 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_Stationary.inc.c" +#include "world/common/enemy/ShyGuy_Stationary.inc.c" NpcSettings N(NpcSettings_Ninji) = { .height = 24, @@ -1046,37 +1046,29 @@ NpcSettings N(NpcSettings_Merlon) = { .level = 99, }; -StaticNpc N(NpcData_Merlon) = { +NpcData N(NpcData_Merlon) = { .id = NPC_Merlon, - .settings = &N(NpcSettings_Merlon), .pos = { -337.0f, 20.0f, -360.0f }, .yaw = 30, - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_Merlon), - .drops = { - .dropFlags = NPC_DROP_FLAG_80, - .heartDrops = NO_DROPS, - .flowerDrops = NO_DROPS, - }, + .settings = &N(NpcSettings_Merlon), + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, + .drops = NO_DROPS, .animations = { .idle = ANIM_Merlon_Idle, }, .tattle = MSG_NpcTattle_Merlon, }; -StaticNpc N(NpcData_DarkToads)[] = { +NpcData N(NpcData_DarkToads)[] = { { .id = NPC_DarkToad_01, - .settings = &N(NpcSettings_Toad_Stationary), .pos = { 505.0f, 0.0f, 5.0f }, .yaw = 270, - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_DarkToad_01), - .drops = { - .dropFlags = NPC_DROP_FLAG_80, - .heartDrops = NO_DROPS, - .flowerDrops = NO_DROPS, - }, + .settings = &N(NpcSettings_Toad_Stationary), + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, + .drops = NO_DROPS, .animations = { .idle = ANIM_DarkToad_Red_Idle, }, @@ -1084,16 +1076,12 @@ StaticNpc N(NpcData_DarkToads)[] = { }, { .id = NPC_DarkToad_02, - .settings = &N(NpcSettings_Toad_Stationary), .pos = { 530.0f, 0.0f, -35.0f }, .yaw = 270, - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_DarkToad_02), - .drops = { - .dropFlags = NPC_DROP_FLAG_80, - .heartDrops = NO_DROPS, - .flowerDrops = NO_DROPS, - }, + .settings = &N(NpcSettings_Toad_Stationary), + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, + .drops = NO_DROPS, .animations = { .idle = ANIM_DarkToad_Black_Idle, }, @@ -1101,16 +1089,12 @@ StaticNpc N(NpcData_DarkToads)[] = { }, { .id = NPC_DarkToad_03, - .settings = &N(NpcSettings_Toad_Stationary), .pos = { 540.0f, 0.0f, 0.0f }, .yaw = 270, - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_DarkToad_02), - .drops = { - .dropFlags = NPC_DROP_FLAG_80, - .heartDrops = NO_DROPS, - .flowerDrops = NO_DROPS, - }, + .settings = &N(NpcSettings_Toad_Stationary), + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, + .drops = NO_DROPS, .animations = { .idle = ANIM_DarkToad_Yellow_Idle, }, @@ -1118,16 +1102,12 @@ StaticNpc N(NpcData_DarkToads)[] = { }, { .id = NPC_DarkToad_04, - .settings = &N(NpcSettings_Toad_Stationary), .pos = { 550.0f, 0.0f, 35.0f }, .yaw = 270, - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_DarkToad_02), - .drops = { - .dropFlags = NPC_DROP_FLAG_80, - .heartDrops = NO_DROPS, - .flowerDrops = NO_DROPS, - }, + .settings = &N(NpcSettings_Toad_Stationary), + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, + .drops = NO_DROPS, .animations = { .idle = ANIM_DarkToad_Green_Idle, }, @@ -1135,26 +1115,22 @@ StaticNpc N(NpcData_DarkToads)[] = { }, }; -s32 N(ExtraAnims_KoopaBros)[] = { +AnimID N(ExtraAnims_KoopaBros)[] = { ANIM_KoopaBros_Black_Anim03, ANIM_KoopaBros_Black_Anim04, ANIM_KoopaBros_Black_Anim0B, ANIM_KoopaBros_Black_Anim14, - -1 + ANIM_LIST_END }; -StaticNpc N(NpcData_KoopaBros)[] = { +NpcData N(NpcData_KoopaBros)[] = { { .id = NPC_KoopaBros_01, - .settings = &N(NpcSettings_Toad_Stationary), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 270, + .settings = &N(NpcSettings_Toad_Stationary), .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, - .drops = { - .dropFlags = NPC_DROP_FLAG_80, - .heartDrops = NO_DROPS, - .flowerDrops = NO_DROPS, - }, + .drops = NO_DROPS, .animations = { .idle = ANIM_KoopaBros_Black_Anim04, .walk = ANIM_KoopaBros_Black_Anim02, @@ -1177,15 +1153,11 @@ StaticNpc N(NpcData_KoopaBros)[] = { }, { .id = NPC_KoopaBros_02, - .settings = &N(NpcSettings_Toad_Stationary), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 270, + .settings = &N(NpcSettings_Toad_Stationary), .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, - .drops = { - .dropFlags = NPC_DROP_FLAG_80, - .heartDrops = NO_DROPS, - .flowerDrops = NO_DROPS, - }, + .drops = NO_DROPS, .animations = { .idle = ANIM_KoopaBros_Red_Anim04, .walk = ANIM_KoopaBros_Red_Anim02, @@ -1208,15 +1180,11 @@ StaticNpc N(NpcData_KoopaBros)[] = { }, { .id = NPC_KoopaBros_03, - .settings = &N(NpcSettings_Toad_Stationary), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 270, + .settings = &N(NpcSettings_Toad_Stationary), .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, - .drops = { - .dropFlags = NPC_DROP_FLAG_80, - .heartDrops = NO_DROPS, - .flowerDrops = NO_DROPS, - }, + .drops = NO_DROPS, .animations = { .idle = ANIM_KoopaBros_Yellow_Anim04, .walk = ANIM_KoopaBros_Yellow_Anim02, @@ -1239,15 +1207,11 @@ StaticNpc N(NpcData_KoopaBros)[] = { }, { .id = NPC_KoopaBros_04, - .settings = &N(NpcSettings_Toad_Stationary), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 270, + .settings = &N(NpcSettings_Toad_Stationary), .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, - .drops = { - .dropFlags = NPC_DROP_FLAG_80, - .heartDrops = NO_DROPS, - .flowerDrops = NO_DROPS, - }, + .drops = NO_DROPS, .animations = { .idle = ANIM_KoopaBros_Green_Anim04, .walk = ANIM_KoopaBros_Green_Anim02, @@ -1270,17 +1234,13 @@ StaticNpc N(NpcData_KoopaBros)[] = { }, }; -StaticNpc N(NpcData_Ninji) = { +NpcData N(NpcData_Ninji) = { .id = NPC_Ninji, - .settings = &N(NpcSettings_Ninji), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, + .settings = &N(NpcSettings_Ninji), .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_10000000, - .drops = { - .dropFlags = NPC_DROP_FLAG_80, - .heartDrops = NO_DROPS, - .flowerDrops = NO_DROPS, - }, + .drops = NO_DROPS, .animations = { .idle = ANIM_Ninji_Idle, .walk = ANIM_Ninji_Walk, @@ -1894,7 +1854,7 @@ EvtScript N(EVS_NpcIdle_ShyGuy_02) = { EvtScript N(EVS_NpcAI_ShyGuy_02) = { EVT_CALL(DisablePlayerInput, TRUE) - EVT_CALL(ShowSweat, -1, 1, -45, 1, 0, 0, 0, 0, 20) + EVT_CALL(ShowSweat, NPC_SELF, 1, -45, EMOTER_NPC, 0, 0, 0, 0, 20) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_ShyGuy_Red_Anim0C) EVT_CALL(GetNpcPos, NPC_SELF, LVar0, LVar1, LVar2) EVT_CALL(NpcJump0, NPC_SELF, LVar0, 36, LVar2, 10) @@ -1919,7 +1879,7 @@ EvtScript N(EVS_NpcAI_ShyGuy_02) = { EVT_END_LOOP EVT_CALL(PlaySoundAtCollider, COLLIDER_deilit2u, SOUND_BASIC_DOOR_CLOSE, SOUND_SPACE_MODE_0) EVT_END_THREAD - EVT_CALL(ShowSweat, -1, 1, -45, 1, 0, 0, 0, 0, 20) + EVT_CALL(ShowSweat, NPC_SELF, 1, -45, EMOTER_NPC, 0, 0, 0, 0, 20) EVT_SET(LVar0, -1) EVT_CALL(PlaySoundAtNpc, LVar0, SOUND_203F, SOUND_SPACE_MODE_0) EVT_EXEC_GET_TID(N(D_8024E6F8_80EF78), LVarA) @@ -2101,43 +2061,39 @@ EvtScript N(EVS_NpcInit_Kolorado) = { EVT_END }; -s32 N(ExtraAnims_Toad)[] = { +AnimID N(ExtraAnims_Toad)[] = { ANIM_Toad_Red_Still, ANIM_Toad_Red_Idle, ANIM_Toad_Red_Walk, ANIM_Toad_Red_Run, ANIM_Toad_Red_Talk, - -1 + ANIM_LIST_END }; -s32 N(ExtraAnims_Bubulb)[] = { +AnimID N(ExtraAnims_Bubulb)[] = { ANIM_Bubulb_Pink_Idle, ANIM_Bubulb_Pink_EmbedIdle, ANIM_Bubulb_Pink_Talk, - -1 + ANIM_LIST_END }; -StaticNpc N(NpcData_Townsfolk)[] = { +NpcData N(NpcData_Townsfolk)[] = { { .id = NPC_Toad_04, - .settings = &N(NpcSettings_Toad_Stationary), .pos = { -94.0f, 0.0f, -117.0f }, .yaw = 90, - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_Toad_04), - .drops = TOAD_DROPS, + .settings = &N(NpcSettings_Toad_Stationary), + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, + .drops = NO_DROPS, .animations = TOAD_RED_ANIMS, .extraAnimations = N(ExtraAnims_Toad), .tattle = MSG_NpcTattle_MAC_RunsHisMouth, }, { .id = NPC_Toad_05, - .settings = &N(NpcSettings_Toad_Wander), .pos = { -145.0f, 0.0f, -25.0f }, .yaw = 270, - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, - .init = &N(EVS_NpcInit_Toad_05), - .drops = TOAD_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -2150,18 +2106,18 @@ StaticNpc N(NpcData_Townsfolk)[] = { .detectSize = { 10 }, } }, + .init = &N(EVS_NpcInit_Toad_05), + .settings = &N(NpcSettings_Toad_Wander), + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, + .drops = NO_DROPS, .animations = TOAD_RED_ANIMS, .extraAnimations = N(ExtraAnims_Toad), .tattle = MSG_NpcTattle_MAC_KnowsTheGossip, }, { .id = NPC_Toad_06, - .settings = &N(NpcSettings_Toad_Patrol), .pos = { 40.0f, 0.0f, -300.0f }, .yaw = 270, - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, - .init = &N(EVS_NpcInit_Toad_06), - .drops = TOAD_DROPS, .territory = { .patrol = { .isFlying = TRUE, @@ -2176,18 +2132,18 @@ StaticNpc N(NpcData_Townsfolk)[] = { .detectSize = { 10 }, } }, + .init = &N(EVS_NpcInit_Toad_06), + .settings = &N(NpcSettings_Toad_Patrol), + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, + .drops = NO_DROPS, .animations = TOAD_YELLOW_ANIMS, .extraAnimations = N(ExtraAnims_Toad), .tattle = MSG_NpcTattle_MAC_PrincessFan, }, { .id = NPC_Toad_07, - .settings = &N(NpcSettings_Toad_Patrol), .pos = { -440.0f, 0.0f, -20.0f }, .yaw = 90, - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, - .init = &N(EVS_NpcInit_Toad_07), - .drops = TOAD_DROPS, .territory = { .patrol = { .isFlying = TRUE, @@ -2202,18 +2158,18 @@ StaticNpc N(NpcData_Townsfolk)[] = { .detectSize = { 10 }, } }, + .init = &N(EVS_NpcInit_Toad_07), + .settings = &N(NpcSettings_Toad_Patrol), + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, + .drops = NO_DROPS, .animations = TOAD_YELLOW_ANIMS, .extraAnimations = N(ExtraAnims_Toad), .tattle = MSG_NpcTattle_MAC_KnowsTheRumors, }, { .id = NPC_Toad_08, - .settings = &N(NpcSettings_Toad_Patrol), .pos = { 400.0f, 20.0f, 260.0f }, .yaw = 90, - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, - .init = &N(EVS_NpcInit_Toad_08), - .drops = TOAD_DROPS, .territory = { .patrol = { .isFlying = TRUE, @@ -2228,54 +2184,58 @@ StaticNpc N(NpcData_Townsfolk)[] = { .detectSize = { 10 }, } }, + .init = &N(EVS_NpcInit_Toad_08), + .settings = &N(NpcSettings_Toad_Patrol), + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, + .drops = NO_DROPS, .animations = TOAD_BLUE_ANIMS, .extraAnimations = N(ExtraAnims_Toad), .tattle = MSG_NpcTattle_MAC_CrushingOnMinhT, }, { .id = NPC_Toad_09, - .settings = &N(NpcSettings_Toad_Stationary), .pos = { -380.0f, 20.0f, -100.0f }, .yaw = 270, - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_Toad_09), - .drops = TOAD_DROPS, + .settings = &N(NpcSettings_Toad_Stationary), + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, + .drops = NO_DROPS, .animations = TOAD_GREEN_ANIMS, .extraAnimations = N(ExtraAnims_Toad), .tattle = MSG_NpcTattle_MAC_SeeksTheSouth, }, { .id = NPC_ToadHouseToad, - .settings = &N(NpcSettings_Toad_Stationary), .pos = { 488.0f, 20.0f, -174.0f }, .yaw = 30, - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_ToadHouseKeeper), - .drops = TOAD_DROPS, + .settings = &N(NpcSettings_Toad_Stationary), + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, + .drops = NO_DROPS, .animations = TOAD_RED_ANIMS, .extraAnimations = N(ExtraAnims_Toad), .tattle = MSG_NpcTattle_MAC_ToadHouseToad, }, { .id = NPC_Bubulb, - .settings = &N(NpcSettings_Bubulb), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_Bubulb), - .drops = BUBULB_DROPS, + .settings = &N(NpcSettings_Bubulb), + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, + .drops = NO_DROPS, .animations = BUBULB_PINK_ANIMS, .extraAnimations = N(ExtraAnims_Bubulb), .tattle = MSG_NpcTattle_MAC_FlowerGateBubulb, }, { .id = NPC_MinhT, - .settings = &N(NpcSettings_Toad_Stationary), .pos = { 150.0f, 20.0f, 485.0f }, .yaw = 270, - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_MinhT), - .drops = TOAD_DROPS, + .settings = &N(NpcSettings_Toad_Stationary), + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, + .drops = NO_DROPS, .animations = { .idle = ANIM_MinhT_Idle, }, @@ -2283,16 +2243,12 @@ StaticNpc N(NpcData_Townsfolk)[] = { }, { .id = NPC_Postmaster, - .settings = &N(NpcSettings_Toad_Stationary), .pos = { 312.0f, 30.0f, -438.0f }, .yaw = 300, - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_10000, .init = &N(EVS_NpcInit_Postmaster), - .drops = { - .dropFlags = NPC_DROP_FLAG_80, - .heartDrops = NO_DROPS, - .flowerDrops = NO_DROPS, - }, + .settings = &N(NpcSettings_Toad_Stationary), + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_10000, + .drops = NO_DROPS, .animations = { .idle = ANIM_Postmaster_Idle, }, @@ -2300,18 +2256,14 @@ StaticNpc N(NpcData_Townsfolk)[] = { }, }; -StaticNpc N(NpcData_Parakarry) = { +NpcData N(NpcData_Parakarry) = { .id = NPC_Parakarry, - .settings = &N(NpcSettings_Parakarry), .pos = { 145.0f, 20.0f, -472.0f }, .yaw = 120, - .flags = COMMON_PASSIVE_FLAGS, .init = &N(EVS_NpcInit_Parakarry), - .drops = { - .dropFlags = NPC_DROP_FLAG_80, - .heartDrops = NO_DROPS, - .flowerDrops = NO_DROPS, - }, + .settings = &N(NpcSettings_Parakarry), + .flags = COMMON_PASSIVE_FLAGS, + .drops = NO_DROPS, .animations = { .idle = ANIM_WorldParakarry_Idle, .walk = ANIM_WorldParakarry_Walk, @@ -2334,64 +2286,64 @@ StaticNpc N(NpcData_Parakarry) = { .tattle = MSG_NpcTattle_MAC_Parakarry, }; -s32 N(ExtraAnims_Twink)[] = { +AnimID N(ExtraAnims_Twink)[] = { ANIM_Twink_Idle, ANIM_Twink_Fly, ANIM_Twink_Talk, - -1 + ANIM_LIST_END }; -StaticNpc N(NpcData_Twink) = { +NpcData N(NpcData_Twink) = { .id = NPC_Twink, - .settings = &N(NpcSettings_Twink), .pos = { -350.0f, 20.0f, -100.0f }, .yaw = 274, - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_Twink), - .drops = TWINK_DROPS, + .settings = &N(NpcSettings_Twink), + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_400000, + .drops = NO_DROPS, .animations = TWINK_ANIMS, .extraAnimations = N(ExtraAnims_Twink), }; -StaticNpc N(NpcData_ShyGuys)[] = { +NpcData N(NpcData_ShyGuys)[] = { { .id = NPC_PostOfficeShyGuy, - .settings = &N(NpcSettings_ShyGuy_Stationary), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_ShyGuy_01), - .drops = SHY_GUY_NO_DROPS, + .settings = &N(NpcSettings_ShyGuy_Stationary), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = NO_DROPS, .animations = RED_SHY_GUY_ANIMS, }, { .id = NPC_ToadHouseShyGuy, - .settings = &N(NpcSettings_ShyGuy_Stationary), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 270, - .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | 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, .init = &N(EVS_NpcInit_ShyGuy_02), - .drops = SHY_GUY_NO_DROPS, + .settings = &N(NpcSettings_ShyGuy_Stationary), + .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | 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, + .drops = NO_DROPS, .animations = RED_SHY_GUY_ANIMS, }, { .id = NPC_GardenShyGuy1, - .settings = &N(NpcSettings_ShyGuy_Stationary), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 270, - .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | 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, .init = &N(EVS_NpcInit_GardenShyGuy1), - .drops = SHY_GUY_NO_DROPS, + .settings = &N(NpcSettings_ShyGuy_Stationary), + .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | 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, + .drops = NO_DROPS, .animations = RED_SHY_GUY_ANIMS, }, { .id = NPC_GardenShyGuy2, - .settings = &N(NpcSettings_ShyGuy_Stationary), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 270, - .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | 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, .init = &N(EVS_NpcInit_GardenShyGuy2), - .drops = SHY_GUY_NO_DROPS, + .settings = &N(NpcSettings_ShyGuy_Stationary), + .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | 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, + .drops = NO_DROPS, .animations = RED_SHY_GUY_ANIMS, }, }; @@ -2403,28 +2355,28 @@ s32 N(D_8025EBB8_81F438)[] = { -1 }; -StaticNpc N(NpcData_Kolorado) = { +NpcData N(NpcData_Kolorado) = { .id = NPC_Kolorado, - .settings = &N(NpcSettings_Kolorado), .pos = { 520.0f, 0.0f, -25.0f }, .yaw = 270, - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_Kolorado), - .drops = KOLORADO_DROPS, + .settings = &N(NpcSettings_Kolorado), + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, + .drops = NO_DROPS, .animations = KOLORADO_ANIMS, .extraAnimations = N(D_8025EBB8_81F438), .tattle = MSG_NpcTattle_Kolorado, }; -StaticNpc N(NpcData_ChuckQuizmo) = { +NpcData N(NpcData_ChuckQuizmo) = { .id = NPC_ChuckQuizmo, - .settings = &N(NpcSettings_ChuckQuizmo), .pos = { -440.0f, 20.0f, -140.0f }, .yaw = 30, - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_4000, .initVarCount = 1, .initVar = { .bytes = { 0, QUIZ_AREA_MAC, QUIZ_COUNT_MAC, QUIZ_MAP_MAC_01 }}, - .drops = QUIZMO_DROPS, + .settings = &N(NpcSettings_ChuckQuizmo), + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_4000, + .drops = NO_DROPS, .animations = QUIZMO_ANIMS, .tattle = MSG_NpcTattle_ChuckQuizmo, }; diff --git a/src/world/area_mac/mac_01/npc/flower_gate.inc.c b/src/world/area_mac/mac_01/npc/flower_gate.inc.c index 9d6dc7afbf..8d5616a6af 100644 --- a/src/world/area_mac/mac_01/npc/flower_gate.inc.c +++ b/src/world/area_mac/mac_01/npc/flower_gate.inc.c @@ -62,7 +62,7 @@ EvtScript N(EVS_GardenShyGuy_RunAway) = { EVT_CALL(NpcJump0, NPC_SELF, LVar0, 27, LVar2, 10) EVT_CALL(SetNpcSpeed, NPC_SELF, EVT_FLOAT(8.0)) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_ShyGuy_Red_Anim03) - EVT_CALL(ShowSweat, -1, 1, -45, 1, 0, 0, 0, 0, 20) + EVT_CALL(ShowSweat, NPC_SELF, 1, -45, EMOTER_NPC, 0, 0, 0, 0, 20) EVT_CALL(InterpNpcYaw, NPC_SELF, 270, 1) EVT_SET(LVar0, -1) EVT_CALL(PlaySoundAtNpc, LVar0, SOUND_203F, SOUND_SPACE_MODE_0) @@ -73,13 +73,13 @@ EvtScript N(EVS_GardenShyGuy_RunAway) = { EVT_IF_EQ(LVarA, 2) EVT_EXEC(N(EVS_MinhThankYou)) EVT_END_IF - EVT_CALL(ShowSweat, -1, 1, -45, 1, 0, 0, 0, 0, 20) + EVT_CALL(ShowSweat, NPC_SELF, 1, -45, EMOTER_NPC, 0, 0, 0, 0, 20) EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_32C, SOUND_SPACE_MODE_0) EVT_CALL(NpcJump0, NPC_SELF, 110, 20, 420, 0) - EVT_CALL(ShowSweat, -1, 1, -45, 1, 0, 0, 0, 0, 20) + EVT_CALL(ShowSweat, NPC_SELF, 1, -45, EMOTER_NPC, 0, 0, 0, 0, 20) EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_32C, SOUND_SPACE_MODE_0) EVT_CALL(NpcJump0, NPC_SELF, 40, 0, 450, 0) - EVT_CALL(ShowSweat, -1, 1, -45, 1, 0, 0, 0, 0, 20) + EVT_CALL(ShowSweat, NPC_SELF, 1, -45, EMOTER_NPC, 0, 0, 0, 0, 20) EVT_CALL(NpcMoveTo, NPC_SELF, -30, 550, 0) EVT_CALL(NpcMoveTo, NPC_SELF, -30, 700, 0) EVT_CALL(SetNpcPos, NPC_SELF, NPC_DISPOSE_LOCATION) diff --git a/src/world/area_mac/mac_01/npc/post_office.inc.c b/src/world/area_mac/mac_01/npc/post_office.inc.c index 8063f5c1cc..389a929a21 100644 --- a/src/world/area_mac/mac_01/npc/post_office.inc.c +++ b/src/world/area_mac/mac_01/npc/post_office.inc.c @@ -405,11 +405,11 @@ EvtScript N(EVS_NpcInteract_Parakarry) = { EVT_END }; -s32 N(ExtraAnims_Parakarry)[] = { +AnimID N(ExtraAnims_Parakarry)[] = { ANIM_WorldParakarry_Still, ANIM_WorldParakarry_Idle, ANIM_WorldParakarry_Talk, - -1 + ANIM_LIST_END }; EvtScript N(EVS_NpcInit_Parakarry) = { diff --git a/src/world/area_mac/mac_01/npc/rowf_and_rhuff.inc.c b/src/world/area_mac/mac_01/npc/rowf_and_rhuff.inc.c index 06a891b268..8e904bc1ba 100644 --- a/src/world/area_mac/mac_01/npc/rowf_and_rhuff.inc.c +++ b/src/world/area_mac/mac_01/npc/rowf_and_rhuff.inc.c @@ -695,7 +695,7 @@ EvtScript N(EVS_NpcInit_Rhuff) = { EVT_END }; -s32 N(ExtraAnims_Rowf)[] = { +AnimID N(ExtraAnims_Rowf)[] = { ANIM_Rowf_Still, ANIM_Rowf_Idle, ANIM_Rowf_Walk, @@ -703,7 +703,7 @@ s32 N(ExtraAnims_Rowf)[] = { ANIM_Rowf_Cheer, ANIM_Rowf_Think, ANIM_Rowf_WaveOff, - -1 + ANIM_LIST_END }; NpcSettings N(NpcSettings_Rowf) = { @@ -718,19 +718,15 @@ NpcSettings N(NpcSettings_Rhuff) = { .flags = ENEMY_FLAG_PASSIVE, }; -StaticNpc N(NpcData_RowfAndRhuff)[] = { +NpcData N(NpcData_RowfAndRhuff)[] = { { .id = NPC_Rowf, - .settings = &N(NpcSettings_Rowf), .pos = { -213.0f, -54.0f, 256.0f }, .yaw = 90, - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_Rowf), - .drops = { - .dropFlags = NPC_DROP_FLAG_80, - .heartDrops = NO_DROPS, - .flowerDrops = NO_DROPS, - }, + .settings = &N(NpcSettings_Rowf), + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, + .drops = NO_DROPS, .animations = { .idle = ANIM_Rowf_Idle, }, @@ -739,16 +735,12 @@ StaticNpc N(NpcData_RowfAndRhuff)[] = { }, { .id = NPC_Rhuff, - .settings = &N(NpcSettings_Rhuff), .pos = { -250.0f, 0.0f, 263.0f }, .yaw = 90, - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_Rhuff), - .drops = { - .dropFlags = NPC_DROP_FLAG_80, - .heartDrops = NO_DROPS, - .flowerDrops = NO_DROPS, - }, + .settings = &N(NpcSettings_Rhuff), + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, + .drops = NO_DROPS, .animations = { .idle = ANIM_Rowf_Idle, }, diff --git a/src/world/area_mac/mac_02/mac_02_2_main.c b/src/world/area_mac/mac_02/mac_02_2_main.c index 723d0aeef6..4336c3d525 100644 --- a/src/world/area_mac/mac_02/mac_02_2_main.c +++ b/src/world/area_mac/mac_02/mac_02_2_main.c @@ -3,7 +3,6 @@ #include "world/common/entity/Pipe.inc.c" #include "world/common/atomic/TexturePan.inc.c" -#include "world/common/atomic/TexturePan.data.inc.c" EvtScript N(EVS_ExitWalk_mac_04_0) = EVT_EXIT_WALK(60, mac_02_ENTRY_0, "mac_04", mac_04_ENTRY_0); EvtScript N(EVS_ExitWalk_mim_10_0) = EVT_EXIT_WALK(60, mac_02_ENTRY_1, "mim_10", mim_10_ENTRY_0); diff --git a/src/world/area_mac/mac_02/mac_02_6_npc.c b/src/world/area_mac/mac_02/mac_02_6_npc.c index 77e8c2c050..2917f28cb3 100644 --- a/src/world/area_mac/mac_02/mac_02_6_npc.c +++ b/src/world/area_mac/mac_02/mac_02_6_npc.c @@ -52,15 +52,15 @@ s32 N(D_8024CB2C_82FDEC)[] = { -1 }; -StaticNpc N(NpcData_TayceT)[] = { +NpcData N(NpcData_TayceT)[] = { { .id = NPC_TayceT, - .settings = &N(NpcSettings_Toad_Stationary), .pos = { -217.0f, 20.0f, -434.0f }, .yaw = 90, - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_TayceT), - .drops = TOAD_DROPS, + .settings = &N(NpcSettings_Toad_Stationary), + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, + .drops = NO_DROPS, .animations = { .idle = ANIM_TayceT_Idle, }, @@ -69,12 +69,12 @@ StaticNpc N(NpcData_TayceT)[] = { }, { .id = NPC_FiceT, - .settings = &N(NpcSettings_Toad_Stationary), .pos = { 389.0f, 0.0f, -90.0f }, .yaw = 90, - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_FiceT), - .drops = TOAD_DROPS, + .settings = &N(NpcSettings_Toad_Stationary), + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, + .drops = NO_DROPS, .animations = { .idle = ANIM_FiceT_Idle, }, @@ -82,24 +82,20 @@ StaticNpc N(NpcData_TayceT)[] = { }, { .id = NPC_Bubulb, - .settings = &N(NpcSettings_Bubulb), .pos = { 150.0f, 20.0f, 500.0f }, .yaw = 90, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_Bubulb), - .drops = BUBULB_DROPS, + .settings = &N(NpcSettings_Bubulb), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_800, + .drops = NO_DROPS, .animations = BUBULB_PINK_ANIMS, .extraAnimations = N(D_8024CB2C_82FDEC), .tattle = MSG_NpcTattle_MAC_Bubulb_Revealed, }, { .id = NPC_Toad_01, - .settings = &N(NpcSettings_Toad_Wander), .pos = { 40.0f, 0.0f, -60.0f }, .yaw = 270, - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, - .init = &N(EVS_NpcInit_Toad_01), - .drops = TOAD_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -112,39 +108,39 @@ StaticNpc N(NpcData_TayceT)[] = { .detectSize = { 10 }, } }, + .init = &N(EVS_NpcInit_Toad_01), + .settings = &N(NpcSettings_Toad_Wander), + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, + .drops = NO_DROPS, .animations = TOAD_BLUE_ANIMS, .tattle = MSG_NpcTattle_MAC_HardWorker, }, { .id = NPC_CookingApprentice, - .settings = &N(NpcSettings_Toad_Stationary), .pos = { -26.0f, 0.0f, -220.0f }, .yaw = 270, - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_CookingApprentice), - .drops = TOADETTE_DROPS, + .settings = &N(NpcSettings_Toad_Stationary), + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, + .drops = NO_DROPS, .animations = TOADETTE_PURPLE_ANIMS, .tattle = MSG_NpcTattle_MAC_CookingApprentice, }, { .id = NPC_Toad_02, - .settings = &N(NpcSettings_Toad_Stationary), .pos = { -350.0f, 20.0f, -140.0f }, .yaw = 90, - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_Toad_02), - .drops = TOAD_DROPS, + .settings = &N(NpcSettings_Toad_Stationary), + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, + .drops = NO_DROPS, .animations = TOAD_GREEN_ANIMS, .tattle = MSG_NpcTattle_MAC_CantKeepQuiet, }, { .id = NPC_ToadKid, - .settings = &N(NpcSettings_Toad_Wander), .pos = { 180.0f, 20.0f, -435.0f }, .yaw = 270, - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, - .init = &N(EVS_NpcInit_ToadKid), - .drops = TOAD_KID_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -157,17 +153,17 @@ StaticNpc N(NpcData_TayceT)[] = { .detectSize = { 10 }, } }, + .init = &N(EVS_NpcInit_ToadKid), + .settings = &N(NpcSettings_Toad_Wander), + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, + .drops = NO_DROPS, .animations = TOAD_KID_YELLOW_ANIMS, .tattle = MSG_NpcTattle_MAC_FickleDreamer, }, { .id = NPC_Toad_03, - .settings = &N(NpcSettings_Toad_Wander), .pos = { -160.0f, 0.0f, 25.0f }, .yaw = 90, - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, - .init = &N(EVS_NpcInit_Toad_03), - .drops = TOAD_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -180,34 +176,34 @@ StaticNpc N(NpcData_TayceT)[] = { .detectSize = { 10 }, } }, + .init = &N(EVS_NpcInit_Toad_03), + .settings = &N(NpcSettings_Toad_Wander), + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, + .drops = NO_DROPS, .animations = TOAD_YELLOW_ANIMS, .tattle = MSG_NpcTattle_MAC_PrettySmart, }, { .id = NPC_Toad_04, - .settings = &N(NpcSettings_Toad_Stationary), .pos = { -80.0f, 0.0f, 300.0f }, .yaw = 90, - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_Toad_04), - .drops = { - .dropFlags = NPC_DROP_FLAG_80, - .heartDrops = NO_DROPS, - .flowerDrops = NO_DROPS, - }, + .settings = &N(NpcSettings_Toad_Stationary), + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, + .drops = NO_DROPS, .animations = TOAD_RED_ANIMS, .tattle = MSG_NpcTattle_MAC_PetBoaster, }, }; -StaticNpc N(NpcData_Bootler) = { +NpcData N(NpcData_Bootler) = { .id = NPC_Bootler, - .settings = &N(NpcSettings_Bootler), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = COMMON_PASSIVE_FLAGS, .init = &N(EVS_NpcInit_Bootler), - .drops = BOOTLER_DROPS, + .settings = &N(NpcSettings_Bootler), + .flags = COMMON_PASSIVE_FLAGS, + .drops = NO_DROPS, .animations = BOOTLER_ANIMS, }; @@ -222,18 +218,14 @@ s32 N(D_8024DEA8_831168)[] = { -1 }; -StaticNpc N(NpcData_ShyGuy) = { +NpcData N(NpcData_ShyGuy) = { .id = NPC_ShyGuy, - .settings = &N(NpcSettings_Toad_Stationary), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_ShyGuy), - .drops = { - .dropFlags = NPC_DROP_FLAG_80, - .heartDrops = NO_DROPS, - .flowerDrops = NO_DROPS, - }, + .settings = &N(NpcSettings_Toad_Stationary), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .drops = NO_DROPS, .animations = { .idle = ANIM_ShyGuy_Red_Anim01, .walk = ANIM_ShyGuy_Red_Anim02, 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 5f880a5b45..3cba712623 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 @@ -506,20 +506,20 @@ EvtScript N(EVS_NpcAI_ShyGuy) = { EVT_EXEC_GET_TID(N(D_8024A7F4_83BFF4), LVarA) EVT_CALL(NpcMoveTo, NPC_SELF, -100, 0, 0) EVT_KILL_THREAD(LVarA) - EVT_CALL(ShowSweat, -1, 1, 45, 1, 0, 0, 0, 0, 20) + EVT_CALL(ShowSweat, NPC_SELF, 1, 45, EMOTER_NPC, 0, 0, 0, 0, 20) EVT_CALL(DisablePlayerInput, FALSE) EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_32C, SOUND_SPACE_MODE_0) EVT_CALL(NpcJump0, NPC_SELF, -30, 0, 0, 20) - EVT_CALL(ShowSweat, -1, 1, 45, 1, 0, 0, 0, 0, 20) + EVT_CALL(ShowSweat, NPC_SELF, 1, 45, EMOTER_NPC, 0, 0, 0, 0, 20) EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_203F, SOUND_SPACE_MODE_0) EVT_EXEC_GET_TID(N(D_8024A7F4_83BFF4), LVarA) EVT_CALL(SetNpcSpeed, NPC_SELF, EVT_FLOAT(8.0)) EVT_CALL(NpcMoveTo, NPC_SELF, 30, -200, 0) - EVT_CALL(ShowSweat, -1, 1, -45, 1, 0, 0, 0, 0, 20) + EVT_CALL(ShowSweat, NPC_SELF, 1, -45, EMOTER_NPC, 0, 0, 0, 0, 20) EVT_CALL(NpcMoveTo, NPC_SELF, -30, -400, 0) - EVT_CALL(ShowSweat, -1, 1, 45, 1, 0, 0, 0, 0, 20) + EVT_CALL(ShowSweat, NPC_SELF, 1, 45, EMOTER_NPC, 0, 0, 0, 0, 20) EVT_CALL(NpcMoveTo, NPC_SELF, 30, -600, 0) - EVT_CALL(ShowSweat, -1, 1, -45, 1, 0, 0, 0, 0, 20) + EVT_CALL(ShowSweat, NPC_SELF, 1, -45, EMOTER_NPC, 0, 0, 0, 0, 20) EVT_CALL(NpcMoveTo, NPC_SELF, 0, -650, 0) EVT_KILL_THREAD(LVarA) EVT_CALL(SetNpcPos, NPC_SELF, NPC_DISPOSE_LOCATION) @@ -605,69 +605,65 @@ EvtScript N(EVS_NpcInit_Toad_04) = { EVT_END }; -StaticNpc N(NpcData_Toads)[] = { +NpcData N(NpcData_Toads)[] = { { .id = NPC_TrainToad_01, - .settings = &N(NpcSettings_TrainToad), .pos = { -370.0f, 20.0f, 90.0f }, .yaw = 90, - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_TrainToad_01), - .drops = TRAIN_CONDUCTOR_DROPS, + .settings = &N(NpcSettings_TrainToad), + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, + .drops = NO_DROPS, .animations = TRAIN_TOAD_WHITE_ANIMS, .tattle = MSG_NpcTattle_MAC_StationMaster, }, { .id = NPC_TrainToad_02, - .settings = &N(NpcSettings_TrainToad), .pos = { -424.0f, 74.0f, 2.0f }, .yaw = 90, + .settings = &N(NpcSettings_TrainToad), .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, - .drops = TRAIN_CONDUCTOR_DROPS, + .drops = NO_DROPS, .animations = TRAIN_CONDUCTOR_ANIMS, .tattle = MSG_NpcTattle_MAC_StationMaster, }, { .id = NPC_Toad_01, - .settings = &N(NpcSettings_Toad_Stationary), .pos = { -232.0f, 10.0f, 74.0f }, .yaw = 75, - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_Toad_01), - .drops = TOAD_DROPS, + .settings = &N(NpcSettings_Toad_Stationary), + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, + .drops = NO_DROPS, .animations = TOAD_BLUE_ANIMS, .tattle = MSG_NpcTattle_MAC_TrainLover, }, { .id = NPC_ThreeSisters_01, - .settings = &N(NpcSettings_Toad_Stationary), .pos = { 85.0f, 0.0f, 235.0f }, .yaw = 270, - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_ThreeSisters_01), - .drops = TOADETTE_DROPS, + .settings = &N(NpcSettings_Toad_Stationary), + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, + .drops = NO_DROPS, .animations = TOADETTE_PURPLE_ANIMS, .tattle = MSG_NpcTattle_MAC_CaringToad, }, { .id = NPC_Toad_02, - .settings = &N(NpcSettings_Toad_Stationary), .pos = { -255.0f, 20.0f, 400.0f }, .yaw = 90, - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_Toad_02), - .drops = TOAD_DROPS, + .settings = &N(NpcSettings_Toad_Stationary), + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, + .drops = NO_DROPS, .animations = TOAD_GREEN_ANIMS, .tattle = MSG_NpcTattle_MAC_DesertTraveler, }, { .id = NPC_ToadKid_01, - .settings = &N(NpcSettings_ToadKid_Wander), .pos = { 260.0f, 20.0f, 410.0f }, .yaw = 90, - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, - .init = &N(EVS_NpcInit_ToadKid_01), - .drops = TOAD_KID_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -680,17 +676,17 @@ StaticNpc N(NpcData_Toads)[] = { .detectSize = { 10, 10 }, } }, + .init = &N(EVS_NpcInit_ToadKid_01), + .settings = &N(NpcSettings_ToadKid_Wander), + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, + .drops = NO_DROPS, .animations = TOAD_KID_RED_ANIMS, .tattle = MSG_NpcTattle_MAC_TravelFan, }, { .id = NPC_ToadKid_02, - .settings = &N(NpcSettings_ToadKid_Wander), .pos = { 320.0f, 20.0f, 410.0f }, .yaw = 270, - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, - .init = &N(EVS_NpcInit_ToadKid_02), - .drops = TOAD_KID_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -703,70 +699,70 @@ StaticNpc N(NpcData_Toads)[] = { .detectSize = { 10, 10 }, } }, + .init = &N(EVS_NpcInit_ToadKid_02), + .settings = &N(NpcSettings_ToadKid_Wander), + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, + .drops = NO_DROPS, .animations = TOAD_KID_YELLOW_ANIMS, .tattle = MSG_NpcTattle_MAC_GoodFriends, }, { .id = NPC_Toad_03, - .settings = &N(NpcSettings_Toad_Stationary), .pos = { 220.0f, 20.0f, -160.0f }, .yaw = 90, - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_Toad_03), - .drops = TOAD_DROPS, + .settings = &N(NpcSettings_Toad_Stationary), + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, + .drops = NO_DROPS, .animations = TOAD_RED_ANIMS, .tattle = MSG_NpcTattle_MAC_LilOinkFan, }, }; -StaticNpc N(NpcData_ThreeSisters)[] = { +NpcData N(NpcData_ThreeSisters)[] = { { .id = NPC_ThreeSisters_02, - .settings = &N(NpcSettings_Toad_Stationary), .pos = { -130.0f, 0.0f, 220.0f }, .yaw = 0, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_ThreeSisters_02), - .drops = TOADETTE_DROPS, + .settings = &N(NpcSettings_Toad_Stationary), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .drops = NO_DROPS, .animations = TOADETTE_PINK_ANIMS, .tattle = MSG_NpcTattle_TravelingMaidA, }, { .id = NPC_ThreeSisters_03, - .settings = &N(NpcSettings_Toad_Stationary), .pos = { -100.0f, 0.0f, 220.0f }, .yaw = 90, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_ThreeSisters_02), - .drops = TOADETTE_DROPS, + .settings = &N(NpcSettings_Toad_Stationary), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .drops = NO_DROPS, .animations = TOADETTE_PINK_ANIMS, .tattle = MSG_NpcTattle_TravelingMaidB, }, { .id = NPC_ThreeSisters_04, - .settings = &N(NpcSettings_Toad_Stationary), .pos = { -70.0f, 0.0f, 220.0f }, .yaw = 180, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_ThreeSisters_02), - .drops = TOADETTE_DROPS, + .settings = &N(NpcSettings_Toad_Stationary), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .drops = NO_DROPS, .animations = TOADETTE_PINK_ANIMS, .tattle = MSG_NpcTattle_TravelingMaidC, }, }; -StaticNpc N(NpcData_ShyGuy) = { +NpcData N(NpcData_ShyGuy) = { .id = NPC_ShyGuy, - .settings = &N(NpcSettings_ShyGuy), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 270, - .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | 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, .init = &N(EVS_NpcInit_ShyGuy), - .drops = { - .dropFlags = NPC_DROP_FLAG_80, - .heartDrops = NO_DROPS, - .flowerDrops = NO_DROPS, - }, + .settings = &N(NpcSettings_ShyGuy), + .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | 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, + .drops = NO_DROPS, .animations = { .idle = ANIM_ShyGuy_Red_Anim01, .walk = ANIM_ShyGuy_Red_Anim02, @@ -787,15 +783,11 @@ StaticNpc N(NpcData_ShyGuy) = { }, }; -StaticNpc N(NpcData_LilOinks)[] = { +NpcData N(NpcData_LilOinks)[] = { { .id = NPC_LilOink_01, - .settings = &N(NpcSettings_Toad_Wander), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, - .init = &N(EVS_NpcInit_Toad_04), - .drops = TOAD_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -808,16 +800,16 @@ StaticNpc N(NpcData_LilOinks)[] = { .detectSize = { 150, 70 }, } }, + .init = &N(EVS_NpcInit_Toad_04), + .settings = &N(NpcSettings_Toad_Wander), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, + .drops = NO_DROPS, .animations = TOAD_BLUE_ANIMS, }, { .id = NPC_LilOink_02, - .settings = &N(NpcSettings_Toad_Wander), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, - .init = &N(EVS_NpcInit_Toad_04), - .drops = TOAD_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -830,16 +822,16 @@ StaticNpc N(NpcData_LilOinks)[] = { .detectSize = { 150, 70 }, } }, + .init = &N(EVS_NpcInit_Toad_04), + .settings = &N(NpcSettings_Toad_Wander), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, + .drops = NO_DROPS, .animations = TOAD_BLUE_ANIMS, }, { .id = NPC_LilOink_03, - .settings = &N(NpcSettings_Toad_Wander), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, - .init = &N(EVS_NpcInit_Toad_04), - .drops = TOAD_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -852,16 +844,16 @@ StaticNpc N(NpcData_LilOinks)[] = { .detectSize = { 150, 70 }, } }, + .init = &N(EVS_NpcInit_Toad_04), + .settings = &N(NpcSettings_Toad_Wander), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, + .drops = NO_DROPS, .animations = TOAD_BLUE_ANIMS, }, { .id = NPC_LilOink_04, - .settings = &N(NpcSettings_Toad_Wander), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, - .init = &N(EVS_NpcInit_Toad_04), - .drops = TOAD_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -874,16 +866,16 @@ StaticNpc N(NpcData_LilOinks)[] = { .detectSize = { 150, 70 }, } }, + .init = &N(EVS_NpcInit_Toad_04), + .settings = &N(NpcSettings_Toad_Wander), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, + .drops = NO_DROPS, .animations = TOAD_BLUE_ANIMS, }, { .id = NPC_LilOink_05, - .settings = &N(NpcSettings_Toad_Wander), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, - .init = &N(EVS_NpcInit_Toad_04), - .drops = TOAD_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -896,16 +888,16 @@ StaticNpc N(NpcData_LilOinks)[] = { .detectSize = { 150, 70 }, } }, + .init = &N(EVS_NpcInit_Toad_04), + .settings = &N(NpcSettings_Toad_Wander), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, + .drops = NO_DROPS, .animations = TOAD_BLUE_ANIMS, }, { .id = NPC_LilOink_06, - .settings = &N(NpcSettings_Toad_Wander), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, - .init = &N(EVS_NpcInit_Toad_04), - .drops = TOAD_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -918,16 +910,16 @@ StaticNpc N(NpcData_LilOinks)[] = { .detectSize = { 150, 70 }, } }, + .init = &N(EVS_NpcInit_Toad_04), + .settings = &N(NpcSettings_Toad_Wander), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, + .drops = NO_DROPS, .animations = TOAD_BLUE_ANIMS, }, { .id = NPC_LilOink_07, - .settings = &N(NpcSettings_Toad_Wander), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, - .init = &N(EVS_NpcInit_Toad_04), - .drops = TOAD_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -940,16 +932,16 @@ StaticNpc N(NpcData_LilOinks)[] = { .detectSize = { 150, 70 }, } }, + .init = &N(EVS_NpcInit_Toad_04), + .settings = &N(NpcSettings_Toad_Wander), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, + .drops = NO_DROPS, .animations = TOAD_BLUE_ANIMS, }, { .id = NPC_LilOink_08, - .settings = &N(NpcSettings_Toad_Wander), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, - .init = &N(EVS_NpcInit_Toad_04), - .drops = TOAD_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -962,16 +954,16 @@ StaticNpc N(NpcData_LilOinks)[] = { .detectSize = { 150, 70 }, } }, + .init = &N(EVS_NpcInit_Toad_04), + .settings = &N(NpcSettings_Toad_Wander), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, + .drops = NO_DROPS, .animations = TOAD_BLUE_ANIMS, }, { .id = NPC_LilOink_09, - .settings = &N(NpcSettings_Toad_Wander), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, - .init = &N(EVS_NpcInit_Toad_04), - .drops = TOAD_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -984,16 +976,16 @@ StaticNpc N(NpcData_LilOinks)[] = { .detectSize = { 150, 70 }, } }, + .init = &N(EVS_NpcInit_Toad_04), + .settings = &N(NpcSettings_Toad_Wander), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, + .drops = NO_DROPS, .animations = TOAD_BLUE_ANIMS, }, { .id = NPC_LilOink_10, - .settings = &N(NpcSettings_Toad_Wander), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, - .init = &N(EVS_NpcInit_Toad_04), - .drops = TOAD_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -1006,16 +998,16 @@ StaticNpc N(NpcData_LilOinks)[] = { .detectSize = { 150, 70 }, } }, + .init = &N(EVS_NpcInit_Toad_04), + .settings = &N(NpcSettings_Toad_Wander), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, + .drops = NO_DROPS, .animations = TOAD_BLUE_ANIMS, }, { .id = NPC_Capsule, - .settings = &N(NpcSettings_Dummy), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, - .init = &N(EVS_NpcInit_Toad_14), - .drops = TOAD_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -1028,6 +1020,10 @@ StaticNpc N(NpcData_LilOinks)[] = { .detectSize = { 150, 70 }, } }, + .init = &N(EVS_NpcInit_Toad_14), + .settings = &N(NpcSettings_Dummy), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, + .drops = NO_DROPS, .animations = TOAD_BLUE_ANIMS, }, }; diff --git a/src/world/area_mac/mac_03/mac_03_5_entity.c b/src/world/area_mac/mac_03/mac_03_5_entity.c index b225a4cb02..49554867f2 100644 --- a/src/world/area_mac/mac_03/mac_03_5_entity.c +++ b/src/world/area_mac/mac_03/mac_03_5_entity.c @@ -25,7 +25,7 @@ EvtScript N(EVS_OnInspect_StreetSign) = { EvtScript N(EVS_MakeEntities) = { EVT_CALL(GetDemoState, LVar0) - EVT_IF_EQ(LVar0, 0) + EVT_IF_EQ(LVar0, DEMO_STATE_NONE) EVT_IF_EQ(GF_MAC03_BombedRock, FALSE) EVT_CALL(MakeEntity, EVT_PTR(Entity_BombableRock), -200, 0, 0, 0, MAKE_ENTITY_END) EVT_CALL(AssignScript, EVT_PTR(N(EVS_OnBlast_RailRock))) diff --git a/src/world/area_mac/mac_04/mac_04_6_npc.c b/src/world/area_mac/mac_04/mac_04_6_npc.c index 399b3ed91e..21fb06ffa0 100644 --- a/src/world/area_mac/mac_04/mac_04_6_npc.c +++ b/src/world/area_mac/mac_04/mac_04_6_npc.c @@ -169,19 +169,15 @@ API_CALLABLE(N(EnforceNewStatLimits)) { #include "npc_gossip_trio.inc.c" #include "npc_goomba_family.inc.c" -StaticNpc N(NpcData_Townsfolk)[] = { +NpcData N(NpcData_Townsfolk)[] = { { .id = NPC_ChetRippo, - .settings = &N(NpcSettings_ChetRippo), .pos = { 410.0f, 20.0f, -200.0f }, .yaw = 270, - .flags = COMMON_PASSIVE_FLAGS, .init = &N(EVS_NpcInit_ChetRippo), - .drops = { - .dropFlags = NPC_DROP_FLAG_80, - .heartDrops = NO_DROPS, - .flowerDrops = NO_DROPS, - }, + .settings = &N(NpcSettings_ChetRippo), + .flags = COMMON_PASSIVE_FLAGS, + .drops = NO_DROPS, .animations = { .idle = ANIM_ChetRippo_Idle, }, @@ -189,16 +185,12 @@ StaticNpc N(NpcData_Townsfolk)[] = { }, { .id = NPC_HarryT, - .settings = &N(NpcSettings_Toad_Stationary), .pos = { 310.0f, 20.0f, -430.0f }, .yaw = 230, - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_HarryT), - .drops = { - .dropFlags = NPC_DROP_FLAG_80, - .heartDrops = NO_DROPS, - .flowerDrops = NO_DROPS, - }, + .settings = &N(NpcSettings_Toad_Stationary), + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, + .drops = NO_DROPS, .animations = { .idle = ANIM_HarryT_Idle, .walk = ANIM_HarryT_Walk, @@ -210,34 +202,30 @@ StaticNpc N(NpcData_Townsfolk)[] = { }, { .id = NPC_NewResident1, - .settings = &N(NpcSettings_Toad_Stationary), .pos = { -80.0f, 20.0f, -100.0f }, .yaw = 133, - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_NewResident1), - .drops = TOADETTE_DROPS, + .settings = &N(NpcSettings_Toad_Stationary), + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, + .drops = NO_DROPS, .animations = TOADETTE_GREEN_ANIMS, .tattle = MSG_NpcTattle_MAC_NewResidentA, }, { .id = NPC_NewResident2, - .settings = &N(NpcSettings_Toad_Stationary), .pos = { -133.0f, 20.0f, -82.0f }, .yaw = 133, - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_NewResident2), - .drops = TOADETTE_DROPS, + .settings = &N(NpcSettings_Toad_Stationary), + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, + .drops = NO_DROPS, .animations = TOADETTE_PURPLE_ANIMS, .tattle = MSG_NpcTattle_MAC_NewResidentB, }, { .id = NPC_Toad_01, - .settings = &N(NpcSettings_Toad_Wander), .pos = { 48.0f, 0.0f, 153.0f }, .yaw = 270, - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, - .init = &N(EVS_NpcInit_Toad_01), - .drops = TOAD_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -250,140 +238,140 @@ StaticNpc N(NpcData_Townsfolk)[] = { .detectSize = { 10 }, } }, + .init = &N(EVS_NpcInit_Toad_01), + .settings = &N(NpcSettings_Toad_Wander), + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, + .drops = NO_DROPS, .animations = TOAD_BLUE_ANIMS, .tattle = MSG_NpcTattle_MAC_TalksAlot, }, { .id = NPC_Toad_02, - .settings = &N(NpcSettings_Toad_Stationary), .pos = { -239.0f, 20.0f, 105.0f }, .yaw = 90, - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_Toad_02), - .drops = TOAD_DROPS, + .settings = &N(NpcSettings_Toad_Stationary), + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, + .drops = NO_DROPS, .animations = TOAD_BLUE_ANIMS, .tattle = MSG_NpcTattle_MAC_WaryListener, }, { .id = NPC_ToadKid_01, - .settings = &N(NpcSettings_Toad_Stationary), .pos = { 254.0f, 20.0f, 436.0f }, .yaw = 90, - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_ToadKid_01), - .drops = TOAD_KID_DROPS, + .settings = &N(NpcSettings_Toad_Stationary), + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, + .drops = NO_DROPS, .animations = TOAD_KID_RED_ANIMS, .tattle = MSG_NpcTattle_MAC_CarefreeKids, }, { .id = NPC_ToadKid_02, - .settings = &N(NpcSettings_Toad_Stationary), .pos = { 304.0f, 20.0f, 410.0f }, .yaw = 270, - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_ToadKid_02), - .drops = TOAD_KID_DROPS, + .settings = &N(NpcSettings_Toad_Stationary), + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, + .drops = NO_DROPS, .animations = TOAD_KID_YELLOW_ANIMS, .tattle = MSG_NpcTattle_MAC_OutdoorKids, }, { .id = NPC_ToadKid_03, - .settings = &N(NpcSettings_Toad_Stationary), .pos = { 345.0f, 20.0f, 438.0f }, .yaw = 270, - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_ToadKid_03), - .drops = TOAD_KID_DROPS, + .settings = &N(NpcSettings_Toad_Stationary), + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, + .drops = NO_DROPS, .animations = TOAD_KID_GREEN_ANIMS, .tattle = MSG_NpcTattle_MAC_ShyKid, }, { .id = NPC_Toadette_03, - .settings = &N(NpcSettings_Toad_Stationary), .pos = { -274.0f, 0.0f, 400.0f }, .yaw = 90, - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_Toadette_03), - .drops = TOADETTE_DROPS, + .settings = &N(NpcSettings_Toad_Stationary), + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, + .drops = NO_DROPS, .animations = TOADETTE_ORANGE_ANIMS, .tattle = MSG_NpcTattle_ToadWhoWalks, }, { .id = NPC_Toad_03, - .settings = &N(NpcSettings_Toad_Stationary), .pos = { 500.0f, 20.0f, -160.0f }, .yaw = 270, - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_Toad_03), - .drops = TOAD_DROPS, + .settings = &N(NpcSettings_Toad_Stationary), + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, + .drops = NO_DROPS, .animations = TOAD_GREEN_ANIMS, .tattle = MSG_NpcTattle_GuideToad, }, { .id = NPC_GossipTrio1, - .settings = &N(NpcSettings_Toad_Stationary), .pos = { -110.0f, 0.0f, 568.0f }, .yaw = 270, - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_GossipTrio1), - .drops = TOAD_DROPS, + .settings = &N(NpcSettings_Toad_Stationary), + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, + .drops = NO_DROPS, .animations = TOAD_GREEN_ANIMS, .tattle = MSG_NpcTattle_GreatGossipTrioA, }, { .id = NPC_GossipTrio2, - .settings = &N(NpcSettings_Toad_Stationary), .pos = { -114.0f, 0.0f, 498.0f }, .yaw = 90, - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_GossipTrio2), - .drops = TOAD_DROPS, + .settings = &N(NpcSettings_Toad_Stationary), + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, + .drops = NO_DROPS, .animations = TOAD_RED_ANIMS, .tattle = MSG_NpcTattle_GreatGossipTrioB, }, { .id = NPC_GossipTrio3, - .settings = &N(NpcSettings_Toad_Stationary), .pos = { -52.0f, 0.0f, 525.0f }, .yaw = 90, - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_GossipTrio3), - .drops = TOAD_DROPS, + .settings = &N(NpcSettings_Toad_Stationary), + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, + .drops = NO_DROPS, .animations = TOAD_YELLOW_ANIMS, .tattle = MSG_NpcTattle_GreatGossipTrioC, }, }; -s32 N(ExtraAnims_Twink)[] = { +AnimID N(ExtraAnims_Twink)[] = { ANIM_Twink_Idle, ANIM_Twink_Fly, ANIM_Twink_Talk, - -1 + ANIM_LIST_END }; -StaticNpc N(NpcData_Chapter4)[] = { +NpcData N(NpcData_Chapter4)[] = { { .id = NPC_Twink, - .settings = &N(NpcSettings_Twink), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 90, - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_TwinkStartCh4), - .drops = TWINK_DROPS, + .settings = &N(NpcSettings_Twink), + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, + .drops = NO_DROPS, .animations = TWINK_ANIMS, .extraAnimations = N(ExtraAnims_Twink), }, { .id = NPC_ShyGuy_01, - .settings = &N(NpcSettings_Toad_Stationary), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 270, + .settings = &N(NpcSettings_Toad_Stationary), .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, - .drops = { - .dropFlags = NPC_DROP_FLAG_80, - .heartDrops = NO_DROPS, - .flowerDrops = NO_DROPS, - }, + .drops = NO_DROPS, .animations = { .idle = ANIM_ShyGuy_Red_Anim01, .walk = ANIM_ShyGuy_Red_Anim02, @@ -405,16 +393,12 @@ StaticNpc N(NpcData_Chapter4)[] = { }, { .id = NPC_ShyGuy_02, - .settings = &N(NpcSettings_Toad_Stationary), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_ShyGuy_02), - .drops = { - .dropFlags = NPC_DROP_FLAG_80, - .heartDrops = NO_DROPS, - .flowerDrops = NO_DROPS, - }, + .settings = &N(NpcSettings_Toad_Stationary), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .drops = NO_DROPS, .animations = { .idle = ANIM_ShyGuy_Red_Anim01, .walk = ANIM_ShyGuy_Red_Anim02, @@ -436,67 +420,63 @@ StaticNpc N(NpcData_Chapter4)[] = { }, }; -StaticNpc N(NpcData_PostChapter4)[] = { +NpcData N(NpcData_PostChapter4)[] = { { .id = NPC_Muskular, - .settings = &N(NpcSettings_StarSpirit), .pos = { -486.0f, 20.0f, 259.0f }, .yaw = 90, - .flags = COMMON_PASSIVE_FLAGS, .init = &N(EVS_NpcInit_Muskular), - .drops = MUSKULAR_DROPS, + .settings = &N(NpcSettings_StarSpirit), + .flags = COMMON_PASSIVE_FLAGS, + .drops = NO_DROPS, .animations = MUSKULAR_ANIMS, }, { .id = NPC_Twink, - .settings = &N(NpcSettings_StarSpirit), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 90, - .flags = COMMON_PASSIVE_FLAGS, .init = &N(EVS_NpcInit_TwinkEndCh4), - .drops = { - .dropFlags = NPC_DROP_FLAG_80, - .heartDrops = NO_DROPS, - .flowerDrops = NO_DROPS, - }, + .settings = &N(NpcSettings_StarSpirit), + .flags = COMMON_PASSIVE_FLAGS, + .drops = NO_DROPS, .animations = TWINK_ANIMS, }, }; -StaticNpc N(NpcData_GoombaFamily)[] = { +NpcData N(NpcData_GoombaFamily)[] = { { .id = NPC_Goomama, - .settings = &N(NpcSettings_GoombaFamily), .pos = { -126.0f, 0.0f, 329.0f }, .yaw = 90, - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_Goomama), - .drops = GOOMAMA_DROPS, + .settings = &N(NpcSettings_GoombaFamily), + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, + .drops = NO_DROPS, .animations = GOOMAMA_ANIMS, .tattle = MSG_NpcTattle_Goomama, }, { .id = NPC_Goombaria, - .settings = &N(NpcSettings_GoombaFamily), .pos = { -117.0f, 0.0f, 305.0f }, .yaw = 270, - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_Goombaria), - .drops = GOOMBARIA_DROPS, + .settings = &N(NpcSettings_GoombaFamily), + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, + .drops = NO_DROPS, .animations = GOOMBARIA_ANIMS, .tattle = MSG_NpcTattle_Goombaria, }, }; -StaticNpc N(NpcData_ChuckQuizmo) = { +NpcData N(NpcData_ChuckQuizmo) = { .id = NPC_ChuckQuizmo, - .settings = &N(NpcSettings_ChuckQuizmo), .pos = { 57.0f, 20.0f, -114.0f }, .yaw = 270, - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_4000, .initVarCount = 1, .initVar = { .bytes = { 0, QUIZ_AREA_MAC, QUIZ_COUNT_MAC, QUIZ_MAP_MAC_04 }}, - .drops = QUIZMO_DROPS, + .settings = &N(NpcSettings_ChuckQuizmo), + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_4000, + .drops = NO_DROPS, .animations = QUIZMO_ANIMS, .tattle = MSG_NpcTattle_ChuckQuizmo, }; diff --git a/src/world/area_mac/mac_04/mac_04_7_wish_scene.c b/src/world/area_mac/mac_04/mac_04_7_wish_scene.c index ab4dc75739..cfafd5a2bc 100644 --- a/src/world/area_mac/mac_04/mac_04_7_wish_scene.c +++ b/src/world/area_mac/mac_04/mac_04_7_wish_scene.c @@ -35,44 +35,44 @@ EvtScript N(EVS_NpcInit_WishingToadKid) = { EVT_END }; -StaticNpc N(NpcData_WishSceneToads)[] = { +NpcData N(NpcData_WishSceneToads)[] = { { .id = NPC_WishingToadKid, - .settings = &N(NpcSettings_Toad_Stationary_Wish), .pos = { 350.0f, 0.0f, -20.0f }, .yaw = 270, - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_WishingToadKid), - .drops = TOAD_KID_DROPS, + .settings = &N(NpcSettings_Toad_Stationary_Wish), + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, + .drops = NO_DROPS, .animations = TOAD_KID_RED_ANIMS, }, { .id = NPC_GossipTrio1, - .settings = &N(NpcSettings_Toad_Stationary_Wish), .pos = { -245.0f, 20.0f, 100.0f }, .yaw = 270, + .settings = &N(NpcSettings_Toad_Stationary_Wish), .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT, - .drops = TOAD_DROPS, + .drops = NO_DROPS, .animations = TOAD_GREEN_ANIMS, .tattle = MSG_NpcTattle_GreatGossipTrioA, }, { .id = NPC_GossipTrio2, - .settings = &N(NpcSettings_Toad_Stationary_Wish), .pos = { -25.0f, 0.0f, 170.0f }, .yaw = 270, + .settings = &N(NpcSettings_Toad_Stationary_Wish), .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT, - .drops = TOAD_DROPS, + .drops = NO_DROPS, .animations = TOAD_RED_ANIMS, .tattle = MSG_NpcTattle_GreatGossipTrioB, }, { .id = NPC_GossipTrio3, - .settings = &N(NpcSettings_Toad_Stationary_Wish), .pos = { -100.0f, 0.0f, 305.0f }, .yaw = 90, + .settings = &N(NpcSettings_Toad_Stationary_Wish), .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT, - .drops = TOAD_DROPS, + .drops = NO_DROPS, .animations = TOAD_YELLOW_ANIMS, .tattle = MSG_NpcTattle_GreatGossipTrioC, }, diff --git a/src/world/area_mac/mac_05/mac_05_3_main.c b/src/world/area_mac/mac_05/mac_05_3_main.c index 651616cf46..a9ddd19888 100644 --- a/src/world/area_mac/mac_05/mac_05_3_main.c +++ b/src/world/area_mac/mac_05/mac_05_3_main.c @@ -1,7 +1,6 @@ #include "mac_05.h" #include "world/common/atomic/TexturePan.inc.c" -#include "world/common/atomic/TexturePan.data.inc.c" #define NAMESPACE dup_mac_05 #include "world/common/todo/UnkFloatFunc001.inc.c" 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 27204e5d2e..fe1d10098e 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 @@ -2059,42 +2059,38 @@ EvtScript N(EVS_NpcInit_TradeEventToad) = { EVT_END }; -StaticNpc N(NpcData_Toad_01) = { +NpcData N(NpcData_Toad_01) = { .id = NPC_Whale, - .settings = &N(NpcSettings_Whale), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_Toad_01), - .drops = TOAD_DROPS, + .settings = &N(NpcSettings_Whale), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_400000, + .drops = NO_DROPS, .animations = TOAD_RED_ANIMS, .tattle = MSG_NpcTattle_Whale, }; -StaticNpc N(NpcData_Kolorado) = { +NpcData N(NpcData_Kolorado) = { .id = NPC_Kolorado, - .settings = &N(NpcSettings_Kolorado), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 270, - .flags = COMMON_PASSIVE_FLAGS, .init = &N(EVS_NpcInit_Kolorado), - .drops = KOLORADO_DROPS, + .settings = &N(NpcSettings_Kolorado), + .flags = COMMON_PASSIVE_FLAGS, + .drops = NO_DROPS, .animations = KOLORADO_ANIMS, .tattle = MSG_NpcTattle_Kolorado, }; -StaticNpc N(NpcData_Fishmael) = { +NpcData N(NpcData_Fishmael) = { .id = NPC_Fishmael, - .settings = &N(NpcSettings_Toad_Stationary), .pos = { 370.0f, -10.0f, -115.0f }, .yaw = 270, - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_Fishmael), - .drops = { - .dropFlags = NPC_DROP_FLAG_80, - .heartDrops = NO_DROPS, - .flowerDrops = NO_DROPS, - }, + .settings = &N(NpcSettings_Toad_Stationary), + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_400000, + .drops = NO_DROPS, .animations = { .idle = ANIM_Fishmael_Idle, }, @@ -2110,18 +2106,14 @@ AnimID N(Fuzzipede_ExtraAnims)[] = { -1 }; -StaticNpc N(NpcData_Fuzzipede) = { +NpcData N(NpcData_Fuzzipede) = { .id = NPC_Fuzzipede, - .settings = &N(NpcSettings_Toad_Stationary), .pos = { 320.0f, -10.0f, -115.0f }, .yaw = 90, - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_Fuzzipede), - .drops = { - .dropFlags = NPC_DROP_FLAG_80, - .heartDrops = NO_DROPS, - .flowerDrops = NO_DROPS, - }, + .settings = &N(NpcSettings_Toad_Stationary), + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_400000, + .drops = NO_DROPS, .animations = { .idle = ANIM_Fuzzipede_Anim04, }, @@ -2145,19 +2137,15 @@ AnimID N(JrTroopa_ExtraAnims)[] = { -1 }; -StaticNpc N(NpcData_JrTroopa_01)[] = { +NpcData N(NpcData_JrTroopa_01)[] = { { .id = NPC_JrTroopa_01, - .settings = &N(NpcSettings_JrTroopa_01), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_JrTroopa_01), - .drops = { - .dropFlags = NPC_DROP_FLAG_80, - .heartDrops = NO_DROPS, - .flowerDrops = NO_DROPS, - }, + .settings = &N(NpcSettings_JrTroopa_01), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_400000, + .drops = NO_DROPS, .animations = { .idle = ANIM_JrTroopa_Idle, .walk = ANIM_JrTroopa_Walk, @@ -2181,16 +2169,12 @@ StaticNpc N(NpcData_JrTroopa_01)[] = { }, { .id = NPC_JrTroopa_02, - .settings = &N(NpcSettings_JrTroopa_01), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 270, - .flags = ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_400000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_20000000, .init = &N(EVS_NpcInit_JrTroopa_02), - .drops = { - .dropFlags = NPC_DROP_FLAG_80, - .heartDrops = NO_DROPS, - .flowerDrops = NO_DROPS, - }, + .settings = &N(NpcSettings_JrTroopa_01), + .flags = ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_400000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_20000000, + .drops = NO_DROPS, .animations = { .idle = ANIM_JrTroopa_Idle, .walk = ANIM_JrTroopa_Walk, @@ -2214,19 +2198,15 @@ StaticNpc N(NpcData_JrTroopa_01)[] = { }, }; -StaticNpc N(NpcData_Toad_04)[] = { +NpcData N(NpcData_Toad_04)[] = { { .id = NPC_Toad_04, - .settings = &N(NpcSettings_Toad_Stationary), .pos = { 320.0f, 0.0f, -300.0f }, .yaw = 270, - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_Toad_04), - .drops = { - .dropFlags = NPC_DROP_FLAG_80, - .heartDrops = NO_DROPS, - .flowerDrops = NO_DROPS, - }, + .settings = &N(NpcSettings_Toad_Stationary), + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, + .drops = NO_DROPS, .animations = { .idle = ANIM_Toad_Blue_Idle, .walk = ANIM_Toad_Blue_Walk, @@ -2249,16 +2229,12 @@ StaticNpc N(NpcData_Toad_04)[] = { }, { .id = NPC_Toad_05, - .settings = &N(NpcSettings_Toad_Stationary), .pos = { -330.0f, -10.0f, -90.0f }, .yaw = 90, - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_Toad_05), - .drops = { - .dropFlags = NPC_DROP_FLAG_80, - .heartDrops = NO_DROPS, - .flowerDrops = NO_DROPS, - }, + .settings = &N(NpcSettings_Toad_Stationary), + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, + .drops = NO_DROPS, .animations = { .idle = ANIM_Toad_Blue_Idle, .walk = ANIM_Toad_Blue_Walk, @@ -2281,16 +2257,12 @@ StaticNpc N(NpcData_Toad_04)[] = { }, { .id = NPC_Toad_06, - .settings = &N(NpcSettings_Toad_Stationary), .pos = { -50.0f, 0.0f, -400.0f }, .yaw = 270, - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_Toad_06), - .drops = { - .dropFlags = NPC_DROP_FLAG_80, - .heartDrops = NO_DROPS, - .flowerDrops = NO_DROPS, - }, + .settings = &N(NpcSettings_Toad_Stationary), + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, + .drops = NO_DROPS, .animations = { .idle = ANIM_Toad_Red_Idle, .walk = ANIM_Toad_Red_Walk, @@ -2313,16 +2285,8 @@ StaticNpc N(NpcData_Toad_04)[] = { }, { .id = NPC_Toad_07, - .settings = &N(NpcSettings_Toad_Stationary), .pos = { 200.0f, 0.0f, -220.0f }, .yaw = 270, - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, - .init = &N(EVS_NpcInit_Toad_07), - .drops = { - .dropFlags = NPC_DROP_FLAG_80, - .heartDrops = NO_DROPS, - .flowerDrops = NO_DROPS, - }, .territory = { .patrol = { .isFlying = TRUE, @@ -2337,6 +2301,10 @@ StaticNpc N(NpcData_Toad_04)[] = { .detectSize = { 10 }, } }, + .init = &N(EVS_NpcInit_Toad_07), + .settings = &N(NpcSettings_Toad_Stationary), + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, + .drops = NO_DROPS, .animations = { .idle = ANIM_Toad_Yellow_Idle, .walk = ANIM_Toad_Yellow_Walk, @@ -2359,19 +2327,15 @@ StaticNpc N(NpcData_Toad_04)[] = { }, }; -StaticNpc N(NpcData_Bartender)[] = { +NpcData N(NpcData_Bartender)[] = { { .id = NPC_Bartender, - .settings = &N(NpcSettings_Toad_Stationary), .pos = { -85.0f, 0.0f, -520.0f }, .yaw = 90, - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_Bartender), - .drops = { - .dropFlags = NPC_DROP_FLAG_80, - .heartDrops = NO_DROPS, - .flowerDrops = NO_DROPS, - }, + .settings = &N(NpcSettings_Toad_Stationary), + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, + .drops = NO_DROPS, .animations = { .idle = ANIM_Bartender_Idle, .walk = ANIM_Bartender_Idle, @@ -2394,16 +2358,12 @@ StaticNpc N(NpcData_Bartender)[] = { }, { .id = NPC_Toad_02, - .settings = &N(NpcSettings_Toad_Stationary), .pos = { 30.0f, 0.0f, -570.0f }, .yaw = 270, - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_Toad_02), - .drops = { - .dropFlags = NPC_DROP_FLAG_80, - .heartDrops = NO_DROPS, - .flowerDrops = NO_DROPS, - }, + .settings = &N(NpcSettings_Toad_Stationary), + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, + .drops = NO_DROPS, .animations = { .idle = ANIM_Toad_Red_Idle, .walk = ANIM_Toad_Red_Walk, @@ -2426,16 +2386,12 @@ StaticNpc N(NpcData_Bartender)[] = { }, { .id = NPC_Chanterelle, - .settings = &N(NpcSettings_Toad_Stationary), .pos = { 208.0f, 0.0f, -530.0f }, .yaw = 270, - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_Chanterelle), - .drops = { - .dropFlags = NPC_DROP_FLAG_80, - .heartDrops = NO_DROPS, - .flowerDrops = NO_DROPS, - }, + .settings = &N(NpcSettings_Toad_Stationary), + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, + .drops = NO_DROPS, .animations = { .idle = ANIM_Chanterelle_Idle, .walk = ANIM_Chanterelle_Still, @@ -2458,16 +2414,12 @@ StaticNpc N(NpcData_Bartender)[] = { }, { .id = NPC_ArtistToad, - .settings = &N(NpcSettings_Toad_Stationary), .pos = { 158.0f, 0.0f, -555.0f }, .yaw = 90, - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_ArtistToad), - .drops = { - .dropFlags = NPC_DROP_FLAG_80, - .heartDrops = NO_DROPS, - .flowerDrops = NO_DROPS, - }, + .settings = &N(NpcSettings_Toad_Stationary), + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, + .drops = NO_DROPS, .animations = { .idle = ANIM_Musician_Poet_Idle, .walk = ANIM_Musician_Poet_Idle, @@ -2490,16 +2442,12 @@ StaticNpc N(NpcData_Bartender)[] = { }, { .id = NPC_TradeEventToad, - .settings = &N(NpcSettings_Toad_Stationary), .pos = { 92.0f, 0.0f, -500.0f }, .yaw = 90, - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_10000 | ENEMY_FLAG_100000, .init = &N(EVS_NpcInit_TradeEventToad), - .drops = { - .dropFlags = NPC_DROP_FLAG_80, - .heartDrops = NO_DROPS, - .flowerDrops = NO_DROPS, - }, + .settings = &N(NpcSettings_Toad_Stationary), + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_10000 | ENEMY_FLAG_100000, + .drops = NO_DROPS, .animations = { .idle = ANIM_Toad_Pink_Idle, .walk = ANIM_Toad_Pink_Walk, @@ -2522,19 +2470,15 @@ StaticNpc N(NpcData_Bartender)[] = { }, }; -StaticNpc N(NpcData_ChuckQuizmo) = { +NpcData N(NpcData_ChuckQuizmo) = { .id = NPC_ChuckQuizmo, - .settings = &N(NpcSettings_ChuckQuizmo), .pos = { 472.0f, 0.0f, -230.0f }, .yaw = 90, - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_4000, .initVarCount = 1, .initVar = { .bytes = { 0, QUIZ_AREA_MAC, QUIZ_COUNT_MAC, QUIZ_MAP_MAC_05 }}, - .drops = { - .dropFlags = NPC_DROP_FLAG_80, - .heartDrops = NO_DROPS, - .flowerDrops = NO_DROPS, - }, + .settings = &N(NpcSettings_ChuckQuizmo), + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_4000, + .drops = NO_DROPS, .animations = { .idle = ANIM_ChuckQuizmo_Idle, .walk = ANIM_ChuckQuizmo_Walk, diff --git a/src/world/area_mac/mac_06/mac_06_1_main.c b/src/world/area_mac/mac_06/mac_06_1_main.c index f79938f25e..9e6dbd0f40 100644 --- a/src/world/area_mac/mac_06/mac_06_1_main.c +++ b/src/world/area_mac/mac_06/mac_06_1_main.c @@ -1,7 +1,6 @@ #include "mac_06.h" #include "world/common/atomic/TexturePan.inc.c" -#include "world/common/atomic/TexturePan.data.inc.c" API_CALLABLE(N(GetWaveAmplitude)) { Bytecode* args = script->ptrReadPos; 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 b74fabe875..95141c20ef 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 @@ -509,18 +509,14 @@ EvtScript N(EVS_NpcInit_JrTroopa) = { EVT_END }; -StaticNpc N(NpcData_Whale) = { +NpcData N(NpcData_Whale) = { .id = NPC_Whale, - .settings = &N(NpcSettings_Whale), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_Whale), - .drops = { - .dropFlags = NPC_DROP_FLAG_80, - .heartDrops = NO_DROPS, - .flowerDrops = NO_DROPS, - }, + .settings = &N(NpcSettings_Whale), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = NO_DROPS, .animations = { .idle = ANIM_Kolorado_Idle, .walk = ANIM_Kolorado_Walk, @@ -541,18 +537,14 @@ StaticNpc N(NpcData_Whale) = { }, }; -StaticNpc N(NpcData_Kolorado) = { +NpcData N(NpcData_Kolorado) = { .id = NPC_Kolorado, - .settings = &N(NpcSettings_Kolorado), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 270, - .flags = COMMON_PASSIVE_FLAGS, .init = &N(EVS_NpcInit_Kolorado), - .drops = { - .dropFlags = NPC_DROP_FLAG_80, - .heartDrops = NO_DROPS, - .flowerDrops = NO_DROPS, - }, + .settings = &N(NpcSettings_Kolorado), + .flags = COMMON_PASSIVE_FLAGS, + .drops = NO_DROPS, .animations = { .idle = ANIM_Kolorado_Idle, .walk = ANIM_Kolorado_Walk, @@ -573,25 +565,21 @@ StaticNpc N(NpcData_Kolorado) = { }, }; -s32 N(ExtraAnims_JrTroopa)[] = { +AnimID N(ExtraAnims_JrTroopa)[] = { ANIM_JrTroopa_Still, ANIM_JrTroopa_Idle, ANIM_JrTroopa_ChargeTripped, - -1 + ANIM_LIST_END }; -StaticNpc N(NpcData_JrTroopa) = { +NpcData N(NpcData_JrTroopa) = { .id = NPC_JrTroopa, - .settings = &N(NpcSettings_JrTroopa), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_JrTroopa), - .drops = { - .dropFlags = NPC_DROP_FLAG_80, - .heartDrops = NO_DROPS, - .flowerDrops = NO_DROPS, - }, + .settings = &N(NpcSettings_JrTroopa), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_400000, + .drops = NO_DROPS, .animations = { .idle = ANIM_JrTroopa_Idle, .walk = ANIM_JrTroopa_Walk, diff --git a/src/world/area_mac/machi/machi.h b/src/world/area_mac/machi/machi.h index 1453eb0c07..98e6193bbe 100644 --- a/src/world/area_mac/machi/machi.h +++ b/src/world/area_mac/machi/machi.h @@ -43,7 +43,7 @@ extern EvtScript N(EVS_FlyPartnerAround); extern EvtScript N(EVS_MakeEntities); extern NpcSettings N(NpcSettings_GoombaKing); -extern StaticNpc N(NpcData_Misstar); +extern NpcData N(NpcData_Misstar); extern NpcGroupList N(DefaultNPCs); typedef struct GameVarRange { diff --git a/src/world/area_mac/machi/machi_5_npc.c b/src/world/area_mac/machi/machi_5_npc.c index 3583795779..6291596b53 100644 --- a/src/world/area_mac/machi/machi_5_npc.c +++ b/src/world/area_mac/machi/machi_5_npc.c @@ -248,138 +248,138 @@ NpcSettings N(NpcSettings_Goompa) = { .flags = ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_100000, }; -StaticNpc N(NpcData_05)[] = { +NpcData N(NpcData_05)[] = { { .id = NPC_05, - .settings = &N(NpcSettings_StarRod), .pos = { 16.0f, 0.0f, -411.0f }, .yaw = 0, - .flags = 0, .init = (void*) 0x1F64, + .settings = &N(NpcSettings_StarRod), + .flags = 0, .animations = {}, }, { .id = NPC_06, - .settings = &N(NpcSettings_Koopa), .pos = { 389.0f, 0.0f, -278.0f }, .yaw = 0, - .flags = 0, .init = (void*) 0x1F64, + .settings = &N(NpcSettings_Koopa), + .flags = 0, .animations = {}, }, { .id = NPC_07, - .settings = &N(NpcSettings_Kolorado), .pos = { 481.0f, 0.0f, -44.0f }, .yaw = 0, - .flags = 0, .init = (void*) 0x1F64, + .settings = &N(NpcSettings_Kolorado), + .flags = 0, .animations = {}, }, }; -StaticNpc N(NpcData_GoombaFamily) = { +NpcData N(NpcData_GoombaFamily) = { .id = NPC_Goompa, - .settings = &N(NpcSettings_Goompa), .pos = { 0.0f, 0.0f, 0.0f }, .yaw = 0, - .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT, .init = (void*) 0x1F64, + .settings = &N(NpcSettings_Goompa), + .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT, .animations = { }, }; -StaticNpc N(NpcData_0B)[] = { +NpcData N(NpcData_0B)[] = { { .id = NPC_0B, - .settings = &N(NpcSettings_Goompa), .pos = { 0.0f, 0.0f, 0.0f }, .yaw = 0, - .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT, .init = (void*) 0x1F64, + .settings = &N(NpcSettings_Goompa), + .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT, .animations = {}, }, { .id = NPC_0C, - .settings = &N(NpcSettings_Goompa), .pos = { 0.0f, 0.0f, 0.0f }, .yaw = 0, - .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT, .init = (void*) 0x1F64, + .settings = &N(NpcSettings_Goompa), + .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT, .animations = {}, }, { .id = NPC_0D, - .settings = &N(NpcSettings_Goompa), .pos = { 0.0f, 0.0f, 0.0f }, .yaw = 0, - .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT, .init = (void*) 0x1F64, + .settings = &N(NpcSettings_Goompa), + .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT, .animations = {}, }, { .id = NPC_0E, - .settings = &N(NpcSettings_Goompa), .pos = { 0.0f, 0.0f, 0.0f }, .yaw = 0, - .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT, .init = (void*) 0x1F64, + .settings = &N(NpcSettings_Goompa), + .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT, .animations = {}, }, { .id = NPC_0F, - .settings = &N(NpcSettings_Goompa), .pos = { 0.0f, 0.0f, 0.0f }, .yaw = 0, - .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT, .init = (void*) 0x1F64, + .settings = &N(NpcSettings_Goompa), + .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT, .animations = {}, }, { .id = NPC_10, - .settings = &N(NpcSettings_Goompa), .pos = { 0.0f, 0.0f, 0.0f }, .yaw = 0, - .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT, .init = (void*) 0x1F64, + .settings = &N(NpcSettings_Goompa), + .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT, .animations = {}, }, { .id = NPC_11, - .settings = &N(NpcSettings_Goompa), .pos = { 0.0f, 0.0f, 0.0f }, .yaw = 0, - .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT, .init = (void*) 0x1F64, + .settings = &N(NpcSettings_Goompa), + .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT, .animations = {}, }, { .id = NPC_12, - .settings = &N(NpcSettings_Goompa), .pos = { 0.0f, 0.0f, 0.0f }, .yaw = 0, - .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT, .init = (void*) 0x1F64, + .settings = &N(NpcSettings_Goompa), + .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT, .animations = {}, }, { .id = NPC_13, - .settings = &N(NpcSettings_Goompa), .pos = { 0.0f, 0.0f, 0.0f }, .yaw = 0, - .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT, .init = (void*) 0x1F64, + .settings = &N(NpcSettings_Goompa), + .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT, .animations = {}, }, }; -StaticNpc N(NpcData_GoombaKing) = { +NpcData N(NpcData_GoombaKing) = { .id = NPC_GoombaKing, - .settings = &N(NpcSettings_GoombaKing), .pos = { 12.0f, 0.0f, -13.0f }, .yaw = 0, - .flags = 0, .init = (void*) 0x4003, + .settings = &N(NpcSettings_GoombaKing), + .flags = 0, .animations = {} }; diff --git a/src/world/area_mac/machi/machi_6_misstar.c b/src/world/area_mac/machi/machi_6_misstar.c index 45a76613f6..ac286e1b9e 100644 --- a/src/world/area_mac/machi/machi_6_misstar.c +++ b/src/world/area_mac/machi/machi_6_misstar.c @@ -105,11 +105,11 @@ NpcSettings N(NpcSettings_Misstar) = { .flags = ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, }; -StaticNpc N(NpcData_Misstar) = { +NpcData N(NpcData_Misstar) = { .id = NPC_Misstar, - .settings = &N(NpcSettings_Misstar), .pos = { 320.0f, 30.0f, -290.0f }, .yaw = 100, + .settings = &N(NpcSettings_Misstar), .flags = ENEMY_FLAG_PASSIVE, .animations = {}, }; diff --git a/src/world/area_mgm/mgm.h b/src/world/area_mgm/mgm.h index 29be41e9ab..06133f778d 100644 --- a/src/world/area_mgm/mgm.h +++ b/src/world/area_mgm/mgm.h @@ -2,22 +2,22 @@ #define _WORLD_AREA_MGM_MGM_H_ enum { - AB_MGM_0 = AreaByte(0), - AB_MGM_1 = AreaByte(1), - AB_MGM_2 = AreaByte(2), - AB_MGM_3 = AreaByte(3), - AB_MGM_4 = AreaByte(4), - AB_MGM_5 = AreaByte(5), - AB_MGM_6 = AreaByte(6), - AB_MGM_7 = AreaByte(7), - AB_MGM_8 = AreaByte(8), - AB_MGM_9 = AreaByte(9), - AB_MGM_A = AreaByte(10), - AB_MGM_B = AreaByte(11), - AB_MGM_C = AreaByte(12), - AB_MGM_D = AreaByte(13), - AB_MGM_E = AreaByte(14), - AB_MGM_F = AreaByte(15), + AB_MGM_Unused_0 = AreaByte(0), + AB_MGM_Unused_1 = AreaByte(1), + AB_MGM_Unused_2 = AreaByte(2), + AB_MGM_Unused_3 = AreaByte(3), + AB_MGM_Unused_4 = AreaByte(4), + AB_MGM_Unused_5 = AreaByte(5), + AB_MGM_Unused_6 = AreaByte(6), + AB_MGM_Unused_7 = AreaByte(7), + AB_MGM_Unused_8 = AreaByte(8), + AB_MGM_Unused_9 = AreaByte(9), + AB_MGM_Unused_A = AreaByte(10), + AB_MGM_Unused_B = AreaByte(11), + AB_MGM_Unused_C = AreaByte(12), + AB_MGM_Unused_D = AreaByte(13), + AB_MGM_Unused_E = AreaByte(14), + AB_MGM_Unused_F = AreaByte(15), }; #define AF_MGM(index) AreaFlag(index) diff --git a/src/world/area_mgm/mgm_00/mgm_00_2_npc.c b/src/world/area_mgm/mgm_00/mgm_00_2_npc.c index c16ad2b3d9..3a49872d47 100644 --- a/src/world/area_mgm/mgm_00/mgm_00_2_npc.c +++ b/src/world/area_mgm/mgm_00/mgm_00_2_npc.c @@ -165,14 +165,14 @@ EvtScript N(EVS_NpcInit_RedToad) = { EVT_END }; -StaticNpc N(NpcData_RedToad) = { +NpcData N(NpcData_RedToad) = { .id = NPC_RedToad, - .settings = &N(NpcSettings_Toad_Stationary), .pos = { -213.0f, 12.0f, -180.0f }, .yaw = 90, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_RedToad), - .drops = TOAD_DROPS, + .settings = &N(NpcSettings_Toad_Stationary), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .drops = NO_DROPS, .animations = TOAD_RED_ANIMS, .tattle = MSG_NpcTattle_MGM_PlayroomReceptionist, }; @@ -205,14 +205,10 @@ EvtScript N(EVS_NpcInit_GreenToad) = { EVT_END }; -StaticNpc N(NpcData_GreenToad) = { +NpcData N(NpcData_GreenToad) = { .id = NPC_GreenToad, - .settings = &N(NpcSettings_Toad_Patrol), .pos = { -88.0f, 0.0f, -95.0f }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, - .init = &N(EVS_NpcInit_GreenToad), - .drops = TOAD_DROPS, .territory = { .patrol = { .isFlying = TRUE, @@ -227,6 +223,10 @@ StaticNpc N(NpcData_GreenToad) = { .detectSize = { 0 }, } }, + .init = &N(EVS_NpcInit_GreenToad), + .settings = &N(NpcSettings_Toad_Patrol), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .drops = NO_DROPS, .animations = TOAD_GREEN_ANIMS, .tattle = MSG_NpcTattle_MGM_PlayroomCustomer, }; @@ -255,14 +255,10 @@ EvtScript N(EVS_NpcInit_BlueToad) = { EVT_END }; -StaticNpc N(NpcData_BlueToad) = { +NpcData N(NpcData_BlueToad) = { .id = NPC_BlueToad, - .settings = &N(NpcSettings_Toad_Patrol), .pos = { 46.0f, 0.0f, -205.0f }, .yaw = 90, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, - .init = &N(EVS_NpcInit_BlueToad), - .drops = TOAD_DROPS, .territory = { .patrol = { .isFlying = TRUE, @@ -277,6 +273,10 @@ StaticNpc N(NpcData_BlueToad) = { .detectSize = { 0 }, } }, + .init = &N(EVS_NpcInit_BlueToad), + .settings = &N(NpcSettings_Toad_Patrol), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .drops = NO_DROPS, .animations = TOAD_BLUE_ANIMS, .tattle = MSG_NpcTattle_MGM_BestPlayroomCustomer, }; diff --git a/src/world/area_mgm/mgm_01/mgm_01_2_npc.c b/src/world/area_mgm/mgm_01/mgm_01_2_npc.c index 50917c00e1..39f034dbca 100644 --- a/src/world/area_mgm/mgm_01/mgm_01_2_npc.c +++ b/src/world/area_mgm/mgm_01/mgm_01_2_npc.c @@ -1013,14 +1013,14 @@ EvtScript N(EVS_NpcInit_Toad) = { EVT_END }; -StaticNpc N(NpcData_Toad) = { +NpcData N(NpcData_Toad) = { .id = NPC_Toad, - .settings = &N(NpcSettings_Toad_Stationary), .pos = { 0.0f, 0.0f, -20.0f }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_Toad), - .drops = TOAD_DROPS, + .settings = &N(NpcSettings_Toad_Stationary), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .drops = NO_DROPS, .animations = TOAD_RED_ANIMS, .tattle = MSG_NpcTattle_MGM_JumpAttackGuide, }; diff --git a/src/world/area_mgm/mgm_02/mgm_02_2_npc.c b/src/world/area_mgm/mgm_02/mgm_02_2_npc.c index 85226ebe02..cc2c018b03 100644 --- a/src/world/area_mgm/mgm_02/mgm_02_2_npc.c +++ b/src/world/area_mgm/mgm_02/mgm_02_2_npc.c @@ -1012,7 +1012,7 @@ NpcSettings N(NpcSettings_Luigi) = { .level = 99, }; -#include "world/common/enemy/complete/Fuzzy.inc.c" +#include "world/common/enemy/Fuzzy.inc.c" NpcSettings N(NpcSettings_Bobomb) = { .height = 23, @@ -1777,14 +1777,14 @@ EvtScript N(EVS_NpcInit_Toad) = { EVT_END }; -StaticNpc N(NpcData_GuideToad) = { +NpcData N(NpcData_GuideToad) = { .id = NPC_Toad, - .settings = &N(NpcSettings_Toad_Stationary), .pos = { 353.0f, -20.0f, 185.0f }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_Toad), - .drops = TOAD_DROPS, + .settings = &N(NpcSettings_Toad_Stationary), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .drops = NO_DROPS, .animations = TOAD_RED_ANIMS, .tattle = MSG_NpcTattle_MGM_SmashAttackGuide, }; @@ -1861,18 +1861,14 @@ EvtScript N(EVS_NpcInit_Luigi) = { EVT_END }; -StaticNpc N(NpcData_Fuzzy_01) = { +NpcData N(NpcData_Fuzzy_01) = { .id = NPC_Fuzzy_01, - .settings = &N(NpcSettings_Fuzzy), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_200000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_8000000 | ENEMY_FLAG_10000000 | ENEMY_FLAG_20000000, .init = &N(EVS_NpcInit_Fuzzy), - .drops = { - .dropFlags = NPC_DROP_FLAG_80, - .heartDrops = NO_DROPS, - .flowerDrops = NO_DROPS, - }, + .settings = &N(NpcSettings_Fuzzy), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_200000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_8000000 | ENEMY_FLAG_10000000 | ENEMY_FLAG_20000000, + .drops = NO_DROPS, .animations = { .idle = ANIM_Fuzzy_Walk, .walk = ANIM_Fuzzy_Walk, @@ -1894,18 +1890,14 @@ StaticNpc N(NpcData_Fuzzy_01) = { .tattle = MSG_NpcTattle_MGM_SmashAttackGuide, }; -StaticNpc N(NpcData_Fuzzy_02) = { +NpcData N(NpcData_Fuzzy_02) = { .id = NPC_Fuzzy_02, - .settings = &N(NpcSettings_Fuzzy), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_200000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_8000000 | ENEMY_FLAG_10000000 | ENEMY_FLAG_20000000, .init = &N(EVS_NpcInit_Fuzzy), - .drops = { - .dropFlags = NPC_DROP_FLAG_80, - .heartDrops = NO_DROPS, - .flowerDrops = NO_DROPS, - }, + .settings = &N(NpcSettings_Fuzzy), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_200000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_8000000 | ENEMY_FLAG_10000000 | ENEMY_FLAG_20000000, + .drops = NO_DROPS, .animations = { .idle = ANIM_Fuzzy_Walk, .walk = ANIM_Fuzzy_Walk, @@ -1927,18 +1919,14 @@ StaticNpc N(NpcData_Fuzzy_02) = { .tattle = MSG_NpcTattle_MGM_SmashAttackGuide, }; -StaticNpc N(NpcData_Fuzzy_03) = { +NpcData N(NpcData_Fuzzy_03) = { .id = NPC_Fuzzy_03, - .settings = &N(NpcSettings_Fuzzy), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_200000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_8000000 | ENEMY_FLAG_10000000 | ENEMY_FLAG_20000000, .init = &N(EVS_NpcInit_Fuzzy), - .drops = { - .dropFlags = NPC_DROP_FLAG_80, - .heartDrops = NO_DROPS, - .flowerDrops = NO_DROPS, - }, + .settings = &N(NpcSettings_Fuzzy), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_200000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_8000000 | ENEMY_FLAG_10000000 | ENEMY_FLAG_20000000, + .drops = NO_DROPS, .animations = { .idle = ANIM_Fuzzy_Walk, .walk = ANIM_Fuzzy_Walk, @@ -1960,18 +1948,14 @@ StaticNpc N(NpcData_Fuzzy_03) = { .tattle = MSG_NpcTattle_MGM_SmashAttackGuide, }; -StaticNpc N(NpcData_Fuzzy_04) = { +NpcData N(NpcData_Fuzzy_04) = { .id = NPC_Fuzzy_04, - .settings = &N(NpcSettings_Fuzzy), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_200000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_8000000 | ENEMY_FLAG_10000000 | ENEMY_FLAG_20000000, .init = &N(EVS_NpcInit_Fuzzy), - .drops = { - .dropFlags = NPC_DROP_FLAG_80, - .heartDrops = NO_DROPS, - .flowerDrops = NO_DROPS, - }, + .settings = &N(NpcSettings_Fuzzy), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_200000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_8000000 | ENEMY_FLAG_10000000 | ENEMY_FLAG_20000000, + .drops = NO_DROPS, .animations = { .idle = ANIM_Fuzzy_Walk, .walk = ANIM_Fuzzy_Walk, @@ -1993,18 +1977,14 @@ StaticNpc N(NpcData_Fuzzy_04) = { .tattle = MSG_NpcTattle_MGM_SmashAttackGuide, }; -StaticNpc N(NpcData_Fuzzy_05) = { +NpcData N(NpcData_Fuzzy_05) = { .id = NPC_Fuzzy_05, - .settings = &N(NpcSettings_Fuzzy), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_200000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_8000000 | ENEMY_FLAG_10000000 | ENEMY_FLAG_20000000, .init = &N(EVS_NpcInit_Fuzzy), - .drops = { - .dropFlags = NPC_DROP_FLAG_80, - .heartDrops = NO_DROPS, - .flowerDrops = NO_DROPS, - }, + .settings = &N(NpcSettings_Fuzzy), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_200000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_8000000 | ENEMY_FLAG_10000000 | ENEMY_FLAG_20000000, + .drops = NO_DROPS, .animations = { .idle = ANIM_Fuzzy_Walk, .walk = ANIM_Fuzzy_Walk, @@ -2026,18 +2006,14 @@ StaticNpc N(NpcData_Fuzzy_05) = { .tattle = MSG_NpcTattle_MGM_SmashAttackGuide, }; -StaticNpc N(NpcData_Bobomb_01) = { +NpcData N(NpcData_Bobomb_01) = { .id = NPC_Bobomb_01, - .settings = &N(NpcSettings_Bobomb), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_200000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_8000000 | ENEMY_FLAG_10000000 | ENEMY_FLAG_20000000, .init = &N(EVS_NpcInit_Bobomb), - .drops = { - .dropFlags = NPC_DROP_FLAG_80, - .heartDrops = NO_DROPS, - .flowerDrops = NO_DROPS, - }, + .settings = &N(NpcSettings_Bobomb), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_200000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_8000000 | ENEMY_FLAG_10000000 | ENEMY_FLAG_20000000, + .drops = NO_DROPS, .animations = { .idle = ANIM_Bobomb_Anim02, .walk = ANIM_Bobomb_Anim04, @@ -2059,18 +2035,14 @@ StaticNpc N(NpcData_Bobomb_01) = { .tattle = MSG_NpcTattle_MGM_SmashAttackGuide, }; -StaticNpc N(NpcData_Bobomb_02) = { +NpcData N(NpcData_Bobomb_02) = { .id = NPC_Bobomb_02, - .settings = &N(NpcSettings_Bobomb), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_200000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_8000000 | ENEMY_FLAG_10000000 | ENEMY_FLAG_20000000, .init = &N(EVS_NpcInit_Bobomb), - .drops = { - .dropFlags = NPC_DROP_FLAG_80, - .heartDrops = NO_DROPS, - .flowerDrops = NO_DROPS, - }, + .settings = &N(NpcSettings_Bobomb), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_200000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_8000000 | ENEMY_FLAG_10000000 | ENEMY_FLAG_20000000, + .drops = NO_DROPS, .animations = { .idle = ANIM_Bobomb_Anim02, .walk = ANIM_Bobomb_Anim04, @@ -2092,18 +2064,14 @@ StaticNpc N(NpcData_Bobomb_02) = { .tattle = MSG_NpcTattle_MGM_SmashAttackGuide, }; -StaticNpc N(NpcData_Bobomb_03) = { +NpcData N(NpcData_Bobomb_03) = { .id = NPC_Bobomb_03, - .settings = &N(NpcSettings_Bobomb), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_200000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_8000000 | ENEMY_FLAG_10000000 | ENEMY_FLAG_20000000, .init = &N(EVS_NpcInit_Bobomb), - .drops = { - .dropFlags = NPC_DROP_FLAG_80, - .heartDrops = NO_DROPS, - .flowerDrops = NO_DROPS, - }, + .settings = &N(NpcSettings_Bobomb), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_200000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_8000000 | ENEMY_FLAG_10000000 | ENEMY_FLAG_20000000, + .drops = NO_DROPS, .animations = { .idle = ANIM_Bobomb_Anim02, .walk = ANIM_Bobomb_Anim04, @@ -2125,18 +2093,14 @@ StaticNpc N(NpcData_Bobomb_03) = { .tattle = MSG_NpcTattle_MGM_SmashAttackGuide, }; -StaticNpc N(NpcData_Bobomb_04) = { +NpcData N(NpcData_Bobomb_04) = { .id = NPC_Bobomb_04, - .settings = &N(NpcSettings_Bobomb), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_200000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_8000000 | ENEMY_FLAG_10000000 | ENEMY_FLAG_20000000, .init = &N(EVS_NpcInit_Bobomb), - .drops = { - .dropFlags = NPC_DROP_FLAG_80, - .heartDrops = NO_DROPS, - .flowerDrops = NO_DROPS, - }, + .settings = &N(NpcSettings_Bobomb), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_200000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_8000000 | ENEMY_FLAG_10000000 | ENEMY_FLAG_20000000, + .drops = NO_DROPS, .animations = { .idle = ANIM_Bobomb_Anim02, .walk = ANIM_Bobomb_Anim04, @@ -2158,18 +2122,14 @@ StaticNpc N(NpcData_Bobomb_04) = { .tattle = MSG_NpcTattle_MGM_SmashAttackGuide, }; -StaticNpc N(NpcData_Bobomb_05) = { +NpcData N(NpcData_Bobomb_05) = { .id = NPC_Bobomb_05, - .settings = &N(NpcSettings_Bobomb), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_200000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_8000000 | ENEMY_FLAG_10000000 | ENEMY_FLAG_20000000, .init = &N(EVS_NpcInit_Bobomb), - .drops = { - .dropFlags = NPC_DROP_FLAG_80, - .heartDrops = NO_DROPS, - .flowerDrops = NO_DROPS, - }, + .settings = &N(NpcSettings_Bobomb), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_200000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_8000000 | ENEMY_FLAG_10000000 | ENEMY_FLAG_20000000, + .drops = NO_DROPS, .animations = { .idle = ANIM_Bobomb_Anim02, .walk = ANIM_Bobomb_Anim04, @@ -2191,19 +2151,15 @@ StaticNpc N(NpcData_Bobomb_05) = { .tattle = MSG_NpcTattle_MGM_SmashAttackGuide, }; -StaticNpc N(NpcData_Luigis)[] = { +NpcData N(NpcData_Luigis)[] = { { .id = NPC_Luigi_01, - .settings = &N(NpcSettings_Luigi), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_200000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_8000000 | ENEMY_FLAG_10000000 | ENEMY_FLAG_20000000, .init = &N(EVS_NpcInit_Luigi), - .drops = { - .dropFlags = NPC_DROP_FLAG_80, - .heartDrops = NO_DROPS, - .flowerDrops = NO_DROPS, - }, + .settings = &N(NpcSettings_Luigi), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_200000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_8000000 | ENEMY_FLAG_10000000 | ENEMY_FLAG_20000000, + .drops = NO_DROPS, .animations = { .idle = ANIM_Luigi_Still, .walk = ANIM_Luigi_Still, @@ -2226,16 +2182,12 @@ StaticNpc N(NpcData_Luigis)[] = { }, { .id = NPC_Luigi_02, - .settings = &N(NpcSettings_Luigi), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_200000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_8000000 | ENEMY_FLAG_10000000 | ENEMY_FLAG_20000000, .init = &N(EVS_NpcInit_Luigi), - .drops = { - .dropFlags = NPC_DROP_FLAG_80, - .heartDrops = NO_DROPS, - .flowerDrops = NO_DROPS, - }, + .settings = &N(NpcSettings_Luigi), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_200000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_8000000 | ENEMY_FLAG_10000000 | ENEMY_FLAG_20000000, + .drops = NO_DROPS, .animations = { .idle = ANIM_Luigi_Still, .walk = ANIM_Luigi_Still, @@ -2258,16 +2210,12 @@ StaticNpc N(NpcData_Luigis)[] = { }, { .id = NPC_Luigi_03, - .settings = &N(NpcSettings_Luigi), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_200000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_8000000 | ENEMY_FLAG_10000000 | ENEMY_FLAG_20000000, .init = &N(EVS_NpcInit_Luigi), - .drops = { - .dropFlags = NPC_DROP_FLAG_80, - .heartDrops = NO_DROPS, - .flowerDrops = NO_DROPS, - }, + .settings = &N(NpcSettings_Luigi), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_200000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_8000000 | ENEMY_FLAG_10000000 | ENEMY_FLAG_20000000, + .drops = NO_DROPS, .animations = { .idle = ANIM_Luigi_Still, .walk = ANIM_Luigi_Still, @@ -2290,16 +2238,12 @@ StaticNpc N(NpcData_Luigis)[] = { }, { .id = NPC_Luigi_04, - .settings = &N(NpcSettings_Luigi), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_200000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_8000000 | ENEMY_FLAG_10000000 | ENEMY_FLAG_20000000, .init = &N(EVS_NpcInit_Luigi), - .drops = { - .dropFlags = NPC_DROP_FLAG_80, - .heartDrops = NO_DROPS, - .flowerDrops = NO_DROPS, - }, + .settings = &N(NpcSettings_Luigi), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_200000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_8000000 | ENEMY_FLAG_10000000 | ENEMY_FLAG_20000000, + .drops = NO_DROPS, .animations = { .idle = ANIM_Luigi_Still, .walk = ANIM_Luigi_Still, @@ -2322,16 +2266,12 @@ StaticNpc N(NpcData_Luigis)[] = { }, { .id = NPC_Luigi_05, - .settings = &N(NpcSettings_Luigi), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_200000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_8000000 | ENEMY_FLAG_10000000 | ENEMY_FLAG_20000000, .init = &N(EVS_NpcInit_Luigi), - .drops = { - .dropFlags = NPC_DROP_FLAG_80, - .heartDrops = NO_DROPS, - .flowerDrops = NO_DROPS, - }, + .settings = &N(NpcSettings_Luigi), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_200000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_8000000 | ENEMY_FLAG_10000000 | ENEMY_FLAG_20000000, + .drops = NO_DROPS, .animations = { .idle = ANIM_Luigi_Still, .walk = ANIM_Luigi_Still, @@ -2354,16 +2294,12 @@ StaticNpc N(NpcData_Luigis)[] = { }, { .id = NPC_Luigi_06, - .settings = &N(NpcSettings_Luigi), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_200000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_8000000 | ENEMY_FLAG_10000000 | ENEMY_FLAG_20000000, .init = &N(EVS_NpcInit_Luigi), - .drops = { - .dropFlags = NPC_DROP_FLAG_80, - .heartDrops = NO_DROPS, - .flowerDrops = NO_DROPS, - }, + .settings = &N(NpcSettings_Luigi), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_200000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_8000000 | ENEMY_FLAG_10000000 | ENEMY_FLAG_20000000, + .drops = NO_DROPS, .animations = { .idle = ANIM_Luigi_Still, .walk = ANIM_Luigi_Still, @@ -2386,16 +2322,12 @@ StaticNpc N(NpcData_Luigis)[] = { }, { .id = NPC_Luigi_07, - .settings = &N(NpcSettings_Luigi), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_200000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_8000000 | ENEMY_FLAG_10000000 | ENEMY_FLAG_20000000, .init = &N(EVS_NpcInit_Luigi), - .drops = { - .dropFlags = NPC_DROP_FLAG_80, - .heartDrops = NO_DROPS, - .flowerDrops = NO_DROPS, - }, + .settings = &N(NpcSettings_Luigi), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_200000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_8000000 | ENEMY_FLAG_10000000 | ENEMY_FLAG_20000000, + .drops = NO_DROPS, .animations = { .idle = ANIM_Luigi_Still, .walk = ANIM_Luigi_Still, @@ -2418,16 +2350,12 @@ StaticNpc N(NpcData_Luigis)[] = { }, { .id = NPC_Luigi_08, - .settings = &N(NpcSettings_Luigi), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_200000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_8000000 | ENEMY_FLAG_10000000 | ENEMY_FLAG_20000000, .init = &N(EVS_NpcInit_Luigi), - .drops = { - .dropFlags = NPC_DROP_FLAG_80, - .heartDrops = NO_DROPS, - .flowerDrops = NO_DROPS, - }, + .settings = &N(NpcSettings_Luigi), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_200000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_8000000 | ENEMY_FLAG_10000000 | ENEMY_FLAG_20000000, + .drops = NO_DROPS, .animations = { .idle = ANIM_Luigi_Still, .walk = ANIM_Luigi_Still, @@ -2450,16 +2378,12 @@ StaticNpc N(NpcData_Luigis)[] = { }, { .id = NPC_Luigi_09, - .settings = &N(NpcSettings_Luigi), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_200000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_8000000 | ENEMY_FLAG_10000000 | ENEMY_FLAG_20000000, .init = &N(EVS_NpcInit_Luigi), - .drops = { - .dropFlags = NPC_DROP_FLAG_80, - .heartDrops = NO_DROPS, - .flowerDrops = NO_DROPS, - }, + .settings = &N(NpcSettings_Luigi), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_200000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_8000000 | ENEMY_FLAG_10000000 | ENEMY_FLAG_20000000, + .drops = NO_DROPS, .animations = { .idle = ANIM_Luigi_Still, .walk = ANIM_Luigi_Still, @@ -2482,16 +2406,12 @@ StaticNpc N(NpcData_Luigis)[] = { }, { .id = NPC_Luigi_10, - .settings = &N(NpcSettings_Luigi), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_200000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_8000000 | ENEMY_FLAG_10000000 | ENEMY_FLAG_20000000, .init = &N(EVS_NpcInit_Luigi), - .drops = { - .dropFlags = NPC_DROP_FLAG_80, - .heartDrops = NO_DROPS, - .flowerDrops = NO_DROPS, - }, + .settings = &N(NpcSettings_Luigi), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_200000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_8000000 | ENEMY_FLAG_10000000 | ENEMY_FLAG_20000000, + .drops = NO_DROPS, .animations = { .idle = ANIM_Luigi_Still, .walk = ANIM_Luigi_Still, diff --git a/src/world/area_mim/mim.h b/src/world/area_mim/mim.h index 68a612676b..bcca660fa7 100644 --- a/src/world/area_mim/mim.h +++ b/src/world/area_mim/mim.h @@ -2,29 +2,29 @@ #define _WORLD_AREA_MIM_MIM_H_ enum { - AB_MIM_0 = AreaByte(0), - AB_MIM_1 = AreaByte(1), - AB_MIM_2 = AreaByte(2), - AB_MIM_3 = AreaByte(3), - AB_MIM_4 = AreaByte(4), - AB_MIM_5 = AreaByte(5), - AB_MIM_6 = AreaByte(6), - AB_MIM_7 = AreaByte(7), - AB_MIM_8 = AreaByte(8), - AB_MIM_9 = AreaByte(9), - AB_MIM_A = AreaByte(10), - AB_MIM_B = AreaByte(11), - AB_MIM_C = AreaByte(12), - AB_MIM_D = AreaByte(13), - AB_MIM_E = AreaByte(14), - AB_MIM_F = AreaByte(15), + AB_MIM_Unused_0 = AreaByte(0), + AB_MIM_1 = AreaByte(1), + AB_MIM_2 = AreaByte(2), + AB_MIM_Unused_3 = AreaByte(3), + AB_MIM_Unused_4 = AreaByte(4), + AB_MIM_Unused_5 = AreaByte(5), + AB_MIM_Unused_6 = AreaByte(6), + AB_MIM_Unused_7 = AreaByte(7), + AB_MIM_Unused_8 = AreaByte(8), + AB_MIM_Unused_9 = AreaByte(9), + AB_MIM_Unused_A = AreaByte(10), + AB_MIM_Unused_B = AreaByte(11), + AB_MIM_Unused_C = AreaByte(12), + AB_MIM_Unused_D = AreaByte(13), + AB_MIM_Unused_E = AreaByte(14), + AB_MIM_Unused_F = AreaByte(15), }; enum { - AF_MIM_01 = AreaFlag(1), - AF_MIM03_Oaklie_DialogueToggle = AreaFlag(2), - AF_MIM04_Bubulb_DialogueToggle = AreaFlag(4), - AF_MIM12_BackgroundLitUp = AreaFlag(3), + AF_MIM_01 = AreaFlag(1), + AF_MIM03_Oaklie_DialogueToggle = AreaFlag(2), + AF_MIM04_Bubulb_DialogueToggle = AreaFlag(4), + AF_MIM12_BackgroundLitUp = AreaFlag(3), }; extern MapSettings mim_01_settings; diff --git a/src/world/area_mim/mim_01/mim_01_6_npc.c b/src/world/area_mim/mim_01/mim_01_6_npc.c index c37210d92f..9174a88103 100644 --- a/src/world/area_mim/mim_01/mim_01_6_npc.c +++ b/src/world/area_mim/mim_01/mim_01_6_npc.c @@ -1,15 +1,12 @@ #include "mim_01.h" -#include "world/common/enemy/complete/PiranhaPlant.inc.c" +#include "world/common/enemy/PiranhaPlant.inc.c" -StaticNpc N(NpcData_PiranhaPlant)[] = { +NpcData N(NpcData_PiranhaPlant)[] = { { .id = NPC_PiranhaPlant, - .settings = &N(NpcSettings_PiranhaPlant), .pos = { 135.0f, 0.0f, -300.0f }, .yaw = 0, - .flags = ENEMY_FLAG_400, - .drops = PIRANHA_PLANT_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -22,6 +19,9 @@ StaticNpc N(NpcData_PiranhaPlant)[] = { .detectSize = { 400 }, } }, + .settings = &N(NpcSettings_PiranhaPlant), + .flags = ENEMY_FLAG_400, + .drops = PIRANHA_PLANT_DROPS, .animations = PIRANHA_PLANT_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, }, diff --git a/src/world/area_mim/mim_02/mim_02_3_npc.c b/src/world/area_mim/mim_02/mim_02_3_npc.c index e6e7477f0b..bc42cb9052 100644 --- a/src/world/area_mim/mim_02/mim_02_3_npc.c +++ b/src/world/area_mim/mim_02/mim_02_3_npc.c @@ -7,7 +7,7 @@ EvtScript N(EVS_Unused_DoNothing) = { #include "world/common/npc/Oaklie.inc.c" -#include "world/common/enemy/complete/ForestFuzzy_Wander.inc.c" +#include "world/common/enemy/ForestFuzzy_Wander.inc.c" s32 N(KeyList)[] = { ITEM_FOREST_PASS, @@ -156,25 +156,22 @@ EvtScript N(EVS_NpcInit_Oaklie) = { EVT_END }; -StaticNpc N(NpcData_Oaklie) = { +NpcData N(NpcData_Oaklie) = { .id = NPC_Oaklie, - .settings = &N(NpcSettings_Oaklie), .pos = { -426.0f, 58.0f, -70.0f }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_800 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_Oaklie), - .drops = OAKLIE_DROPS, + .settings = &N(NpcSettings_Oaklie), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_800 | ENEMY_FLAG_400000, + .drops = NO_DROPS, .animations = OAKLIE_ANIMS, .tattle = MSG_NpcTattle_Oaklie, }; -StaticNpc N(NpcData_Fuzzy_01) = { +NpcData N(NpcData_Fuzzy_01) = { .id = NPC_Fuzzy_01, - .settings = &N(NpcSettings_ForestFuzzy_Wander), .pos = { 300.0f, 0.0f, 130.0f }, .yaw = 0, - .flags = 0, - .drops = FOREST_FUZZY_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -187,17 +184,17 @@ StaticNpc N(NpcData_Fuzzy_01) = { .detectSize = { 400 }, } }, + .settings = &N(NpcSettings_ForestFuzzy_Wander), + .flags = 0, + .drops = FOREST_FUZZY_DROPS, .animations = FOREST_FUZZY_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, }; -StaticNpc N(NpcData_Fuzzy_02) = { +NpcData N(NpcData_Fuzzy_02) = { .id = NPC_Fuzzy_02, - .settings = &N(NpcSettings_ForestFuzzy_Wander), .pos = { -100.0f, 0.0f, -320.0f }, .yaw = 0, - .flags = 0, - .drops = FOREST_FUZZY_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -210,6 +207,9 @@ StaticNpc N(NpcData_Fuzzy_02) = { .detectSize = { 400 }, } }, + .settings = &N(NpcSettings_ForestFuzzy_Wander), + .flags = 0, + .drops = FOREST_FUZZY_DROPS, .animations = FOREST_FUZZY_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, }; diff --git a/src/world/area_mim/mim_03/mim_03_6_npc.c b/src/world/area_mim/mim_03/mim_03_6_npc.c index 5fa15c7299..0f5c8cfe5d 100644 --- a/src/world/area_mim/mim_03/mim_03_6_npc.c +++ b/src/world/area_mim/mim_03/mim_03_6_npc.c @@ -41,14 +41,14 @@ EvtScript N(EVS_NpcInit_Oaklie) = { EVT_END }; -StaticNpc N(NpcData_Oaklie) = { +NpcData N(NpcData_Oaklie) = { .id = NPC_Oaklie, - .settings = &N(NpcSettings_Oaklie), .pos = { 0.0f, 32.0f, 0.0f }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_Oaklie), - .drops = OAKLIE_DROPS, + .settings = &N(NpcSettings_Oaklie), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_800, + .drops = NO_DROPS, .animations = OAKLIE_ANIMS, .tattle = MSG_NpcTattle_Oaklie, }; diff --git a/src/world/area_mim/mim_04/mim_04_6_npc.c b/src/world/area_mim/mim_04/mim_04_6_npc.c index edfe6d2b1c..3a26bd8611 100644 --- a/src/world/area_mim/mim_04/mim_04_6_npc.c +++ b/src/world/area_mim/mim_04/mim_04_6_npc.c @@ -1,6 +1,6 @@ #include "mim_04.h" -#include "world/common/enemy/complete/ForestFuzzy_Wander.inc.c" +#include "world/common/enemy/ForestFuzzy_Wander.inc.c" #include "world/common/npc/Bubulb.inc.c" @@ -54,13 +54,10 @@ EvtScript N(EVS_NpcInit_Bubulb) = { EVT_END }; -StaticNpc N(NpcData_Fuzzy) = { +NpcData N(NpcData_Fuzzy) = { .id = NPC_Fuzzy, - .settings = &N(NpcSettings_ForestFuzzy_Wander), .pos = { 240.0f, 0.0f, -240.0f }, .yaw = 0, - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_400000, - .drops = FOREST_FUZZY_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -73,18 +70,21 @@ StaticNpc N(NpcData_Fuzzy) = { .detectSize = { 200 }, } }, + .settings = &N(NpcSettings_ForestFuzzy_Wander), + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_400000, + .drops = FOREST_FUZZY_DROPS, .animations = FOREST_FUZZY_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, }; -StaticNpc N(NpcData_Bubulb) = { +NpcData N(NpcData_Bubulb) = { .id = NPC_Bubulb, - .settings = &N(NpcSettings_Bubulb), .pos = { 0.0f, 32.0f, 0.0f }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_Bubulb), - .drops = BUBULB_DROPS, + .settings = &N(NpcSettings_Bubulb), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_800, + .drops = NO_DROPS, .animations = BUBULB_GREEN_ANIMS, .tattle = MSG_NpcTattle_MIM_Bubulb_Revealed, }; diff --git a/src/world/area_mim/mim_05/mim_05_6_npc.c b/src/world/area_mim/mim_05/mim_05_6_npc.c index 98d27b8245..83559d557c 100644 --- a/src/world/area_mim/mim_05/mim_05_6_npc.c +++ b/src/world/area_mim/mim_05/mim_05_6_npc.c @@ -1,15 +1,12 @@ #include "mim_05.h" -#include "world/common/enemy/complete/PiranhaPlant.inc.c" +#include "world/common/enemy/PiranhaPlant.inc.c" -StaticNpc N(NpcData_PiranhaPlant_01)[] = { +NpcData N(NpcData_PiranhaPlant_01)[] = { { .id = NPC_PiranhaPlant_01, - .settings = &N(NpcSettings_PiranhaPlant), .pos = { -240.0f, 0.0f, 240.0f }, .yaw = 0, - .flags = ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, - .drops = PIRANHA_PLANT_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -22,20 +19,20 @@ StaticNpc N(NpcData_PiranhaPlant_01)[] = { .detectSize = { 400 }, } }, + .settings = &N(NpcSettings_PiranhaPlant), + .flags = ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .drops = PIRANHA_PLANT_DROPS, .animations = PIRANHA_PLANT_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, }, PIRANHA_PLANT_HITBOX(NPC_PiranhaPlant_01_Hitbox) }; -StaticNpc N(NpcData_PiranhaPlant_02)[] = { +NpcData N(NpcData_PiranhaPlant_02)[] = { { .id = NPC_PiranhaPlant_02, - .settings = &N(NpcSettings_PiranhaPlant), .pos = { 240.0f, 0.0f, -240.0f }, .yaw = 0, - .flags = ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, - .drops = PIRANHA_PLANT_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -48,6 +45,9 @@ StaticNpc N(NpcData_PiranhaPlant_02)[] = { .detectSize = { 400 }, } }, + .settings = &N(NpcSettings_PiranhaPlant), + .flags = ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .drops = PIRANHA_PLANT_DROPS, .animations = PIRANHA_PLANT_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, }, diff --git a/src/world/area_mim/mim_06/mim_06_6_npc.c b/src/world/area_mim/mim_06/mim_06_6_npc.c index 64ad92d1f2..09c77fdd51 100644 --- a/src/world/area_mim/mim_06/mim_06_6_npc.c +++ b/src/world/area_mim/mim_06/mim_06_6_npc.c @@ -1,16 +1,13 @@ #include "mim_06.h" -#include "world/common/enemy/complete/PiranhaPlant.inc.c" -#include "world/common/enemy/complete/ForestFuzzy_Wander.inc.c" +#include "world/common/enemy/PiranhaPlant.inc.c" +#include "world/common/enemy/ForestFuzzy_Wander.inc.c" -StaticNpc N(NpcData_PiranhaPlant_01)[] = { +NpcData N(NpcData_PiranhaPlant_01)[] = { { .id = NPC_PiranhaPlant_01, - .settings = &N(NpcSettings_PiranhaPlant), .pos = { -240.0f, 0.0f, -240.0f }, .yaw = 0, - .flags = 0, - .drops = PIRANHA_PLANT_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -23,20 +20,20 @@ StaticNpc N(NpcData_PiranhaPlant_01)[] = { .detectSize = { 400 }, } }, + .settings = &N(NpcSettings_PiranhaPlant), + .flags = 0, + .drops = PIRANHA_PLANT_DROPS, .animations = PIRANHA_PLANT_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, }, PIRANHA_PLANT_HITBOX(NPC_PiranhaPlant_01_Hitbox) }; -StaticNpc N(NpcData_PiranhaPlant_02)[] = { +NpcData N(NpcData_PiranhaPlant_02)[] = { { .id = NPC_PiranhaPlant_02, - .settings = &N(NpcSettings_PiranhaPlant), .pos = { 240.0f, 0.0f, -240.0f }, .yaw = 0, - .flags = 0, - .drops = PIRANHA_PLANT_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -49,19 +46,19 @@ StaticNpc N(NpcData_PiranhaPlant_02)[] = { .detectSize = { 400 }, } }, + .settings = &N(NpcSettings_PiranhaPlant), + .flags = 0, + .drops = PIRANHA_PLANT_DROPS, .animations = PIRANHA_PLANT_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, }, PIRANHA_PLANT_HITBOX(NPC_PiranhaPlant_02_Hitbox) }; -StaticNpc N(NpcData_Fuzzy) = { +NpcData N(NpcData_Fuzzy) = { .id = NPC_Fuzzy, - .settings = &N(NpcSettings_ForestFuzzy_Wander), .pos = { -140.0f, 0.0f, 300.0f }, .yaw = 0, - .flags = ENEMY_FLAG_400, - .drops = FOREST_FUZZY_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -74,6 +71,9 @@ StaticNpc N(NpcData_Fuzzy) = { .detectSize = { 400 }, } }, + .settings = &N(NpcSettings_ForestFuzzy_Wander), + .flags = ENEMY_FLAG_400, + .drops = FOREST_FUZZY_DROPS, .animations = FOREST_FUZZY_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, }; diff --git a/src/world/area_mim/mim_07/mim_07_6_npc.c b/src/world/area_mim/mim_07/mim_07_6_npc.c index a0f1a20c0f..535549b640 100644 --- a/src/world/area_mim/mim_07/mim_07_6_npc.c +++ b/src/world/area_mim/mim_07/mim_07_6_npc.c @@ -1,6 +1,6 @@ #include "mim_07.h" -#include "world/common/enemy/complete/ForestFuzzy_Wander.inc.c" +#include "world/common/enemy/ForestFuzzy_Wander.inc.c" NpcSettings N(NpcSettings_JrTroopa) = { .height = 32, @@ -182,14 +182,10 @@ EvtScript N(EVS_NpcInit_Fuzzy) = { EVT_END }; -StaticNpc N(NpcData_Fuzzy_01) = { +NpcData N(NpcData_Fuzzy_01) = { .id = NPC_Fuzzy_01, - .settings = &N(NpcSettings_ForestFuzzy_Wander), .pos = { -240.0f, 0.0f, -240.0f }, .yaw = 0, - .flags = 0, - .init = &N(EVS_NpcInit_Fuzzy), - .drops = FOREST_FUZZY_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -202,18 +198,18 @@ StaticNpc N(NpcData_Fuzzy_01) = { .detectSize = { 400 }, } }, + .init = &N(EVS_NpcInit_Fuzzy), + .settings = &N(NpcSettings_ForestFuzzy_Wander), + .flags = 0, + .drops = FOREST_FUZZY_DROPS, .animations = FOREST_FUZZY_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, }; -StaticNpc N(NpcData_Fuzzy_02) = { +NpcData N(NpcData_Fuzzy_02) = { .id = NPC_Fuzzy_02, - .settings = &N(NpcSettings_ForestFuzzy_Wander), .pos = { 270.0f, 0.0f, 200.0f }, .yaw = 0, - .flags = 0, - .init = &N(EVS_NpcInit_Fuzzy), - .drops = FOREST_FUZZY_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -226,22 +222,22 @@ StaticNpc N(NpcData_Fuzzy_02) = { .detectSize = { 400 }, } }, + .init = &N(EVS_NpcInit_Fuzzy), + .settings = &N(NpcSettings_ForestFuzzy_Wander), + .flags = 0, + .drops = FOREST_FUZZY_DROPS, .animations = FOREST_FUZZY_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, }; -StaticNpc N(NpcData_JrTroopa) = { +NpcData N(NpcData_JrTroopa) = { .id = NPC_JrTroopa, - .settings = &N(NpcSettings_JrTroopa), .pos = { -338.0f, 0.0f, 0.0f }, .yaw = 0, - .flags = ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_200000 | ENEMY_FLAG_NO_DROPS, .init = &N(EVS_NpcInit_JrTroopa), - .drops = { - .dropFlags = NPC_DROP_FLAG_80, - .heartDrops = NO_DROPS, - .flowerDrops = NO_DROPS, - }, + .settings = &N(NpcSettings_JrTroopa), + .flags = ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_200000 | ENEMY_FLAG_NO_DROPS, + .drops = NO_DROPS, .animations = { .idle = ANIM_JrTroopa_Idle, .walk = ANIM_JrTroopa_Walk, diff --git a/src/world/area_mim/mim_08/mim_08_5_npc.c b/src/world/area_mim/mim_08/mim_08_5_npc.c index e8562c0e36..00694dbeb5 100644 --- a/src/world/area_mim/mim_08/mim_08_5_npc.c +++ b/src/world/area_mim/mim_08/mim_08_5_npc.c @@ -1,8 +1,8 @@ #include "mim_08.h" -#include "world/common/enemy/complete/Bzzap.inc.c" +#include "world/common/enemy/Bzzap.inc.c" -#include "world/common/enemy/complete/PiranhaPlant.inc.c" +#include "world/common/enemy/PiranhaPlant.inc.c" EvtScript N(EVS_NpcIdle_Bzzap) = { EVT_LABEL(100) @@ -25,14 +25,10 @@ EvtScript N(EVS_NpcInit_Bzzap) = { EVT_END }; -StaticNpc N(NpcData_Bzzap) = { +NpcData N(NpcData_Bzzap) = { .id = NPC_Bzzap, - .settings = &N(NpcSettings_Bzzap), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 270, - .flags = ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_200000, - .init = &N(EVS_NpcInit_Bzzap), - .drops = BZZAP_NO_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -45,17 +41,18 @@ StaticNpc N(NpcData_Bzzap) = { .detectSize = { 200 }, } }, + .init = &N(EVS_NpcInit_Bzzap), + .settings = &N(NpcSettings_Bzzap), + .flags = ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_200000, + .drops = NO_DROPS, .animations = BZZAP_ANIMS, }; -StaticNpc N(NpcData_PiranhaPlant_01)[] = { +NpcData N(NpcData_PiranhaPlant_01)[] = { { .id = NPC_PiranhaPlant_01, - .settings = &N(NpcSettings_PiranhaPlant), .pos = { -240.0f, 0.0f, -240.0f }, .yaw = 0, - .flags = ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, - .drops = PIRANHA_PLANT_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -68,20 +65,20 @@ StaticNpc N(NpcData_PiranhaPlant_01)[] = { .detectSize = { 400 }, } }, + .settings = &N(NpcSettings_PiranhaPlant), + .flags = ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .drops = PIRANHA_PLANT_DROPS, .animations = PIRANHA_PLANT_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, }, PIRANHA_PLANT_HITBOX(NPC_PiranhaPlant_01_Hitbox) }; -StaticNpc N(NpcData_PiranhaPlant_02)[] = { +NpcData N(NpcData_PiranhaPlant_02)[] = { { .id = NPC_PiranhaPlant_02, - .settings = &N(NpcSettings_PiranhaPlant), .pos = { 240.0f, 0.0f, 240.0f }, .yaw = 0, - .flags = ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, - .drops = PIRANHA_PLANT_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -94,6 +91,9 @@ StaticNpc N(NpcData_PiranhaPlant_02)[] = { .detectSize = { 400 }, } }, + .settings = &N(NpcSettings_PiranhaPlant), + .flags = ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .drops = PIRANHA_PLANT_DROPS, .animations = PIRANHA_PLANT_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, }, diff --git a/src/world/area_mim/mim_09/mim_09_6_npc.c b/src/world/area_mim/mim_09/mim_09_6_npc.c index 37e0b1956e..6ed1341bbf 100644 --- a/src/world/area_mim/mim_09/mim_09_6_npc.c +++ b/src/world/area_mim/mim_09/mim_09_6_npc.c @@ -1,15 +1,12 @@ #include "mim_09.h" #include "world/common/npc/Oaklie.inc.c" -#include "world/common/enemy/complete/ForestFuzzy_Wander.inc.c" +#include "world/common/enemy/ForestFuzzy_Wander.inc.c" -StaticNpc N(NpcData_Fuzzy) = { +NpcData N(NpcData_Fuzzy) = { .id = NPC_Fuzzy, - .settings = &N(NpcSettings_ForestFuzzy_Wander), .pos = { 270.0f, 0.0f, 200.0f }, .yaw = 0, - .flags = ENEMY_FLAG_400, - .drops = FOREST_FUZZY_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -22,6 +19,9 @@ StaticNpc N(NpcData_Fuzzy) = { .detectSize = { 400 }, } }, + .settings = &N(NpcSettings_ForestFuzzy_Wander), + .flags = ENEMY_FLAG_400, + .drops = FOREST_FUZZY_DROPS, .animations = FOREST_FUZZY_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, }; diff --git a/src/world/area_mim/mim_10/mim_10_4_npc.c b/src/world/area_mim/mim_10/mim_10_4_npc.c index 24c2418f88..b24eb69577 100644 --- a/src/world/area_mim/mim_10/mim_10_4_npc.c +++ b/src/world/area_mim/mim_10/mim_10_4_npc.c @@ -246,18 +246,14 @@ EvtScript N(EVS_NpcInit_JrTroopa) = { EVT_END }; -StaticNpc N(NpcData_Bootler) = { +NpcData N(NpcData_Bootler) = { .id = NPC_Bootler, - .settings = &N(NpcSettings_Bootler), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_Bootler), - .drops = { - .dropFlags = NPC_DROP_FLAG_80, - .heartDrops = NO_DROPS, - .flowerDrops = NO_DROPS, - }, + .settings = &N(NpcSettings_Bootler), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_800, + .drops = NO_DROPS, .animations = { .idle = ANIM_Bootler_Idle, .walk = ANIM_Bootler_Walk, @@ -278,18 +274,14 @@ StaticNpc N(NpcData_Bootler) = { }, }; -StaticNpc N(NpcData_JrTroopa) = { +NpcData N(NpcData_JrTroopa) = { .id = NPC_JrTroopa, - .settings = &N(NpcSettings_JrTroopa), .pos = { 0.0f, 0.0f, 0.0f }, .yaw = 270, - .flags = ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_200000, .init = &N(EVS_NpcInit_JrTroopa), - .drops = { - .dropFlags = NPC_DROP_FLAG_80, - .heartDrops = NO_DROPS, - .flowerDrops = NO_DROPS, - }, + .settings = &N(NpcSettings_JrTroopa), + .flags = ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_200000, + .drops = NO_DROPS, .animations = { .idle = ANIM_JrTroopa_Idle, .walk = ANIM_JrTroopa_Walk, diff --git a/src/world/area_mim/mim_11/mim_11_2_main.c b/src/world/area_mim/mim_11/mim_11_2_main.c index 205cab5b5a..c7197a2a99 100644 --- a/src/world/area_mim/mim_11/mim_11_2_main.c +++ b/src/world/area_mim/mim_11/mim_11_2_main.c @@ -3,7 +3,6 @@ #include "world/common/entity/Pipe.inc.c" #include "world/common/atomic/TexturePan.inc.c" -#include "world/common/atomic/TexturePan.data.inc.c" API_CALLABLE(N(func_802405EC_BB765C)) { enable_world_fog(); diff --git a/src/world/area_mim/mim_11/mim_11_5_npc.c b/src/world/area_mim/mim_11/mim_11_5_npc.c index 08d26e7e4d..f450ddb7df 100644 --- a/src/world/area_mim/mim_11/mim_11_5_npc.c +++ b/src/world/area_mim/mim_11/mim_11_5_npc.c @@ -74,19 +74,15 @@ EvtScript N(EVS_NpcInit_Bootler) = { EVT_END }; -StaticNpc N(NpcData_Bootler)[] = { +NpcData N(NpcData_Bootler)[] = { { .id = NPC_Bootler, - .settings = &N(NpcSettings_Bootler), .pos = { 68.0f, 60.0f, -145.0f }, .yaw = 0, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_Bootler), - .drops = { - .dropFlags = NPC_DROP_FLAG_80, - .heartDrops = NO_DROPS, - .flowerDrops = NO_DROPS, - }, + .settings = &N(NpcSettings_Bootler), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_800, + .drops = NO_DROPS, .animations = { .idle = ANIM_Bootler_Idle, .walk = ANIM_Bootler_Walk, @@ -108,16 +104,12 @@ StaticNpc N(NpcData_Bootler)[] = { }, { .id = NPC_Skolar, - .settings = &N(NpcSettings_Skolar), .pos = { 68.0f, 60.0f, -145.0f }, .yaw = 135, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_Skolar), - .drops = { - .dropFlags = NPC_DROP_FLAG_80, - .heartDrops = NO_DROPS, - .flowerDrops = NO_DROPS, - }, + .settings = &N(NpcSettings_Skolar), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_800, + .drops = NO_DROPS, .animations = { .idle = ANIM_WorldSkolar_Idle, .walk = ANIM_WorldSkolar_Idle, diff --git a/src/world/area_mim/mim_12/mim_12_4_npc.c b/src/world/area_mim/mim_12/mim_12_4_npc.c index 0a2ca4f4f7..8f3357ccd7 100644 --- a/src/world/area_mim/mim_12/mim_12_4_npc.c +++ b/src/world/area_mim/mim_12/mim_12_4_npc.c @@ -12,33 +12,25 @@ EvtScript N(EVS_NpcInit_GateBoo_02) = { EVT_END }; -StaticNpc N(NpcData_GateBoos)[] = { +NpcData N(NpcData_GateBoos)[] = { { .id = NPC_GateBoo_01, - .settings = &N(NpcSettings_Boo), .pos = { -68.0f, 65.0f, -56.0f }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_GateBoo_01), - .drops = { - .dropFlags = NPC_DROP_FLAG_80, - .heartDrops = NO_DROPS, - .flowerDrops = NO_DROPS, - }, + .settings = &N(NpcSettings_Boo), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_800, + .drops = NO_DROPS, .animations = NORMAL_BOO_ANIMS, }, { .id = NPC_GateBoo_02, - .settings = &N(NpcSettings_Boo), .pos = { -125.0f, 65.0f, 60.0f }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_GateBoo_02), - .drops = { - .dropFlags = NPC_DROP_FLAG_80, - .heartDrops = NO_DROPS, - .flowerDrops = NO_DROPS, - }, + .settings = &N(NpcSettings_Boo), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_800, + .drops = NO_DROPS, .animations = NORMAL_BOO_ANIMS, }, }; diff --git a/src/world/area_nok/nok_01/nok_01_4_npc.c b/src/world/area_nok/nok_01/nok_01_4_npc.c index e89a946f62..4831b0be1a 100644 --- a/src/world/area_nok/nok_01/nok_01_4_npc.c +++ b/src/world/area_nok/nok_01/nok_01_4_npc.c @@ -18,7 +18,7 @@ NpcSettings N(NpcSettings_Unused3) = { }; #include "world/common/npc/Koopa.inc.c" -#include "world/common/enemy/complete/Fuzzy.inc.c" +#include "world/common/enemy/Fuzzy.inc.c" #include "world/common/npc/Toad_Stationary.inc.c" #include "world/common/npc/Bobomb.inc.c" @@ -422,15 +422,11 @@ EvtScript N(EVS_NpcInit_RelaxedKoopa) = { #include "npcs_normal.inc.c" -StaticNpc N(NpcData_Crisis)[] = { +NpcData N(NpcData_Crisis)[] = { { .id = NPC_Koover, - .settings = &N(NpcSettings_Koopa_Wander), .pos = { -233.0f, 0.0f, 256.0f }, .yaw = 0, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, - .init = &N(EVS_NpcInit_Koover_Crisis), - .drops = NPC_NO_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -443,17 +439,17 @@ StaticNpc N(NpcData_Crisis)[] = { .detectSize = { 500 }, } }, + .init = &N(EVS_NpcInit_Koover_Crisis), + .settings = &N(NpcSettings_Koopa_Wander), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, + .drops = NO_DROPS, .animations = KOOPA_ANIMS, .tattle = MSG_NpcTattle_NOK_Greeter, }, { .id = NPC_FuzzyWithShell, - .settings = &N(NpcSettings_Fuzzy), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100000 | ENEMY_FLAG_400000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_8000000 | ENEMY_FLAG_10000000, - .init = &N(EVS_NpcInit_FuzzyWithShell), - .drops = NPC_NO_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -466,26 +462,26 @@ StaticNpc N(NpcData_Crisis)[] = { .detectSize = { 0 }, } }, + .init = &N(EVS_NpcInit_FuzzyWithShell), + .settings = &N(NpcSettings_Fuzzy), + .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100000 | ENEMY_FLAG_400000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_8000000 | ENEMY_FLAG_10000000, + .drops = NO_DROPS, .animations = FUZZY_ANIMS, }, { .id = NPC_KooversShell, - .settings = &N(NpcSettings_Koopa), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_KooversShell), - .drops = NPC_NO_DROPS, + .settings = &N(NpcSettings_Koopa), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_800, + .drops = NO_DROPS, .animations = KOOPA_ANIMS, }, { .id = NPC_Koopa_02, - .settings = &N(NpcSettings_KoopaWithoutShell_Wander), .pos = { 50.0f, 0.0f, 300.0f }, .yaw = 180, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_2000, - .init = &N(EVS_NpcInit_Koopa_02_Crisis), - .drops = NPC_NO_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -498,27 +494,27 @@ StaticNpc N(NpcData_Crisis)[] = { .detectSize = { 500 }, } }, + .init = &N(EVS_NpcInit_Koopa_02_Crisis), + .settings = &N(NpcSettings_KoopaWithoutShell_Wander), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_2000, + .drops = NO_DROPS, .animations = KOOPA_WITHOUT_SHELL_ANIMS, .tattle = MSG_NpcTattle_NOK_GenericKoopaA, }, { .id = NPC_KoopaShell_02, - .settings = &N(NpcSettings_Koopa), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_800 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_KoopaShell_02), - .drops = NPC_NO_DROPS, + .settings = &N(NpcSettings_Koopa), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_800 | ENEMY_FLAG_400000, + .drops = NO_DROPS, .animations = KOOPA_ANIMS, }, { .id = NPC_Koopa_03, - .settings = &N(NpcSettings_KoopaWithoutShell_Wander), .pos = { 150.0f, 0.0f, 217.0f }, .yaw = 0, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, - .init = &N(EVS_NpcInit_Koopa_03_Crisis), - .drops = NPC_NO_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -531,76 +527,76 @@ StaticNpc N(NpcData_Crisis)[] = { .detectSize = { 500 }, } }, + .init = &N(EVS_NpcInit_Koopa_03_Crisis), + .settings = &N(NpcSettings_KoopaWithoutShell_Wander), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .drops = NO_DROPS, .animations = KOOPA_WITHOUT_SHELL_ANIMS, .tattle = MSG_NpcTattle_NOK_GenericKoopaB, }, { .id = NPC_KoopaShell_03, - .settings = &N(NpcSettings_Koopa), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_800 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_KoopaShell_03), - .drops = NPC_NO_DROPS, + .settings = &N(NpcSettings_Koopa), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_800 | ENEMY_FLAG_400000, + .drops = NO_DROPS, .animations = KOOPA_ANIMS, }, { .id = NPC_Bobomb_01, - .settings = &N(NpcSettings_Bobomb), .pos = { 260.0f, 0.0f, -110.0f }, .yaw = 82, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_Bobomb_01_Crisis), - .drops = NPC_NO_DROPS, + .settings = &N(NpcSettings_Bobomb), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .drops = NO_DROPS, .animations = BOBOMB_RED_ANIMS, .tattle = MSG_NpcTattle_NOK_BobombA, }, { .id = NPC_Bobomb_02, - .settings = &N(NpcSettings_Bobomb), .pos = { 270.0f, 0.0f, -160.0f }, .yaw = 82, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_Bobomb_02_Crisis), - .drops = NPC_NO_DROPS, + .settings = &N(NpcSettings_Bobomb), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .drops = NO_DROPS, .animations = BOBOMB_RED_ANIMS, .tattle = MSG_NpcTattle_NOK_BobombB, }, }; // just jumps around the map; can be hit for a coin -StaticNpc N(NpcData_MiscFuzzy1) = { +NpcData N(NpcData_MiscFuzzy1) = { .id = NPC_MiscFuzzy1, - .settings = &N(NpcSettings_Fuzzy), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = 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 | ENEMY_FLAG_8000000 | ENEMY_FLAG_10000000, .init = &N(EVS_NpcInit_MiscFuzzy1), - .drops = NPC_NO_DROPS, + .settings = &N(NpcSettings_Fuzzy), + .flags = 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 | ENEMY_FLAG_8000000 | ENEMY_FLAG_10000000, + .drops = NO_DROPS, .animations = FUZZY_ANIMS, }; // just jumps around the map; can be hit for a coin -StaticNpc N(NpcData_MiscFuzzy2) = { +NpcData N(NpcData_MiscFuzzy2) = { .id = NPC_MiscFuzzy2, - .settings = &N(NpcSettings_Fuzzy), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = 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 | ENEMY_FLAG_8000000 | ENEMY_FLAG_10000000, .init = &N(EVS_NpcInit_MiscFuzzy2), - .drops = NPC_NO_DROPS, + .settings = &N(NpcSettings_Fuzzy), + .flags = 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 | ENEMY_FLAG_8000000 | ENEMY_FLAG_10000000, + .drops = NO_DROPS, .animations = FUZZY_ANIMS, }; -StaticNpc N(NpcData_Normal)[] = { +NpcData N(NpcData_Normal)[] = { { .id = NPC_Koover, - .settings = &N(NpcSettings_Koopa_Wander), .pos = { -233.0f, 0.0f, 256.0f }, .yaw = 0, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, - .init = &N(EVS_NpcInit_Koover_Normal), - .drops = NPC_NO_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -613,17 +609,17 @@ StaticNpc N(NpcData_Normal)[] = { .detectSize = { 500 }, } }, + .init = &N(EVS_NpcInit_Koover_Normal), + .settings = &N(NpcSettings_Koopa_Wander), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .drops = NO_DROPS, .animations = KOOPA_ANIMS, .tattle = MSG_NpcTattle_NOK_Greeter, }, { .id = NPC_Koopa_02, - .settings = &N(NpcSettings_Koopa_Wander), .pos = { 52.0f, 0.0f, 330.0f }, .yaw = 0, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, - .init = &N(EVS_NpcInit_Koopa_02_Normal), - .drops = NPC_NO_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -636,17 +632,17 @@ StaticNpc N(NpcData_Normal)[] = { .detectSize = { 500 }, } }, + .init = &N(EVS_NpcInit_Koopa_02_Normal), + .settings = &N(NpcSettings_Koopa_Wander), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .drops = NO_DROPS, .animations = KOOPA_ANIMS, .tattle = MSG_NpcTattle_NOK_GenericKoopaA, }, { .id = NPC_Koopa_03, - .settings = &N(NpcSettings_Koopa_Wander), .pos = { 110.0f, 0.0f, 240.0f }, .yaw = 0, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, - .init = &N(EVS_NpcInit_Koopa_03_Normal), - .drops = NPC_NO_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -659,87 +655,91 @@ StaticNpc N(NpcData_Normal)[] = { .detectSize = { 500 }, } }, + .init = &N(EVS_NpcInit_Koopa_03_Normal), + .settings = &N(NpcSettings_Koopa_Wander), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .drops = NO_DROPS, .animations = KOOPA_ANIMS, .tattle = MSG_NpcTattle_NOK_GenericKoopaB, }, { .id = NPC_Bobomb_01, - .settings = &N(NpcSettings_Bobomb), .pos = { 236.0f, 0.0f, 251.0f }, .yaw = 82, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_Bobomb_01_Normal), - .drops = NPC_NO_DROPS, + .settings = &N(NpcSettings_Bobomb), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .drops = NO_DROPS, .animations = BOBOMB_RED_ANIMS, .tattle = MSG_NpcTattle_NOK_BobombA, }, { .id = NPC_Bobomb_02, - .settings = &N(NpcSettings_Bobomb), .pos = { 224.0f, 0.0f, 309.0f }, .yaw = 82, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_Bobomb_02_Normal), - .drops = NPC_NO_DROPS, + .settings = &N(NpcSettings_Bobomb), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .drops = NO_DROPS, .animations = BOBOMB_RED_ANIMS, .tattle = MSG_NpcTattle_NOK_BobombB, }, { .id = NPC_Bobomb_03, - .settings = &N(NpcSettings_Bobomb), .pos = { 280.0f, 0.0f, 274.0f }, .yaw = 262, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_Bobomb_03_Normal), - .drops = NPC_NO_DROPS, + .settings = &N(NpcSettings_Bobomb), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .drops = NO_DROPS, .animations = BOBOMB_RED_ANIMS, .tattle = MSG_NpcTattle_NOK_BobombC, }, }; -StaticNpc N(NpcData_Shared)[] = { +NpcData N(NpcData_Shared)[] = { { .id = NPC_MortT, - .settings = &N(NpcSettings_Toad_Stationary), .pos = { -268.0f, 10.0f, 68.0f }, .yaw = 0, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_MortT), - .drops = NPC_NO_DROPS, + .settings = &N(NpcSettings_Toad_Stationary), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .drops = NO_DROPS, .animations = TOAD_RED_ANIMS, .tattle = MSG_NpcTattle_NOK_ToadHouseToad, }, { .id = NPC_Koopa_ShopOwner, - .settings = &N(NpcSettings_Koopa), .pos = { -73.0f, 0.0f, -338.0f }, .yaw = 157, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_Koopa_ShopOwner), - .drops = NPC_NO_DROPS, + .settings = &N(NpcSettings_Koopa), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .drops = NO_DROPS, .animations = KOOPA_ANIMS, .tattle = MSG_NpcTattle_NOK_ShopOwner, }, { .id = NPC_RelaxedKoopa, - .settings = &N(NpcSettings_Koopa), .pos = { 337.0f, 17.0f, -162.0f }, .yaw = 262, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_RelaxedKoopa), - .drops = NPC_NO_DROPS, + .settings = &N(NpcSettings_Koopa), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, + .drops = NO_DROPS, .animations = KOOPA_ANIMS, .tattle = MSG_NpcTattle_NOK_RadioLover, }, { .id = NPC_ChuckQuizmo, - .settings = &N(NpcSettings_ChuckQuizmo), .pos = { 356.0f, 0.0f, 166.0f }, .yaw = 270, - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, .initVarCount = 1, .initVar = { .bytes = { 0, QUIZ_AREA_NOK, QUIZ_COUNT_NOK, QUIZ_MAP_NOK_01 }}, - .drops = NPC_NO_DROPS, + .settings = &N(NpcSettings_ChuckQuizmo), + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, + .drops = NO_DROPS, .animations = QUIZMO_ANIMS, .tattle = MSG_NpcTattle_ChuckQuizmo, }, diff --git a/src/world/area_nok/nok_02/nok_02_6_npc.c b/src/world/area_nok/nok_02/nok_02_6_npc.c index 25cb3faf09..ebbce6c153 100644 --- a/src/world/area_nok/nok_02/nok_02_6_npc.c +++ b/src/world/area_nok/nok_02/nok_02_6_npc.c @@ -5,7 +5,7 @@ #include "world/common/npc/Koopa.inc.c" #include "world/common/npc/Kolorado.inc.c" #include "world/common/npc/KoloradoWife.inc.c" -#include "world/common/enemy/complete/Fuzzy.inc.c" +#include "world/common/enemy/Fuzzy.inc.c" #include "world/common/npc/KoopaKoot.inc.c" #include "world/common/npc/Bobomb.inc.c" @@ -619,15 +619,11 @@ EvtScript N(EVS_NpcInit_KoloradoWife_Epilogue) = { EVT_END }; -StaticNpc N(NpcData_Crisis)[] = { +NpcData N(NpcData_Crisis)[] = { { .id = NPC_Koopa_01, - .settings = &N(NpcSettings_Koopa_Wander), .pos = { -109.0f, 0.0f, 191.0f }, .yaw = 0, - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, - .init = &N(EVS_NpcInit_Koopa_01_Crisis), - .drops = NPC_NO_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -640,37 +636,37 @@ StaticNpc N(NpcData_Crisis)[] = { .detectSize = { 500 }, } }, + .init = &N(EVS_NpcInit_Koopa_01_Crisis), + .settings = &N(NpcSettings_Koopa_Wander), + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, + .drops = NO_DROPS, .animations = KOOPA_ANIMS, .tattle = MSG_NpcTattle_NOK_GenericKoopaC, }, { .id = NPC_FuzzyThief, - .settings = &N(NpcSettings_Fuzzy), .pos = { -109.0f, 0.0f, 191.0f }, .yaw = 0, - .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_100000 | ENEMY_FLAG_400000 | ENEMY_FLAG_IGNORE_TOUCH, .init = &N(EVS_NpcInit_Fuzzy_Thief), - .drops = NPC_NO_DROPS, + .settings = &N(NpcSettings_Fuzzy), + .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_100000 | ENEMY_FLAG_400000 | ENEMY_FLAG_IGNORE_TOUCH, + .drops = NO_DROPS, .animations = FUZZY_ANIMS, }, { .id = NPC_KoopaShell_01, - .settings = &N(NpcSettings_Koopa), .pos = { -109.0f, 0.0f, 191.0f }, .yaw = 0, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_800 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_KoopaShell_01_Crisis), - .drops = NPC_NO_DROPS, + .settings = &N(NpcSettings_Koopa), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_800 | ENEMY_FLAG_400000, + .drops = NO_DROPS, .animations = KOOPA_ANIMS, }, { .id = NPC_Koopa_02, - .settings = &N(NpcSettings_KoopaWithoutShell_Patrol), .pos = { 192.0f, 0.0f, 152.0f }, .yaw = 0, - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, - .init = &N(EVS_NpcInit_Koopa_02_Crisis), - .drops = NPC_NO_DROPS, .territory = { .patrol = { .isFlying = TRUE, @@ -685,83 +681,83 @@ StaticNpc N(NpcData_Crisis)[] = { .detectSize = { 500 }, } }, + .init = &N(EVS_NpcInit_Koopa_02_Crisis), + .settings = &N(NpcSettings_KoopaWithoutShell_Patrol), + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, + .drops = NO_DROPS, .animations = KOOPA_WITHOUT_SHELL_ANIMS, .tattle = MSG_NpcTattle_NOK_GenericKoopaD, }, { .id = NPC_KoopaShell_02, - .settings = &N(NpcSettings_Koopa), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_800 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_KoopaShell_02_Crisis), - .drops = NPC_NO_DROPS, + .settings = &N(NpcSettings_Koopa), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_800 | ENEMY_FLAG_400000, + .drops = NO_DROPS, .animations = KOOPA_ANIMS, }, { .id = NPC_Kooper, - .settings = &N(NpcSettings_Koopa), .pos = { 20.0f, 0.0f, -145.0f }, .yaw = 0, - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_Kooper), - .drops = NPC_NO_DROPS, + .settings = &N(NpcSettings_Koopa), + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_400000, + .drops = NO_DROPS, .animations = KOOPER_ANIMS, .tattle = MSG_NpcTattle_NOK_Kooper, }, { .id = NPC_FuzzyBoss, - .settings = &N(NpcSettings_Fuzzy), .pos = { 12.0f, 10.0f, -351.0f }, .yaw = 90, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_FuzzyBoss), - .drops = NPC_NO_DROPS, + .settings = &N(NpcSettings_Fuzzy), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_400000, + .drops = NO_DROPS, .animations = FUZZY_ANIMS, }, { .id = NPC_KoopersShell, - .settings = &N(NpcSettings_Koopa), .pos = { 12.0f, 0.0f, -351.0f }, .yaw = 90, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_KoopersShell), - .drops = NPC_NO_DROPS, + .settings = &N(NpcSettings_Koopa), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_400000, + .drops = NO_DROPS, .animations = KOOPER_ANIMS, }, }; -StaticNpc N(NpcData_Fuzzy_01) = { +NpcData N(NpcData_Fuzzy_01) = { .id = NPC_MiscFuzzy1, - .settings = &N(NpcSettings_Fuzzy), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = 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 | ENEMY_FLAG_10000000, .init = &N(EVS_NpcInit_MiscFuzzy1), - .drops = NPC_NO_DROPS, + .settings = &N(NpcSettings_Fuzzy), + .flags = 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 | ENEMY_FLAG_10000000, + .drops = NO_DROPS, .animations = FUZZY_ANIMS, }; -StaticNpc N(NpcData_Fuzzy_02) = { +NpcData N(NpcData_Fuzzy_02) = { .id = NPC_MiscFuzzy2, - .settings = &N(NpcSettings_Fuzzy), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = 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 | ENEMY_FLAG_10000000, .init = &N(EVS_NpcInit_MiscFuzzy2), - .drops = NPC_NO_DROPS, + .settings = &N(NpcSettings_Fuzzy), + .flags = 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 | ENEMY_FLAG_10000000, + .drops = NO_DROPS, .animations = FUZZY_ANIMS, }; -StaticNpc N(NpcData_Normal)[] = { +NpcData N(NpcData_Normal)[] = { { .id = NPC_Koopa_01, - .settings = &N(NpcSettings_Koopa_Wander), .pos = { -109.0f, 0.0f, 191.0f }, .yaw = 0, - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, - .init = &N(EVS_NpcInit_Koopa_01_Normal), - .drops = NPC_NO_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -774,17 +770,17 @@ StaticNpc N(NpcData_Normal)[] = { .detectSize = { 500 }, } }, + .init = &N(EVS_NpcInit_Koopa_01_Normal), + .settings = &N(NpcSettings_Koopa_Wander), + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, + .drops = NO_DROPS, .animations = KOOPA_ANIMS, .tattle = MSG_NpcTattle_NOK_GenericKoopaC, }, { .id = NPC_Koopa_02, - .settings = &N(NpcSettings_Koopa_Wander), .pos = { 200.0f, 0.0f, 117.0f }, .yaw = 90, - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, - .init = &N(EVS_NpcInit_Koopa_02_Normal), - .drops = NPC_NO_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -797,108 +793,108 @@ StaticNpc N(NpcData_Normal)[] = { .detectSize = { 500 }, } }, + .init = &N(EVS_NpcInit_Koopa_02_Normal), + .settings = &N(NpcSettings_Koopa_Wander), + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, + .drops = NO_DROPS, .animations = KOOPA_ANIMS, .tattle = MSG_NpcTattle_NOK_GenericKoopaD, }, { .id = NPC_Bobomb_01, - .settings = &N(NpcSettings_Bobomb), .pos = { 0.0f, 0.0f, -333.0f }, .yaw = 180, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_Bobomb_01), - .drops = NPC_NO_DROPS, + .settings = &N(NpcSettings_Bobomb), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, + .drops = NO_DROPS, .animations = BOBOMB_BLUE_ANIMS, .tattle = MSG_NpcTattle_NOK_BobombD, }, { .id = NPC_Bobomb_02, - .settings = &N(NpcSettings_Bobomb), .pos = { -7.0f, 0.0f, -285.0f }, .yaw = 0, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_Bobomb_02), - .drops = NPC_NO_DROPS, + .settings = &N(NpcSettings_Bobomb), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, + .drops = NO_DROPS, .animations = BOBOMB_GREEN_ANIMS, .tattle = MSG_NpcTattle_NOK_BobombE, }, { .id = NPC_Bobomb_03, - .settings = &N(NpcSettings_Bobomb), .pos = { 47.0f, 0.0f, -140.0f }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_Bobomb_03), - .drops = NPC_NO_DROPS, + .settings = &N(NpcSettings_Bobomb), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .drops = NO_DROPS, .animations = BOBOMB_GREEN_ANIMS, .tattle = MSG_NpcTattle_NOK_BobombF, }, { .id = NPC_Kolorado, - .settings = &N(NpcSettings_Kolorado), .pos = { -240.0f, 0.0f, -70.0f }, .yaw = 0, - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_Kolorado), - .drops = NPC_NO_DROPS, + .settings = &N(NpcSettings_Kolorado), + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, + .drops = NO_DROPS, .animations = KOLORADO_ANIMS, .tattle = MSG_NpcTattle_Kolorado, }, }; -StaticNpc N(NpcData_Fuzzy_Later) = { +NpcData N(NpcData_Fuzzy_Later) = { .id = NPC_Fuzzy_Later, - .settings = &N(NpcSettings_Fuzzy), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = 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 | ENEMY_FLAG_10000000, .init = &N(EVS_NpcInit_Fuzzy_Later), - .drops = NPC_NO_DROPS, + .settings = &N(NpcSettings_Fuzzy), + .flags = 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 | ENEMY_FLAG_10000000, + .drops = NO_DROPS, .animations = FUZZY_ANIMS, }; -StaticNpc N(NpcData_Shared)[] = { +NpcData N(NpcData_Shared)[] = { { .id = NPC_KoopaKoot, - .settings = &N(NpcSettings_KoopaKoot), .pos = { 330.0f, 0.0f, -100.0f }, .yaw = 270, - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_KoopaKoot), - .drops = NPC_NO_DROPS, + .settings = &N(NpcSettings_KoopaKoot), + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, + .drops = NO_DROPS, .animations = KOOPA_KOOT_ANIMS, .tattle = MSG_NpcTattle_KoopaKoot, }, { .id = NPC_KoloradoWife, - .settings = &N(NpcSettings_KoloradoWife), .pos = { -328.0f, 0.0f, -180.0f }, .yaw = 0, - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_KoloradoWife), - .drops = NPC_NO_DROPS, + .settings = &N(NpcSettings_KoloradoWife), + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, + .drops = NO_DROPS, .animations = KOLORADO_WIFE_ANIMS, .tattle = MSG_NpcTattle_KoloradoWife, }, { .id = NPC_Koopa_03, - .settings = &N(NpcSettings_Koopa), .pos = { -307.0f, 0.0f, 97.0f }, .yaw = 90, - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_Koopa_03), - .drops = NPC_NO_DROPS, + .settings = &N(NpcSettings_Koopa), + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, + .drops = NO_DROPS, .animations = KOOPA_ANIMS, .tattle = MSG_NpcTattle_NOK_SenseOfJustice, }, { .id = NPC_Koopa_04, - .settings = &N(NpcSettings_KoopaWithoutShell_Patrol), .pos = { 285.0f, 0.0f, 223.0f }, .yaw = 270, - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, - .init = &N(EVS_NpcInit_Koopa_04), - .drops = NPC_NO_DROPS, .territory = { .patrol = { .isFlying = TRUE, @@ -913,20 +909,24 @@ StaticNpc N(NpcData_Shared)[] = { .detectSize = { 0 }, } }, + .init = &N(EVS_NpcInit_Koopa_04), + .settings = &N(NpcSettings_KoopaWithoutShell_Patrol), + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, + .drops = NO_DROPS, .animations = KOOPA_ANIMS, .tattle = MSG_NpcTattle_NOK_PrettyMellow, }, }; -StaticNpc N(NpcData_Epilogue)[] = { +NpcData N(NpcData_Epilogue)[] = { { .id = NPC_Parakarry, - .settings = &N(NpcSettings_Koopa), .pos = { 0.0f, 0.0f, 0.0f }, .yaw = 0, - .flags = COMMON_PASSIVE_FLAGS, .init = &N(EVS_NpcInit_Koopa_Epilogue), - .drops = NPC_NO_DROPS, + .settings = &N(NpcSettings_Koopa), + .flags = COMMON_PASSIVE_FLAGS, + .drops = NO_DROPS, .animations = { .idle = ANIM_WorldParakarry_Idle, .walk = ANIM_WorldParakarry_Walk, @@ -948,12 +948,12 @@ StaticNpc N(NpcData_Epilogue)[] = { }, { .id = NPC_Bombette, - .settings = &N(NpcSettings_Koopa), .pos = { 0.0f, 0.0f, 0.0f }, .yaw = 0, - .flags = COMMON_PASSIVE_FLAGS, .init = &N(EVS_NpcInit_Bombette_Epilogue), - .drops = NPC_NO_DROPS, + .settings = &N(NpcSettings_Koopa), + .flags = COMMON_PASSIVE_FLAGS, + .drops = NO_DROPS, .animations = { .idle = ANIM_WorldBombette_Idle, .walk = ANIM_WorldBombette_Walk, @@ -975,26 +975,26 @@ StaticNpc N(NpcData_Epilogue)[] = { }, { .id = NPC_KoloradoWife_Epilogue, - .settings = &N(NpcSettings_Koopa), .pos = { -328.0f, 0.0f, -180.0f }, .yaw = 0, - .flags = COMMON_PASSIVE_FLAGS, .init = &N(EVS_NpcInit_KoloradoWife_Epilogue), - .drops = NPC_NO_DROPS, + .settings = &N(NpcSettings_Koopa), + .flags = COMMON_PASSIVE_FLAGS, + .drops = NO_DROPS, .animations = KOLORADO_WIFE_ANIMS, .tattle = MSG_NpcTattle_KoloradoWife, }, }; -StaticNpc N(NpcData_ChuckQuizmo) = { +NpcData N(NpcData_ChuckQuizmo) = { .id = NPC_ChuckQuizmo, - .settings = &N(NpcSettings_ChuckQuizmo), .pos = { 300.0f, 0.0f, 330.0f }, .yaw = 270, - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, .initVarCount = 1, .initVar = { .bytes = { 0, QUIZ_AREA_NOK, QUIZ_COUNT_NOK, QUIZ_MAP_NOK_02 }}, - .drops = NPC_NO_DROPS, + .settings = &N(NpcSettings_ChuckQuizmo), + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, + .drops = NO_DROPS, .animations = QUIZMO_ANIMS, .tattle = MSG_NpcTattle_ChuckQuizmo, }; diff --git a/src/world/area_nok/nok_02/nok_02_7_demo.c b/src/world/area_nok/nok_02/nok_02_7_demo.c index e9517a3024..c6f55c5e55 100644 --- a/src/world/area_nok/nok_02/nok_02_7_demo.c +++ b/src/world/area_nok/nok_02/nok_02_7_demo.c @@ -134,7 +134,7 @@ EvtScript N(EVS_MonitorDemoState) = { EVT_WAIT(10) EVT_LOOP(0) EVT_CALL(GetDemoState, LVar0) - EVT_IF_EQ(LVar0, 2) + EVT_IF_EQ(LVar0, DEMO_STATE_CHANGE_MAP) EVT_BREAK_LOOP EVT_END_IF EVT_WAIT(1) diff --git a/src/world/area_nok/nok_03/nok_03.h b/src/world/area_nok/nok_03/nok_03.h index 8c8729ce0e..1f1760df07 100644 --- a/src/world/area_nok/nok_03/nok_03.h +++ b/src/world/area_nok/nok_03/nok_03.h @@ -12,10 +12,10 @@ #include "sprite/npc/WorldKooper.h" enum { - NPC_Fuzzy_01 = 0, - NPC_Fuzzy_02 = 1, - NPC_Fuzzy_03 = 4, - NPC_KoopersShell = 5, + NPC_Fuzzy_01 = 0, + NPC_Fuzzy_02 = 1, + NPC_Fuzzy_03 = 4, + NPC_KoopersShell = 5, }; #define NAMESPACE nok_03 diff --git a/src/world/area_nok/nok_03/nok_03_4_npc.c b/src/world/area_nok/nok_03/nok_03_4_npc.c index 9367cf8c5b..041877eb38 100644 --- a/src/world/area_nok/nok_03/nok_03_4_npc.c +++ b/src/world/area_nok/nok_03/nok_03_4_npc.c @@ -1,7 +1,7 @@ #include "nok_03.h" -#include "world/common/enemy/complete/Fuzzy_Wander.inc.c" -#include "world/common/enemy/complete/Fuzzy.inc.c" +#include "world/common/enemy/Fuzzy_Wander.inc.c" +#include "world/common/enemy/Fuzzy.inc.c" #include "world/common/npc/Koopa.inc.c" EvtScript N(EVS_NpcIdle_FuzzyBoss) = { @@ -125,14 +125,10 @@ EvtScript N(EVS_NpcInit_KoopersShell) = { EVT_END }; -StaticNpc N(NpcData_Fuzzy_01) = { +NpcData N(NpcData_Fuzzy_01) = { .id = NPC_Fuzzy_01, - .settings = &N(NpcSettings_Fuzzy_Wander), .pos = { -388.0f, 100.0f, -107.0f }, .yaw = 0, - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_400000, - .init = &N(EVS_NpcInit_Fuzzy_01), - .drops = FUZZY_DROPS, .territory = { .wander = { .isFlying = FALSE, @@ -145,18 +141,18 @@ StaticNpc N(NpcData_Fuzzy_01) = { .detectSize = { 300 }, } }, + .init = &N(EVS_NpcInit_Fuzzy_01), + .settings = &N(NpcSettings_Fuzzy_Wander), + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_400000, + .drops = FUZZY_DROPS, .animations = FUZZY_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, }; -StaticNpc N(NpcData_Fuzzy_02) = { +NpcData N(NpcData_Fuzzy_02) = { .id = NPC_Fuzzy_02, - .settings = &N(NpcSettings_Fuzzy_Wander), .pos = { -76.0f, 118.0f, -43.0f }, .yaw = 0, - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_400000, - .init = &N(EVS_NpcInit_Fuzzy_02), - .drops = FUZZY_DROPS, .territory = { .wander = { .isFlying = FALSE, @@ -169,19 +165,19 @@ StaticNpc N(NpcData_Fuzzy_02) = { .detectSize = { 300 }, } }, + .init = &N(EVS_NpcInit_Fuzzy_02), + .settings = &N(NpcSettings_Fuzzy_Wander), + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_400000, + .drops = FUZZY_DROPS, .animations = FUZZY_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, }; -StaticNpc N(NpcData_FuzzyBoss)[] = { +NpcData N(NpcData_FuzzyBoss)[] = { { .id = NPC_Fuzzy_03, - .settings = &N(NpcSettings_Fuzzy), .pos = { -540.0f, 0.0f, 0.0f }, .yaw = 0, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_800 | ENEMY_FLAG_400000, - .init = &N(EVS_NpcInit_FuzzyBoss), - .drops = FUZZY_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -194,15 +190,19 @@ StaticNpc N(NpcData_FuzzyBoss)[] = { .detectSize = { 0 }, } }, + .init = &N(EVS_NpcInit_FuzzyBoss), + .settings = &N(NpcSettings_Fuzzy), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_800 | ENEMY_FLAG_400000, + .drops = FUZZY_DROPS, .animations = FUZZY_ANIMS, }, { .id = NPC_KoopersShell, - .settings = &N(NpcSettings_Koopa), .pos = { 0.0f, 0.0f, 0.0f }, .yaw = 0, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_800 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_KoopersShell), + .settings = &N(NpcSettings_Koopa), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_800 | ENEMY_FLAG_400000, .drops = FUZZY_DROPS, .animations = KOOPER_ANIMS, }, diff --git a/src/world/area_nok/nok_04/nok_04_4_npc.c b/src/world/area_nok/nok_04/nok_04_4_npc.c index 2547c4facf..378bea9581 100644 --- a/src/world/area_nok/nok_04/nok_04_4_npc.c +++ b/src/world/area_nok/nok_04/nok_04_4_npc.c @@ -23,7 +23,7 @@ typedef struct FuzzyThread { #include "world/common/util/ChangeNpcToPartner.inc.c" -#include "world/common/enemy/complete/Fuzzy.inc.c" +#include "world/common/enemy/Fuzzy.inc.c" #include "world/common/npc/Koopa.inc.c" #include "../common/GetIntoShell.inc.c" @@ -1492,25 +1492,21 @@ EvtScript N(EVS_NpcInit_Kooper) = { EVT_END }; -StaticNpc N(NpcData_Minigame)[] = { +NpcData N(NpcData_Minigame)[] = { { .id = NPC_KoopersShell, - .settings = &N(NpcSettings_Koopa), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS, .init = &N(EVS_NpcInit_KoopersShell), - .drops = NPC_NO_DROPS, + .settings = &N(NpcSettings_Koopa), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS, + .drops = NO_DROPS, .animations = KOOPER_ANIMS, }, { .id = NPC_AmbushFuzzy, - .settings = &N(NpcSettings_Fuzzy), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS, - .init = &N(EVS_NpcInit_WrongFuzzy), - .drops = NPC_NO_DROPS, .territory = { .wander = { .isFlying = FALSE, @@ -1523,16 +1519,16 @@ StaticNpc N(NpcData_Minigame)[] = { .detectSize = { 0 }, } }, + .init = &N(EVS_NpcInit_WrongFuzzy), + .settings = &N(NpcSettings_Fuzzy), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS, + .drops = NO_DROPS, .animations = FUZZY_ANIMS, }, { .id = NPC_Fuzzy_01, - .settings = &N(NpcSettings_Fuzzy), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS, - .init = &N(EVS_NpcInit_Fuzzy_Aux), - .drops = NPC_NO_DROPS, .territory = { .wander = { .isFlying = FALSE, @@ -1545,16 +1541,16 @@ StaticNpc N(NpcData_Minigame)[] = { .detectSize = { 0 }, } }, + .init = &N(EVS_NpcInit_Fuzzy_Aux), + .settings = &N(NpcSettings_Fuzzy), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS, + .drops = NO_DROPS, .animations = FUZZY_ANIMS, }, { .id = NPC_Fuzzy_02, - .settings = &N(NpcSettings_Fuzzy), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS, - .init = &N(EVS_NpcInit_Fuzzy_Aux), - .drops = NPC_NO_DROPS, .territory = { .wander = { .isFlying = FALSE, @@ -1567,16 +1563,16 @@ StaticNpc N(NpcData_Minigame)[] = { .detectSize = { 0 }, } }, + .init = &N(EVS_NpcInit_Fuzzy_Aux), + .settings = &N(NpcSettings_Fuzzy), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS, + .drops = NO_DROPS, .animations = FUZZY_ANIMS, }, { .id = NPC_Fuzzy_03, - .settings = &N(NpcSettings_Fuzzy), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS, - .init = &N(EVS_NpcInit_Fuzzy_Aux), - .drops = NPC_NO_DROPS, .territory = { .wander = { .isFlying = FALSE, @@ -1589,28 +1585,28 @@ StaticNpc N(NpcData_Minigame)[] = { .detectSize = { 0 }, } }, + .init = &N(EVS_NpcInit_Fuzzy_Aux), + .settings = &N(NpcSettings_Fuzzy), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS, + .drops = NO_DROPS, .animations = FUZZY_ANIMS, }, { .id = NPC_Kooper, - .settings = &N(NpcSettings_Koopa), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS, .init = &N(EVS_NpcInit_Kooper), - .drops = NPC_NO_DROPS, + .settings = &N(NpcSettings_Koopa), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS, + .drops = NO_DROPS, .animations = KOOPER_ANIMS, }, }; -StaticNpc N(NpcData_Miniboss) = { +NpcData N(NpcData_Miniboss) = { .id = NPC_BossFuzzy, - .settings = &N(NpcSettings_Fuzzy), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_800 | ENEMY_FLAG_400000, - .init = &N(EVS_SetupMinigame), - .drops = NPC_NO_DROPS, .territory = { .wander = { .isFlying = FALSE, @@ -1623,6 +1619,10 @@ StaticNpc N(NpcData_Miniboss) = { .detectSize = { 0 }, } }, + .init = &N(EVS_SetupMinigame), + .settings = &N(NpcSettings_Fuzzy), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_800 | ENEMY_FLAG_400000, + .drops = NO_DROPS, .animations = FUZZY_ANIMS, }; diff --git a/src/world/area_nok/nok_11/nok_11_4_npc.c b/src/world/area_nok/nok_11/nok_11_4_npc.c index 9467531e7a..40905d8f6f 100644 --- a/src/world/area_nok/nok_11/nok_11_4_npc.c +++ b/src/world/area_nok/nok_11/nok_11_4_npc.c @@ -1,11 +1,11 @@ #include "nok_11.h" -#include "world/common/enemy/complete/Goomba_Wander.inc.c" -#include "world/common/enemy/complete/KoopaTroopa_Wander.inc.c" -#include "world/common/enemy/complete/Paragoomba_Wander.inc.c" -#include "world/common/enemy/complete/SpikedGoomba_Wander.inc.c" +#include "world/common/enemy/Goomba_Wander.inc.c" +#include "world/common/enemy/KoopaTroopa_Wander.inc.c" +#include "world/common/enemy/Paragoomba_Wander.inc.c" +#include "world/common/enemy/SpikedGoomba_Wander.inc.c" #include "world/common/npc/JrTroopa.inc.c" -#include "world/common/enemy/complete/KentCKoopa.inc.c" +#include "world/common/enemy/KentCKoopa.inc.c" #include "common/foliage.inc.c" @@ -449,13 +449,10 @@ EvtScript N(EVS_NpcDefeat_KentCKoopa_02) = { EVT_END }; -StaticNpc N(NpcData_KoopaTroopa) = { +NpcData N(NpcData_KoopaTroopa) = { .id = NPC_KoopaTroopa, - .settings = &N(NpcSettings_KoopaTroopa_Wander), .pos = { -350.0f, 0.0f, -30.0f }, .yaw = 90, - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, - .drops = KOOPA_TROOPA_NOK_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -468,16 +465,16 @@ StaticNpc N(NpcData_KoopaTroopa) = { .detectSize = { 250 }, } }, + .settings = &N(NpcSettings_KoopaTroopa_Wander), + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .drops = KOOPA_TROOPA_NOK_DROPS, .animations = KOOPA_TROOPA_ANIMS, }; -StaticNpc N(NpcData_Paragoomba) = { +NpcData N(NpcData_Paragoomba) = { .id = NPC_Paragoomba, - .settings = &N(NpcSettings_Paragoomba_Wander), .pos = { 0.0f, 60.0f, -30.0f }, .yaw = 0, - .flags = ENEMY_FLAG_100 | ENEMY_FLAG_400, - .drops = PARAGOOMBA_DROPS, .territory = { .wander = { .isFlying = FALSE, @@ -490,16 +487,16 @@ StaticNpc N(NpcData_Paragoomba) = { .detectSize = { 250 }, } }, + .settings = &N(NpcSettings_Paragoomba_Wander), + .flags = ENEMY_FLAG_100 | ENEMY_FLAG_400, + .drops = PARAGOOMBA_DROPS, .animations = PARAGOOMBA_ANIMS, }; -StaticNpc N(NpcData_SpikedGoomba) = { +NpcData N(NpcData_SpikedGoomba) = { .id = NPC_SpikedGoomba, - .settings = &N(NpcSettings_SpikedGoomba_Wander), .pos = { 430.0f, 0.0f, -27.0f }, .yaw = 270, - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, - .drops = SPIKED_GOOMBA_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -512,6 +509,9 @@ StaticNpc N(NpcData_SpikedGoomba) = { .detectSize = { 250 }, } }, + .settings = &N(NpcSettings_SpikedGoomba_Wander), + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .drops = SPIKED_GOOMBA_DROPS, .animations = SPIKED_GOOMBA_ANIMS, }; @@ -532,26 +532,26 @@ EvtScript N(EVS_NpcInit_JrTroopa_02) = { EVT_END }; -StaticNpc N(NpcData_JrTroopa)[] = { +NpcData N(NpcData_JrTroopa)[] = { { .id = NPC_JrTroopa_01, - .settings = &N(NpcSettings_JrTroopa), .pos = { -170.0f, 0.0f, -155.0f }, .yaw = 90, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_JrTroopa_01), - .drops = JR_TROOPA_DROPS, + .settings = &N(NpcSettings_JrTroopa), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000, + .drops = NO_DROPS, .animations = JR_TROOPA_ANIMS, .tattle = MSG_NpcTattle_JrTroopa, }, { .id = NPC_JrTroopa_02, - .settings = &N(NpcSettings_JrTroopa), .pos = { -170.0f, 0.0f, -155.0f }, .yaw = 90, - .flags = ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_20000000, .init = &N(EVS_NpcInit_JrTroopa_02), - .drops = JR_TROOPA_DROPS, + .settings = &N(NpcSettings_JrTroopa), + .flags = ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_20000000, + .drops = NO_DROPS, .animations = JR_TROOPA_ANIMS, .tattle = MSG_NpcTattle_JrTroopa, }, @@ -580,25 +580,25 @@ EvtScript N(EVS_NpcInit_KentCKoopa_02) = { EVT_END }; -StaticNpc N(NpcData_KentCKoopa)[] = { +NpcData N(NpcData_KentCKoopa)[] = { { .id = NPC_KentCKoopa_01, - .settings = &N(NpcSettings_KentCKoopa), .pos = { -164.0f, 0.0f, -37.0f }, .yaw = 270, - .flags = ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_4000 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_NO_DROPS, .init = &N(EVS_NpcInit_KentCKoopa_01), - .drops = KENT_C_KOOPA_DROPS, + .settings = &N(NpcSettings_KentCKoopa), + .flags = ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_4000 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_NO_DROPS, + .drops = NO_DROPS, .animations = KENT_C_KOOPA_ANIMS, }, { .id = NPC_KentCKoopa_02, - .settings = &N(NpcSettings_KentCKoopa), .pos = { -164.0f, 0.0f, -37.0f }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS, .init = &N(EVS_NpcInit_KentCKoopa_02), - .drops = KENT_C_KOOPA_DROPS, + .settings = &N(NpcSettings_KentCKoopa), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS, + .drops = NO_DROPS, .animations = KENT_C_KOOPA_ANIMS, .tattle = MSG_NpcTattle_KentCKoopa, }, diff --git a/src/world/area_nok/nok_12/nok_12_6_npc.c b/src/world/area_nok/nok_12/nok_12_6_npc.c index 7da045ca35..85ddd359cf 100644 --- a/src/world/area_nok/nok_12/nok_12_6_npc.c +++ b/src/world/area_nok/nok_12/nok_12_6_npc.c @@ -1,10 +1,10 @@ #include "nok_12.h" -#include "world/common/enemy/complete/KoopaTroopa_Wander.inc.c" -#include "world/common/enemy/complete/KoopaTroopa_Patrol.inc.c" -#include "world/common/enemy/complete/Goomba_Wander.inc.c" -#include "world/common/enemy/complete/SpikedGoomba_Wander.inc.c" -#include "world/common/enemy/complete/SpikedGoomba_Patrol.inc.c" +#include "world/common/enemy/KoopaTroopa_Wander.inc.c" +#include "world/common/enemy/KoopaTroopa_Patrol.inc.c" +#include "world/common/enemy/Goomba_Wander.inc.c" +#include "world/common/enemy/SpikedGoomba_Wander.inc.c" +#include "world/common/enemy/SpikedGoomba_Patrol.inc.c" // 'sleep' on top of brick block until it's broken EvtScript N(EVS_NpcIdle_SpikedGoomba) = { @@ -95,13 +95,10 @@ EvtScript N(EVS_NpcInit_KoopaTroopa_02_Demo) = { EVT_END }; -StaticNpc N(NpcData_KoopaTroopa_01) = { +NpcData N(NpcData_KoopaTroopa_01) = { .id = NPC_KoopaTroopa_01, - .settings = &N(NpcSettings_KoopaTroopa_Patrol), .pos = { -370.0f, 0.0f, -25.0f }, .yaw = 270, - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, - .drops = KOOPA_TROOPA_NOK_DROPS, .territory = { .patrol = { .isFlying = TRUE, @@ -116,18 +113,17 @@ StaticNpc N(NpcData_KoopaTroopa_01) = { .detectSize = { 200 }, } }, + .settings = &N(NpcSettings_KoopaTroopa_Patrol), + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = KOOPA_TROOPA_NOK_DROPS, .animations = KOOPA_TROOPA_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, }; -StaticNpc N(NpcData_KoopaTroopa_02) = { +NpcData N(NpcData_KoopaTroopa_02) = { .id = NPC_KoopaTroopa_02, - .settings = &N(NpcSettings_KoopaTroopa_Wander), .pos = { 563.0f, 50.0f, -43.0f }, .yaw = 270, - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, - .init = &N(EVS_NpcInit_KoopaTroopa_02), - .drops = KOOPA_TROOPA_NOK_DROPS, .territory = { .wander = { .isFlying = FALSE, @@ -140,18 +136,18 @@ StaticNpc N(NpcData_KoopaTroopa_02) = { .detectSize = { 500 }, } }, + .init = &N(EVS_NpcInit_KoopaTroopa_02), + .settings = &N(NpcSettings_KoopaTroopa_Wander), + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = KOOPA_TROOPA_NOK_DROPS, .animations = KOOPA_TROOPA_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, }; -StaticNpc N(NpcData_KoopaTroopa_02_Demo) = { +NpcData N(NpcData_KoopaTroopa_02_Demo) = { .id = NPC_KoopaTroopa_02, - .settings = &N(NpcSettings_KoopaTroopa_Wander), .pos = { 600.0f, 50.0f, -75.0f }, .yaw = 270, - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, - .init = &N(EVS_NpcInit_KoopaTroopa_02_Demo), - .drops = KOOPA_TROOPA_NOK_DROPS, .territory = { .wander = { .isFlying = FALSE, @@ -164,17 +160,18 @@ StaticNpc N(NpcData_KoopaTroopa_02_Demo) = { .detectSize = { 500 }, } }, + .init = &N(EVS_NpcInit_KoopaTroopa_02_Demo), + .settings = &N(NpcSettings_KoopaTroopa_Wander), + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = KOOPA_TROOPA_NOK_DROPS, .animations = KOOPA_TROOPA_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, }; -StaticNpc N(NpcData_Goomba) = { +NpcData N(NpcData_Goomba) = { .id = NPC_Goomba, - .settings = &N(NpcSettings_Goomba_Wander), .pos = { 50.0f, 0.0f, -72.0f }, .yaw = 270, - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, - .drops = GOOMBA_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -187,18 +184,17 @@ StaticNpc N(NpcData_Goomba) = { .detectSize = { 150, 80 }, } }, + .settings = &N(NpcSettings_Goomba_Wander), + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = GOOMBA_DROPS, .animations = GOOMBA_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, }; -StaticNpc N(NpcData_SpikedGoomba) = { +NpcData N(NpcData_SpikedGoomba) = { .id = NPC_SpikedGoomba, - .settings = &N(NpcSettings_SpikedGoomba_Wander), .pos = { -160.0f, 0.0f, -120.0f }, .yaw = 270, - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, - .init = &N(EVS_NpcInit_SpikedGoomba), - .drops = SPIKED_GOOMBA_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -211,6 +207,10 @@ StaticNpc N(NpcData_SpikedGoomba) = { .detectSize = { 150, 80 }, } }, + .init = &N(EVS_NpcInit_SpikedGoomba), + .settings = &N(NpcSettings_SpikedGoomba_Wander), + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = SPIKED_GOOMBA_DROPS, .animations = SPIKED_GOOMBA_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, }; diff --git a/src/world/area_nok/nok_13/nok_13_4_npc.c b/src/world/area_nok/nok_13/nok_13_4_npc.c index f4b3dbf9cd..5ae3832094 100644 --- a/src/world/area_nok/nok_13/nok_13_4_npc.c +++ b/src/world/area_nok/nok_13/nok_13_4_npc.c @@ -1,13 +1,11 @@ #include "nok_13.h" -#include "world/common/enemy/complete/Fuzzy_Wander.inc.c" +#include "world/common/enemy/Fuzzy_Wander.inc.c" -StaticNpc N(NpcData_Fuzzy) = { +NpcData N(NpcData_Fuzzy) = { .id = NPC_UnusedFuzzy, - .settings = &N(NpcSettings_Fuzzy_Wander), .pos = { 175.0f, 0.0f, -270.0f }, .yaw = 180, - .drops = FUZZY_DROPS, .territory = { .wander = { .isFlying = FALSE, @@ -20,6 +18,8 @@ StaticNpc N(NpcData_Fuzzy) = { .detectSize = { 200 }, } }, + .settings = &N(NpcSettings_Fuzzy_Wander), + .drops = FUZZY_DROPS, .animations = FUZZY_ANIMS, }; diff --git a/src/world/area_nok/nok_14/nok_14_5_npc.c b/src/world/area_nok/nok_14/nok_14_5_npc.c index ac8a64e7de..09a592d116 100644 --- a/src/world/area_nok/nok_14/nok_14_5_npc.c +++ b/src/world/area_nok/nok_14/nok_14_5_npc.c @@ -1,9 +1,9 @@ #include "nok_14.h" -#include "world/common/enemy/complete/KoopaTroopa_Wander.inc.c" -#include "world/common/enemy/complete/SpikedGoomba_Wander.inc.c" -#include "world/common/enemy/complete/Paratroopa.inc.c" -#include "world/common/enemy/complete/KoopaTroopa_Stationary.inc.c" +#include "world/common/enemy/KoopaTroopa_Wander.inc.c" +#include "world/common/enemy/SpikedGoomba_Wander.inc.c" +#include "world/common/enemy/Paratroopa.inc.c" +#include "world/common/enemy/KoopaTroopa_Stationary.inc.c" EvtScript N(EVS_NpcIdle_KoopaTroopa_01) = { EVT_CALL(GetNpcPos, NPC_SELF, LVar0, LVar1, LVar2) @@ -52,14 +52,10 @@ EvtScript N(EVS_NpcInit_KoopaTroopa_02) = { EVT_END }; -StaticNpc N(NpcData_KoopaTroopa_01) = { +NpcData N(NpcData_KoopaTroopa_01) = { .id = NPC_KoopaTroopa_01, - .settings = &N(NpcSettings_KoopaTroopa_Wander), .pos = { -667.0f, 75.0f, -50.0f }, .yaw = 270, - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_2000, - .init = &N(EVS_NpcInit_KoopaTroopa_01), - .drops = KOOPA_TROOPA_NOK_DROPS, .territory = { .wander = { .isFlying = FALSE, @@ -72,16 +68,17 @@ StaticNpc N(NpcData_KoopaTroopa_01) = { .detectSize = { 500 }, } }, + .init = &N(EVS_NpcInit_KoopaTroopa_01), + .settings = &N(NpcSettings_KoopaTroopa_Wander), + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_2000, + .drops = KOOPA_TROOPA_NOK_DROPS, .animations = KOOPA_TROOPA_ANIMS, }; -StaticNpc N(NpcData_ParaTroopa) = { +NpcData N(NpcData_ParaTroopa) = { .id = NPC_ParaTroopa, - .settings = &N(NpcSettings_ParaTroopa), .pos = { 184.0f, 50.0f, -100.0f }, .yaw = 270, - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, - .drops = PARATROOPA_DROPS, .territory = { .wander = { .isFlying = FALSE, @@ -94,16 +91,16 @@ StaticNpc N(NpcData_ParaTroopa) = { .detectSize = { 200 }, } }, + .settings = &N(NpcSettings_ParaTroopa), + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = PARATROOPA_DROPS, .animations = PARATROOPA_ANIMS, }; -StaticNpc N(NpcData_SpikedGoomba) = { +NpcData N(NpcData_SpikedGoomba) = { .id = NPC_SpikedGoomba, - .settings = &N(NpcSettings_SpikedGoomba_Wander), .pos = { -257.0f, 0.0f, -47.0f }, .yaw = 90, - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, - .drops = SPIKED_GOOMBA_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -116,16 +113,19 @@ StaticNpc N(NpcData_SpikedGoomba) = { .detectSize = { 200 }, } }, + .settings = &N(NpcSettings_SpikedGoomba_Wander), + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .drops = SPIKED_GOOMBA_DROPS, .animations = SPIKED_GOOMBA_ANIMS, }; -StaticNpc N(NpcData_KoopaTroopa_02) = { +NpcData N(NpcData_KoopaTroopa_02) = { .id = NPC_KoopaTroopa_02, - .settings = &N(NpcSettings_KoopaTroopa_Stationary), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_4000, .init = &N(EVS_NpcInit_KoopaTroopa_02), + .settings = &N(NpcSettings_KoopaTroopa_Stationary), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_4000, .drops = KOOPA_TROOPA_NOK_DROPS, .animations = KOOPA_TROOPA_ANIMS, }; diff --git a/src/world/area_nok/nok_15/nok_15_4_npc.c b/src/world/area_nok/nok_15/nok_15_4_npc.c index 43fa1cd9f6..09cd0faf83 100644 --- a/src/world/area_nok/nok_15/nok_15_4_npc.c +++ b/src/world/area_nok/nok_15/nok_15_4_npc.c @@ -1,16 +1,13 @@ #include "nok_15.h" -#include "world/common/enemy/complete/KoopaTroopa_Wander.inc.c" -#include "world/common/enemy/complete/Paratroopa.inc.c" -#include "world/common/enemy/complete/SpikedGoomba_Wander.inc.c" +#include "world/common/enemy/KoopaTroopa_Wander.inc.c" +#include "world/common/enemy/Paratroopa.inc.c" +#include "world/common/enemy/SpikedGoomba_Wander.inc.c" -StaticNpc N(NpcData_KoopaTroopa) = { +NpcData N(NpcData_KoopaTroopa) = { .id = NPC_KoopaTroopa, - .settings = &N(NpcSettings_KoopaTroopa_Wander), .pos = { -450.0f, 0.0f, -45.0f }, .yaw = 270, - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, - .drops = KOOPA_TROOPA_NOK_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -23,17 +20,17 @@ StaticNpc N(NpcData_KoopaTroopa) = { .detectSize = { 200 }, } }, + .settings = &N(NpcSettings_KoopaTroopa_Wander), + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .drops = KOOPA_TROOPA_NOK_DROPS, .animations = KOOPA_TROOPA_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, }; -StaticNpc N(NpcData_ParaTroopa) = { +NpcData N(NpcData_ParaTroopa) = { .id = NPC_ParaTroopa, - .settings = &N(NpcSettings_ParaTroopa), .pos = { -150.0f, 50.0f, -70.0f }, .yaw = 270, - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, - .drops = PARATROOPA_DROPS, .territory = { .wander = { .isFlying = FALSE, @@ -46,6 +43,9 @@ StaticNpc N(NpcData_ParaTroopa) = { .detectSize = { 200 }, } }, + .settings = &N(NpcSettings_ParaTroopa), + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = PARATROOPA_DROPS, .animations = PARATROOPA_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, }; diff --git a/src/world/area_obk/obk.h b/src/world/area_obk/obk.h index 9fa38fda54..40c24a4e24 100644 --- a/src/world/area_obk/obk.h +++ b/src/world/area_obk/obk.h @@ -2,22 +2,22 @@ #define _WORLD_AREA_OBK_OBK_H_ enum { - AB_OBK_0 = AreaByte(0), - AB_OBK_1 = AreaByte(1), - AB_OBK_2 = AreaByte(2), - AB_OBK_3 = AreaByte(3), - AB_OBK_4 = AreaByte(4), - AB_OBK_5 = AreaByte(5), - AB_OBK_6 = AreaByte(6), - AB_OBK_7 = AreaByte(7), - AB_OBK_8 = AreaByte(8), - AB_OBK_9 = AreaByte(9), - AB_OBK_A = AreaByte(10), - AB_OBK_B = AreaByte(11), - AB_OBK_C = AreaByte(12), - AB_OBK_D = AreaByte(13), - AB_OBK_E = AreaByte(14), - AB_OBK_F = AreaByte(15), + AB_OBK_Unused_0 = AreaByte(0), + AB_OBK_Unused_1 = AreaByte(1), + AB_OBK_Unused_2 = AreaByte(2), + AB_OBK_Unused_3 = AreaByte(3), + AB_OBK_Unused_4 = AreaByte(4), + AB_OBK_Unused_5 = AreaByte(5), + AB_OBK_Unused_6 = AreaByte(6), + AB_OBK_Unused_7 = AreaByte(7), + AB_OBK_Unused_8 = AreaByte(8), + AB_OBK_Unused_9 = AreaByte(9), + AB_OBK_Unused_A = AreaByte(10), + AB_OBK_Unused_B = AreaByte(11), + AB_OBK_Unused_C = AreaByte(12), + AB_OBK_Unused_D = AreaByte(13), + AB_OBK_Unused_E = AreaByte(14), + AB_OBK_Unused_F = AreaByte(15), }; enum { diff --git a/src/world/area_obk/obk_01/obk_01.h b/src/world/area_obk/obk_01/obk_01.h index 5db847fe63..460542eb49 100644 --- a/src/world/area_obk/obk_01/obk_01.h +++ b/src/world/area_obk/obk_01/obk_01.h @@ -21,8 +21,8 @@ enum { }; enum { - MV_UnusedPosOffset = MapVar(10), - MV_CabinetPosOffset = MapVar(11), + MV_UnusedPosOffset = MapVar(10), + MV_CabinetPosOffset = MapVar(11), }; #define NAMESPACE obk_01 diff --git a/src/world/area_obk/obk_01/obk_01_6_npc.c b/src/world/area_obk/obk_01/obk_01_6_npc.c index acc0a81ec0..1cf79463f0 100644 --- a/src/world/area_obk/obk_01/obk_01_6_npc.c +++ b/src/world/area_obk/obk_01/obk_01_6_npc.c @@ -188,47 +188,43 @@ EvtScript N(EVS_NpcInit_Franky) = { EVT_END }; -StaticNpc N(NpcData_JumpScareBoo) = { +NpcData N(NpcData_JumpScareBoo) = { .id = NPC_JumpScareBoo, - .settings = &N(NpcSettings_Boo), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, + .settings = &N(NpcSettings_Boo), .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_200 | ENEMY_FLAG_800, - .drops = BOO_DROPS, + .drops = NO_DROPS, .animations = NORMAL_BOO_ANIMS, }; -StaticNpc N(NpcData_TrafficBoo1) = { +NpcData N(NpcData_TrafficBoo1) = { .id = NPC_TrafficBoo1, - .settings = &N(NpcSettings_Boo), .pos = { 523.0f, -139.0f, 193.0f }, .yaw = 0, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_TrafficBoo1), - .drops = BOO_DROPS, + .settings = &N(NpcSettings_Boo), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_800, + .drops = NO_DROPS, .animations = NORMAL_BOO_ANIMS, }; -StaticNpc N(NpcData_TrafficBoo2) = { +NpcData N(NpcData_TrafficBoo2) = { .id = NPC_TrafficBoo2, - .settings = &N(NpcSettings_Boo), .pos = { 473.0f, -122.0f, 247.0f }, .yaw = 0, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_TrafficBoo2), - .drops = BOO_DROPS, + .settings = &N(NpcSettings_Boo), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_800, + .drops = NO_DROPS, .animations = NORMAL_BOO_ANIMS, }; -StaticNpc N(NpcData_Boos)[] = { +NpcData N(NpcData_Boos)[] = { { .id = NPC_UpstairsBoo, - .settings = &N(NpcSettings_Boo_Wander), .pos = { 422.0f, -200.0f, 112.0f }, .yaw = 0, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_800, - .init = &N(EVS_NpcInit_UpstairsBoo), - .drops = BOO_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -241,17 +237,17 @@ StaticNpc N(NpcData_Boos)[] = { .detectSize = { 30 }, } }, + .init = &N(EVS_NpcInit_UpstairsBoo), + .settings = &N(NpcSettings_Boo_Wander), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_800, + .drops = NO_DROPS, .animations = NORMAL_BOO_ANIMS, .tattle = MSG_NpcTattle_OBK_BooA, }, { .id = NPC_Franky, - .settings = &N(NpcSettings_Boo_Wander), .pos = { 397.0f, -410.0f, 352.0f }, .yaw = 0, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_800, - .init = &N(EVS_NpcInit_Franky), - .drops = BOO_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -264,6 +260,10 @@ StaticNpc N(NpcData_Boos)[] = { .detectSize = { 80 }, } }, + .init = &N(EVS_NpcInit_Franky), + .settings = &N(NpcSettings_Boo_Wander), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_800, + .drops = NO_DROPS, .animations = NORMAL_BOO_ANIMS, .tattle = MSG_NpcTattle_OBK_BooB, }, diff --git a/src/world/area_obk/obk_02/obk_02_3_npc.c b/src/world/area_obk/obk_02/obk_02_3_npc.c index 323b731817..06e7491d15 100644 --- a/src/world/area_obk/obk_02/obk_02_3_npc.c +++ b/src/world/area_obk/obk_02/obk_02_3_npc.c @@ -18,25 +18,25 @@ EvtScript N(EVS_NpcInit_TrafficBoo2) = { EVT_END }; -StaticNpc N(NpcData_TrafficBoos)[] = { +NpcData N(NpcData_TrafficBoos)[] = { { .id = NPC_TrafficBoo1, - .settings = &N(NpcSettings_Boo), .pos = { 523.0f, -139.0f, 193.0f }, .yaw = 0, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_TrafficBoo1), - .drops = BOO_DROPS, + .settings = &N(NpcSettings_Boo), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = NO_DROPS, .animations = NORMAL_BOO_ANIMS, }, { .id = NPC_TrafficBoo2, - .settings = &N(NpcSettings_Boo), .pos = { 473.0f, -122.0f, 247.0f }, .yaw = 0, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_TrafficBoo2), - .drops = BOO_DROPS, + .settings = &N(NpcSettings_Boo), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = NO_DROPS, .animations = NORMAL_BOO_ANIMS, }, }; diff --git a/src/world/area_obk/obk_03/obk_03.h b/src/world/area_obk/obk_03/obk_03.h index 63d35e3b4c..732e5c0b67 100644 --- a/src/world/area_obk/obk_03/obk_03.h +++ b/src/world/area_obk/obk_03/obk_03.h @@ -13,7 +13,7 @@ #include "sprite/npc/Boo.h" enum { - NPC_Igor = 0, + NPC_Igor = 0, }; #define NAMESPACE obk_03 diff --git a/src/world/area_obk/obk_03/obk_03_6_npc.c b/src/world/area_obk/obk_03/obk_03_6_npc.c index b94808d4a8..47c754786c 100644 --- a/src/world/area_obk/obk_03/obk_03_6_npc.c +++ b/src/world/area_obk/obk_03/obk_03_6_npc.c @@ -49,14 +49,14 @@ EvtScript N(EVS_NpcInit_Igor) = { EVT_END }; -StaticNpc N(NpcData_Igor) = { +NpcData N(NpcData_Igor) = { .id = NPC_Igor, - .settings = &N(NpcSettings_Boo), .pos = { 43.0f, -200.0f, -9.0f }, .yaw = 90, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_Igor), - .drops = BOO_DROPS, + .settings = &N(NpcSettings_Boo), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = NO_DROPS, .animations = NORMAL_BOO_ANIMS, .tattle = MSG_NpcTattle_OBK_ShopOwner, }; diff --git a/src/world/area_obk/obk_04/obk_04_3_npc.c b/src/world/area_obk/obk_04/obk_04_3_npc.c index 47cbd9cba9..8b8355648f 100644 --- a/src/world/area_obk/obk_04/obk_04_3_npc.c +++ b/src/world/area_obk/obk_04/obk_04_3_npc.c @@ -486,102 +486,102 @@ EvtScript N(EVS_NpcInit_KeepAwayBoo8) = { EVT_END }; -StaticNpc N(NpcData_Boo_01) = { +NpcData N(NpcData_Boo_01) = { .id = NPC_Boo_01, - .settings = &N(NpcSettings_Boo), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_10000000, .init = &N(EVS_NpcInit_Boo_01), - .drops = BOO_DROPS, + .settings = &N(NpcSettings_Boo), + .flags = ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_10000000, + .drops = NO_DROPS, .animations = NORMAL_BOO_ANIMS, }; -StaticNpc N(NpcData_KeepAwayBoo1) = { +NpcData N(NpcData_KeepAwayBoo1) = { .id = NPC_KeepAwayBoo1, - .settings = &N(NpcSettings_Boo), .pos = { 176.0f, 0.0f, -173.0f }, .yaw = 270, - .flags = ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_10000000, .init = &N(EVS_NpcInit_KeepAwayBoo1), - .drops = BOO_DROPS, + .settings = &N(NpcSettings_Boo), + .flags = ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_10000000, + .drops = NO_DROPS, .animations = NORMAL_BOO_ANIMS, }; -StaticNpc N(NpcData_KeepAwayBoo2) = { +NpcData N(NpcData_KeepAwayBoo2) = { .id = NPC_KeepAwayBoo2, - .settings = &N(NpcSettings_Boo), .pos = { 176.0f, 0.0f, -173.0f }, .yaw = 270, - .flags = ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_10000000, .init = &N(EVS_NpcInit_KeepAwayBoo2), - .drops = BOO_DROPS, + .settings = &N(NpcSettings_Boo), + .flags = ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_10000000, + .drops = NO_DROPS, .animations = NORMAL_BOO_ANIMS, }; -StaticNpc N(NpcData_KeepAwayBoo3) = { +NpcData N(NpcData_KeepAwayBoo3) = { .id = NPC_KeepAwayBoo3, - .settings = &N(NpcSettings_Boo), .pos = { 176.0f, 0.0f, -173.0f }, .yaw = 270, - .flags = ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_10000000, .init = &N(EVS_NpcInit_KeepAwayBoo3), - .drops = BOO_DROPS, + .settings = &N(NpcSettings_Boo), + .flags = ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_10000000, + .drops = NO_DROPS, .animations = NORMAL_BOO_ANIMS, }; -StaticNpc N(NpcData_KeepAwayBoo4) = { +NpcData N(NpcData_KeepAwayBoo4) = { .id = NPC_KeepAwayBoo4, - .settings = &N(NpcSettings_Boo), .pos = { 176.0f, 0.0f, -173.0f }, .yaw = 270, - .flags = ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_10000000, .init = &N(EVS_NpcInit_KeepAwayBoo4), - .drops = BOO_DROPS, + .settings = &N(NpcSettings_Boo), + .flags = ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_10000000, + .drops = NO_DROPS, .animations = NORMAL_BOO_ANIMS, }; -StaticNpc N(NpcData_KeepAwayBoo5) = { +NpcData N(NpcData_KeepAwayBoo5) = { .id = NPC_KeepAwayBoo5, - .settings = &N(NpcSettings_Boo), .pos = { 176.0f, 0.0f, -173.0f }, .yaw = 270, - .flags = ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_10000000, .init = &N(EVS_NpcInit_KeepAwayBoo5), - .drops = BOO_DROPS, + .settings = &N(NpcSettings_Boo), + .flags = ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_10000000, + .drops = NO_DROPS, .animations = NORMAL_BOO_ANIMS, }; -StaticNpc N(NpcData_KeepAwayBoo6) = { +NpcData N(NpcData_KeepAwayBoo6) = { .id = NPC_KeepAwayBoo6, - .settings = &N(NpcSettings_Boo), .pos = { 176.0f, 0.0f, -173.0f }, .yaw = 270, - .flags = ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_10000000, .init = &N(EVS_NpcInit_KeepAwayBoo6), - .drops = BOO_DROPS, + .settings = &N(NpcSettings_Boo), + .flags = ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_10000000, + .drops = NO_DROPS, .animations = NORMAL_BOO_ANIMS, }; -StaticNpc N(NpcData_KeepAwayBoo7) = { +NpcData N(NpcData_KeepAwayBoo7) = { .id = NPC_KeepAwayBoo7, - .settings = &N(NpcSettings_Boo), .pos = { 176.0f, 0.0f, -173.0f }, .yaw = 270, - .flags = ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_10000000, .init = &N(EVS_NpcInit_KeepAwayBoo7), - .drops = BOO_DROPS, + .settings = &N(NpcSettings_Boo), + .flags = ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_10000000, + .drops = NO_DROPS, .animations = NORMAL_BOO_ANIMS, }; -StaticNpc N(NpcData_KeepAwayBoo8) = { +NpcData N(NpcData_KeepAwayBoo8) = { .id = NPC_KeepAwayBoo8, - .settings = &N(NpcSettings_Boo), .pos = { 176.0f, 0.0f, -173.0f }, .yaw = 270, - .flags = ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_10000000, .init = &N(EVS_NpcInit_KeepAwayBoo8), - .drops = BOO_DROPS, + .settings = &N(NpcSettings_Boo), + .flags = ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_10000000, + .drops = NO_DROPS, .animations = NORMAL_BOO_ANIMS, }; @@ -620,37 +620,37 @@ EvtScript N(EVS_NpcInit_TutorialBoo) = { EVT_END }; -StaticNpc N(NpcData_KeepAwayExtras)[] = { +NpcData N(NpcData_KeepAwayExtras)[] = { { .id = NPC_LeaderBoo, - .settings = &N(NpcSettings_Boo), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_Boo_10), - .drops = BOO_DROPS, + .settings = &N(NpcSettings_Boo), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = NO_DROPS, .animations = NORMAL_BOO_ANIMS, }, { .id = NPC_DummyBoo, - .settings = &N(NpcSettings_Boo), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_4000, .init = &N(EVS_NpcInit_Boo_11), - .drops = BOO_DROPS, + .settings = &N(NpcSettings_Boo), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_4000, + .drops = NO_DROPS, .animations = NORMAL_BOO_ANIMS, }, }; -StaticNpc N(NpcData_TutorialBoo) = { +NpcData N(NpcData_TutorialBoo) = { .id = NPC_TutorialBoo, - .settings = &N(NpcSettings_Boo), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_TutorialBoo), - .drops = BOO_DROPS, + .settings = &N(NpcSettings_Boo), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = NO_DROPS, .animations = NORMAL_BOO_ANIMS, .tattle = MSG_NpcTattle_OBK_BootsTutor, }; diff --git a/src/world/area_obk/obk_05/obk_05_5_npc.c b/src/world/area_obk/obk_05/obk_05_5_npc.c index f5b5138a69..54783f15fe 100644 --- a/src/world/area_obk/obk_05/obk_05_5_npc.c +++ b/src/world/area_obk/obk_05/obk_05_5_npc.c @@ -18,25 +18,25 @@ EvtScript N(EVS_NpcInit_TrafficBoo2) = { EVT_END }; -StaticNpc N(NpcData_Boo_01)[] = { +NpcData N(NpcData_Boo_01)[] = { { .id = NPC_Boo_01, - .settings = &N(NpcSettings_Boo), .pos = { 523.0f, -139.0f, 193.0f }, .yaw = 0, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_TrafficBoo1), - .drops = BOO_DROPS, + .settings = &N(NpcSettings_Boo), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = NO_DROPS, .animations = NORMAL_BOO_ANIMS, }, { .id = NPC_Boo_02, - .settings = &N(NpcSettings_Boo), .pos = { 473.0f, -122.0f, 247.0f }, .yaw = 0, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_TrafficBoo2), - .drops = BOO_DROPS, + .settings = &N(NpcSettings_Boo), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = NO_DROPS, .animations = NORMAL_BOO_ANIMS, }, }; diff --git a/src/world/area_obk/obk_07/obk_07_5_npc.c b/src/world/area_obk/obk_07/obk_07_5_npc.c index bcbcf8a359..0f67a44b0d 100644 --- a/src/world/area_obk/obk_07/obk_07_5_npc.c +++ b/src/world/area_obk/obk_07/obk_07_5_npc.c @@ -12,14 +12,14 @@ EvtScript N(EVS_NpcInit_TrafficBoo1) = { EVT_END }; -StaticNpc N(NpcData_TrafficBoo1) = { +NpcData N(NpcData_TrafficBoo1) = { .id = NPC_TrafficBoo1, - .settings = &N(NpcSettings_Boo), .pos = { 523.0f, -139.0f, 193.0f }, .yaw = 0, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_TrafficBoo1), - .drops = BOO_DROPS, + .settings = &N(NpcSettings_Boo), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = NO_DROPS, .animations = NORMAL_BOO_ANIMS, }; @@ -29,14 +29,14 @@ EvtScript N(EVS_NpcInit_TrafficBoo2) = { EVT_END }; -StaticNpc N(NpcData_TrafficBoo2) = { +NpcData N(NpcData_TrafficBoo2) = { .id = NPC_TrafficBoo2, - .settings = &N(NpcSettings_Boo), .pos = { 473.0f, -122.0f, 247.0f }, .yaw = 0, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_TrafficBoo2), - .drops = BOO_DROPS, + .settings = &N(NpcSettings_Boo), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = NO_DROPS, .animations = NORMAL_BOO_ANIMS, }; @@ -51,14 +51,14 @@ EvtScript N(EVS_NpcInit_GuardBoo) = { EVT_END }; -StaticNpc N(NpcData_GuardBoo) = { +NpcData N(NpcData_GuardBoo) = { .id = NPC_GuardBoo, - .settings = &N(NpcSettings_Boo), .pos = { 168.0f, 0.0f, -161.0f }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_GuardBoo), - .drops = BOO_DROPS, + .settings = &N(NpcSettings_Boo), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_400000, + .drops = NO_DROPS, .animations = NORMAL_BOO_ANIMS, .tattle = MSG_NpcTattle_OBK_GuardingChest, }; diff --git a/src/world/area_obk/obk_08/obk_08_5_npc.c b/src/world/area_obk/obk_08/obk_08_5_npc.c index 999690508f..f293261ddf 100644 --- a/src/world/area_obk/obk_08/obk_08_5_npc.c +++ b/src/world/area_obk/obk_08/obk_08_5_npc.c @@ -446,102 +446,102 @@ EvtScript N(EVS_NpcInit_KeepAwayBoo8) = { EVT_END }; -StaticNpc N(NpcData_Boo_01) = { +NpcData N(NpcData_Boo_01) = { .id = NPC_Boo_01, - .settings = &N(NpcSettings_Boo), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_10000000, .init = &N(EVS_NpcInit_Boo_01), - .drops = BOO_DROPS, + .settings = &N(NpcSettings_Boo), + .flags = ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_10000000, + .drops = NO_DROPS, .animations = NORMAL_BOO_ANIMS, }; -StaticNpc N(NpcData_KeepAwayBoo1) = { +NpcData N(NpcData_KeepAwayBoo1) = { .id = NPC_KeepAwayBoo1, - .settings = &N(NpcSettings_Boo), .pos = { -268.0f, 52.0f, 0.0f }, .yaw = 0, - .flags = ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_10000000, .init = &N(EVS_NpcInit_KeepAwayBoo1), - .drops = BOO_DROPS, + .settings = &N(NpcSettings_Boo), + .flags = ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_10000000, + .drops = NO_DROPS, .animations = NORMAL_BOO_ANIMS, }; -StaticNpc N(NpcData_KeepAwayBoo2) = { +NpcData N(NpcData_KeepAwayBoo2) = { .id = NPC_KeepAwayBoo2, - .settings = &N(NpcSettings_Boo), .pos = { -268.0f, 52.0f, 0.0f }, .yaw = 0, - .flags = ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_10000000, .init = &N(EVS_NpcInit_KeepAwayBoo2), - .drops = BOO_DROPS, + .settings = &N(NpcSettings_Boo), + .flags = ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_10000000, + .drops = NO_DROPS, .animations = NORMAL_BOO_ANIMS, }; -StaticNpc N(NpcData_KeepAwayBoo3) = { +NpcData N(NpcData_KeepAwayBoo3) = { .id = NPC_KeepAwayBoo3, - .settings = &N(NpcSettings_Boo), .pos = { -268.0f, 52.0f, 0.0f }, .yaw = 0, - .flags = ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_10000000, .init = &N(EVS_NpcInit_KeepAwayBoo3), - .drops = BOO_DROPS, + .settings = &N(NpcSettings_Boo), + .flags = ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_10000000, + .drops = NO_DROPS, .animations = NORMAL_BOO_ANIMS, }; -StaticNpc N(NpcData_KeepAwayBoo4) = { +NpcData N(NpcData_KeepAwayBoo4) = { .id = NPC_KeepAwayBoo4, - .settings = &N(NpcSettings_Boo), .pos = { -268.0f, 52.0f, 0.0f }, .yaw = 0, - .flags = ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_10000000, .init = &N(EVS_NpcInit_KeepAwayBoo4), - .drops = BOO_DROPS, + .settings = &N(NpcSettings_Boo), + .flags = ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_10000000, + .drops = NO_DROPS, .animations = NORMAL_BOO_ANIMS, }; -StaticNpc N(NpcData_KeepAwayBoo5) = { +NpcData N(NpcData_KeepAwayBoo5) = { .id = NPC_KeepAwayBoo5, - .settings = &N(NpcSettings_Boo), .pos = { -268.0f, 52.0f, 0.0f }, .yaw = 0, - .flags = ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_10000000, .init = &N(EVS_NpcInit_KeepAwayBoo5), - .drops = BOO_DROPS, + .settings = &N(NpcSettings_Boo), + .flags = ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_10000000, + .drops = NO_DROPS, .animations = NORMAL_BOO_ANIMS, }; -StaticNpc N(NpcData_KeepAwayBoo6) = { +NpcData N(NpcData_KeepAwayBoo6) = { .id = NPC_KeepAwayBoo6, - .settings = &N(NpcSettings_Boo), .pos = { -268.0f, 52.0f, 0.0f }, .yaw = 0, - .flags = ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_10000000, .init = &N(EVS_NpcInit_KeepAwayBoo6), - .drops = BOO_DROPS, + .settings = &N(NpcSettings_Boo), + .flags = ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_10000000, + .drops = NO_DROPS, .animations = NORMAL_BOO_ANIMS, }; -StaticNpc N(NpcData_KeepAwayBoo7) = { +NpcData N(NpcData_KeepAwayBoo7) = { .id = NPC_KeepAwayBoo7, - .settings = &N(NpcSettings_Boo), .pos = { -268.0f, 52.0f, 0.0f }, .yaw = 0, - .flags = ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_10000000, .init = &N(EVS_NpcInit_KeepAwayBoo7), - .drops = BOO_DROPS, + .settings = &N(NpcSettings_Boo), + .flags = ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_10000000, + .drops = NO_DROPS, .animations = NORMAL_BOO_ANIMS, }; -StaticNpc N(NpcData_KeepAwayBoo8) = { +NpcData N(NpcData_KeepAwayBoo8) = { .id = NPC_KeepAwayBoo8, - .settings = &N(NpcSettings_Boo), .pos = { -268.0f, 52.0f, 0.0f }, .yaw = 0, - .flags = ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_10000000, .init = &N(EVS_NpcInit_KeepAwayBoo8), - .drops = BOO_DROPS, + .settings = &N(NpcSettings_Boo), + .flags = ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_10000000, + .drops = NO_DROPS, .animations = NORMAL_BOO_ANIMS, }; @@ -561,25 +561,25 @@ EvtScript N(EVS_NpcInit_TrafficBoo2) = { EVT_END }; -StaticNpc N(NpcData_TrafficBoos)[] = { +NpcData N(NpcData_TrafficBoos)[] = { { .id = NPC_TrafficBoo1, - .settings = &N(NpcSettings_Boo), .pos = { 523.0f, -139.0f, 193.0f }, .yaw = 0, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_TrafficBoo1), - .drops = BOO_DROPS, + .settings = &N(NpcSettings_Boo), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = NO_DROPS, .animations = NORMAL_BOO_ANIMS, }, { .id = NPC_TrafficBoo2, - .settings = &N(NpcSettings_Boo), .pos = { 473.0f, -122.0f, 247.0f }, .yaw = 0, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_TrafficBoo2), - .drops = BOO_DROPS, + .settings = &N(NpcSettings_Boo), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = NO_DROPS, .animations = NORMAL_BOO_ANIMS, }, }; @@ -595,25 +595,25 @@ EvtScript N(EVS_NpcInit_Boo_13) = { EVT_END }; -StaticNpc N(NpcData_KeepAwayExtras)[] = { +NpcData N(NpcData_KeepAwayExtras)[] = { { .id = NPC_LeaderBoo, - .settings = &N(NpcSettings_Boo), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_Boo_12), - .drops = BOO_DROPS, + .settings = &N(NpcSettings_Boo), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = NO_DROPS, .animations = NORMAL_BOO_ANIMS, }, { .id = NPC_DummyBoo, - .settings = &N(NpcSettings_Boo), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_4000, .init = &N(EVS_NpcInit_Boo_13), - .drops = BOO_DROPS, + .settings = &N(NpcSettings_Boo), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_4000, + .drops = NO_DROPS, .animations = NORMAL_BOO_ANIMS, }, }; diff --git a/src/world/area_obk/obk_09/obk_09.h b/src/world/area_obk/obk_09/obk_09.h index 38c5ccbaf7..7ecd6a4bff 100644 --- a/src/world/area_obk/obk_09/obk_09.h +++ b/src/world/area_obk/obk_09/obk_09.h @@ -14,9 +14,9 @@ #include "sprite/npc/WorldSkolar.h" enum { - NPC_Bow = 0, - NPC_Bootler = 1, - NPC_Skolar = 2, + NPC_Bow = 0, + NPC_Bootler = 1, + NPC_Skolar = 2, }; #define NAMESPACE obk_09 diff --git a/src/world/area_obk/obk_09/obk_09_4_npc.c b/src/world/area_obk/obk_09/obk_09_4_npc.c index b8a5ac97fc..78ff8e7a15 100644 --- a/src/world/area_obk/obk_09/obk_09_4_npc.c +++ b/src/world/area_obk/obk_09/obk_09_4_npc.c @@ -130,59 +130,59 @@ EvtScript N(EVS_NpcInit_Bootler_Epilogue) = { EVT_END }; -StaticNpc N(NpcData_Default)[] = { +NpcData N(NpcData_Default)[] = { { .id = NPC_Bow, - .settings = &N(NpcSettings_Dummy), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_Bow), - .drops = BOW_DROPS, + .settings = &N(NpcSettings_Dummy), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_800, + .drops = NO_DROPS, .animations = BOW_ANIMS, }, { .id = NPC_Bootler, - .settings = &N(NpcSettings_Dummy), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_Bootler), - .drops = BOOTLER_DROPS, + .settings = &N(NpcSettings_Dummy), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_800, + .drops = NO_DROPS, .animations = BOOTLER_ANIMS, .tattle = MSG_NpcTattle_Bootler, }, { .id = NPC_Skolar, - .settings = &N(NpcSettings_Dummy), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_Skolar), - .drops = SKOLAR_DROPS, + .settings = &N(NpcSettings_Dummy), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_800, + .drops = NO_DROPS, .animations = SKOLAR_ANIMS, }, }; -StaticNpc N(NpcData_Epilogue)[] = { +NpcData N(NpcData_Epilogue)[] = { { .id = NPC_Bow, - .settings = &N(NpcSettings_Dummy), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_Bow_Epilogue), - .drops = BOW_DROPS, + .settings = &N(NpcSettings_Dummy), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_800, + .drops = NO_DROPS, .animations = BOW_ANIMS, }, { .id = NPC_Bootler, - .settings = &N(NpcSettings_Dummy), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_Bootler_Epilogue), - .drops = BOOTLER_DROPS, + .settings = &N(NpcSettings_Dummy), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_800, + .drops = NO_DROPS, .animations = BOOTLER_ANIMS, .tattle = MSG_NpcTattle_Bootler, }, diff --git a/src/world/area_omo/common/TrainStationSwitches.inc.c b/src/world/area_omo/common/TrainStationSwitches.inc.c index 25bafc0804..6cd24004de 100644 --- a/src/world/area_omo/common/TrainStationSwitches.inc.c +++ b/src/world/area_omo/common/TrainStationSwitches.inc.c @@ -164,7 +164,6 @@ EvtScript N(EVS_PressSwitch_Right) = { }; #include "world/common/atomic/TexturePan.inc.c" -#include "world/common/atomic/TexturePan.data.inc.c" EvtScript N(EVS_SetupSwitches) = { EVT_SET(MF_EitherSwitchPressed, FALSE) 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 index 7b0c0d327f..db91fc7b73 100644 --- a/src/world/area_omo/omo_01/omo_01_4_npc.c +++ b/src/world/area_omo/omo_01/omo_01_4_npc.c @@ -1,6 +1,6 @@ #include "omo_01.h" -#include "world/common/enemy/complete/ShyGuy_AvoidPlayer.inc.c" +#include "world/common/enemy/ShyGuy_AvoidPlayer.inc.c" EvtScript N(EVS_ShyGuy_CarryItem) = { EVT_SET(LVarA, LVar0) // npcID @@ -77,14 +77,10 @@ EvtScript N(EVS_NpcInit_ShyGuy) = { EVT_END }; -StaticNpc N(NpcData_ShyGuy_01) = { +NpcData 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, @@ -97,6 +93,10 @@ StaticNpc N(NpcData_ShyGuy_01) = { .detectSize = { 300 }, } }, + .init = &N(EVS_NpcInit_ShyGuy), + .settings = &N(NpcSettings_ShyGuy_AvoidPlayer), + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = SHY_GUY_DROPS, .animations = RED_AVOID_SHY_GUY_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, }; @@ -112,14 +112,10 @@ EvtScript N(EVS_NpcInit_ShyGuy_02) = { EVT_END }; -StaticNpc N(NpcData_ShyGuy_02) = { +NpcData 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, @@ -132,6 +128,10 @@ StaticNpc N(NpcData_ShyGuy_02) = { .detectSize = { 300 }, } }, + .init = &N(EVS_NpcInit_ShyGuy_02), + .settings = &N(NpcSettings_ShyGuy_AvoidPlayer), + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = SHY_GUY_DROPS, .animations = YELLOW_AVOID_SHY_GUY_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, }; @@ -147,14 +147,10 @@ EvtScript N(EVS_NpcInit_ShyGuy_03) = { EVT_END }; -StaticNpc N(NpcData_ShyGuy_03) = { +NpcData 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, @@ -167,6 +163,10 @@ StaticNpc N(NpcData_ShyGuy_03) = { .detectSize = { 300 }, } }, + .init = &N(EVS_NpcInit_ShyGuy_03), + .settings = &N(NpcSettings_ShyGuy_AvoidPlayer), + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = SHY_GUY_DROPS, .animations = YELLOW_AVOID_SHY_GUY_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, }; @@ -182,14 +182,10 @@ EvtScript N(EVS_NpcInit_ShyGuy_04) = { EVT_END }; -StaticNpc N(NpcData_ShyGuy_04) = { +NpcData 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, @@ -202,6 +198,10 @@ StaticNpc N(NpcData_ShyGuy_04) = { .detectSize = { 300 }, } }, + .init = &N(EVS_NpcInit_ShyGuy_04), + .settings = &N(NpcSettings_ShyGuy_AvoidPlayer), + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = SHY_GUY_DROPS, .animations = BLUE_AVOID_SHY_GUY_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, }; @@ -217,14 +217,10 @@ EvtScript N(EVS_NpcInit_ShyGuy_05) = { EVT_END }; -StaticNpc N(NpcData_ShyGuy_05) = { +NpcData 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, @@ -237,6 +233,10 @@ StaticNpc N(NpcData_ShyGuy_05) = { .detectSize = { 300 }, } }, + .init = &N(EVS_NpcInit_ShyGuy_05), + .settings = &N(NpcSettings_ShyGuy_AvoidPlayer), + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = SHY_GUY_DROPS, .animations = GREEN_AVOID_SHY_GUY_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, }; 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 index c2d2fde2b7..65ec28ed0b 100644 --- a/src/world/area_omo/omo_02/omo_02_6_npc.c +++ b/src/world/area_omo/omo_02/omo_02_6_npc.c @@ -1,9 +1,9 @@ #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" +#include "world/common/enemy/ShyGuy_Wander.inc.c" +#include "world/common/enemy/ShyGuy_Guard.inc.c" +#include "world/common/enemy/ShyGuy_Stationary.inc.c" +#include "world/common/enemy/SpyGuy.inc.c" EvtScript N(EVS_RestrictCamFromBarricade) = { EVT_LABEL(0) @@ -283,128 +283,125 @@ EvtScript N(EVS_NpcInit_ShyGuy_Crowd) = { EVT_END }; -StaticNpc N(NpcData_ShyGuy_Loner) = { +NpcData N(NpcData_ShyGuy_Loner) = { .id = NPC_ShyGuy_01, - .settings = &N(NpcSettings_ShyGuy_Stationary), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_200 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_ShyGuy_Loner), - .drops = NPC_NO_DROPS, + .settings = &N(NpcSettings_ShyGuy_Stationary), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_200 | ENEMY_FLAG_800, + .drops = NO_DROPS, .animations = RED_SHY_GUY_ANIMS, }; -StaticNpc N(NpcData_ShyGuy_Crowd)[] = { +NpcData N(NpcData_ShyGuy_Crowd)[] = { { .id = NPC_ShyGuy_02, - .settings = &N(NpcSettings_ShyGuy_Stationary), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_ShyGuy_Crowd), - .drops = NPC_NO_DROPS, + .settings = &N(NpcSettings_ShyGuy_Stationary), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_800, + .drops = 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_PASSIVE | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_ShyGuy_Crowd), - .drops = NPC_NO_DROPS, + .settings = &N(NpcSettings_ShyGuy_Stationary), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_800, + .drops = 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_PASSIVE | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_ShyGuy_Crowd), - .drops = NPC_NO_DROPS, + .settings = &N(NpcSettings_ShyGuy_Stationary), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_800, + .drops = 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_PASSIVE | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_ShyGuy_Crowd), - .drops = NPC_NO_DROPS, + .settings = &N(NpcSettings_ShyGuy_Stationary), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_800, + .drops = 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_PASSIVE | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_ShyGuy_Crowd), - .drops = NPC_NO_DROPS, + .settings = &N(NpcSettings_ShyGuy_Stationary), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_800, + .drops = 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_PASSIVE | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_ShyGuy_Crowd), - .drops = NPC_NO_DROPS, + .settings = &N(NpcSettings_ShyGuy_Stationary), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_800, + .drops = 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_PASSIVE | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_ShyGuy_Crowd), - .drops = NPC_NO_DROPS, + .settings = &N(NpcSettings_ShyGuy_Stationary), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_800, + .drops = 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_PASSIVE | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_ShyGuy_Crowd), - .drops = NPC_NO_DROPS, + .settings = &N(NpcSettings_ShyGuy_Stationary), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_800, + .drops = 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_PASSIVE | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_ShyGuy_Crowd), - .drops = NPC_NO_DROPS, + .settings = &N(NpcSettings_ShyGuy_Stationary), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_800, + .drops = 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_PASSIVE | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_ShyGuy_Crowd), - .drops = NPC_NO_DROPS, + .settings = &N(NpcSettings_ShyGuy_Stationary), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_800, + .drops = NO_DROPS, .animations = RED_SHY_GUY_ANIMS, }, }; -StaticNpc N(NpcData_SpyGuy)[] = { +NpcData 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, @@ -417,6 +414,9 @@ StaticNpc N(NpcData_SpyGuy)[] = { .detectSize = { 200 }, } }, + .settings = &N(NpcSettings_SpyGuy), + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = SPY_GUY_DROPS, .animations = SPY_GUY_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, }, @@ -425,7 +425,7 @@ StaticNpc N(NpcData_SpyGuy)[] = { }; // separated into its own NPC to make the group count match in DefaultNPCs -StaticNpc N(NpcData_SpyGuy_UnusedRock)[] = { +NpcData N(NpcData_SpyGuy_UnusedRock)[] = { SPY_GUY_ROCK_HITBOX(NPC_SpyGuy_Rock3), }; diff --git a/src/world/area_omo/omo_03/omo_03.h b/src/world/area_omo/omo_03/omo_03.h index 3d7e181a8b..ba202f5a93 100644 --- a/src/world/area_omo/omo_03/omo_03.h +++ b/src/world/area_omo/omo_03/omo_03.h @@ -15,13 +15,13 @@ #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, + 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 { @@ -29,7 +29,7 @@ enum { MV_TrainUnk_01 = MapVar(1), MV_TrainUnk_02 = MapVar(2), MV_ArrowTexUOffset = MapVar(9), - MV_DroppedTrainAngle = MapVar(10), + MV_DroppedTrainAngle = MapVar(10), MV_TrainPos = MapVar(11), MV_TrainUnk_0C = MapVar(12), MV_TrainUnk_0D = MapVar(13), @@ -37,7 +37,7 @@ enum { enum { MF_TrainUnk_00 = MapFlag(0), - MF_EitherSwitchPressed = MapFlag(1), + MF_EitherSwitchPressed = MapFlag(1), AF_JAN01_TreeDrop_StarPiece = MapFlag(10), }; 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 index a09a63ad43..271ca0ac8f 100644 --- a/src/world/area_omo/omo_03/omo_03_5_npc.c +++ b/src/world/area_omo/omo_03/omo_03_5_npc.c @@ -3,7 +3,7 @@ #include "world/common/npc/TrainToad.inc.c" #include "world/common/npc/Parakarry.inc.c" -#include "world/common/enemy/complete/ShyGuy_Stationary.inc.c" +#include "world/common/enemy/ShyGuy_Stationary.inc.c" EvtScript N(EVS_ItemPrompt_ToyTrain) = { EVT_CALL(DisablePlayerInput, TRUE) @@ -121,48 +121,48 @@ EvtScript N(EVS_NpcInit_TrainToad) = { EVT_END }; -StaticNpc N(NpcData_TrainToads)[] = { +NpcData N(NpcData_TrainToads)[] = { { .id = NPC_Conductor, - .settings = &N(NpcSettings_TrainToad), .pos = { 170.0f, 50.0f, -115.0f }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_Conductor), - .drops = NPC_NO_DROPS, + .settings = &N(NpcSettings_TrainToad), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_400000, + .drops = 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_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_TrainToad), - .drops = NPC_NO_DROPS, + .settings = &N(NpcSettings_TrainToad), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_400000, + .drops = NO_DROPS, .animations = TRAIN_TOAD_BLUE_ANIMS, .tattle = MSG_NpcTattle_OMO_TrainConductor, } }; -StaticNpc N(NpcData_Epilogue)[] = { +NpcData N(NpcData_Epilogue)[] = { { .id = NPC_Parakarry, - .settings = &N(NpcSettings_Parakarry), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 90, + .settings = &N(NpcSettings_Parakarry), .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4, - .drops = NPC_NO_DROPS, + .drops = NO_DROPS, .animations = PARAKARRY_ANIMS, }, { .id = NPC_Watt, - .settings = &N(NpcSettings_ShyGuy_Stationary), .pos = { 50.0f, 15.0f, 160.0f }, .yaw = 90, + .settings = &N(NpcSettings_ShyGuy_Stationary), .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4, - .drops = NPC_NO_DROPS, + .drops = NO_DROPS, .animations = { .idle = ANIM_WorldWatt_Idle, .walk = ANIM_WorldWatt_Idle, @@ -184,29 +184,29 @@ StaticNpc N(NpcData_Epilogue)[] = { }, { .id = NPC_ShyGuy_01, - .settings = &N(NpcSettings_ShyGuy_Stationary), .pos = { 100.0f, 0.0f, 160.0f }, .yaw = 270, + .settings = &N(NpcSettings_ShyGuy_Stationary), .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4, - .drops = NPC_NO_DROPS, + .drops = 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, + .settings = &N(NpcSettings_ShyGuy_Stationary), .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4, - .drops = NPC_NO_DROPS, + .drops = 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, + .settings = &N(NpcSettings_ShyGuy_Stationary), .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4, - .drops = NPC_NO_DROPS, + .drops = NO_DROPS, .animations = RED_SHY_GUY_ANIMS, }, }; 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 4e0a6c7e4e..85e7b10645 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 @@ -1,9 +1,9 @@ #include "omo_04.h" -#include "world/common/enemy/complete/SkyGuy.inc.c" -#include "world/common/enemy/complete/ShyGuy_Wander.inc.c" +#include "world/common/enemy/SkyGuy.inc.c" +#include "world/common/enemy/ShyGuy_Wander.inc.c" -#include "world/common/enemy/complete/Goomba.h" +#include "world/common/enemy/Goomba.h" // level changed from 5 -> 14 NpcSettings N(NpcSettings_Goomba) = { @@ -15,8 +15,8 @@ NpcSettings N(NpcSettings_Goomba) = { .actionFlags = AI_ACTION_JUMP_WHEN_SEE_PLAYER, }; -#include "world/common/enemy/complete/Clubba.inc.c" -#include "world/common/enemy/complete/Kammy.inc.c" +#include "world/common/enemy/Clubba.inc.c" +#include "world/common/enemy/Kammy_Flying.inc.c" #include "world/common/todo/SetCamera0Flag1000.inc.c" #include "world/common/todo/UnsetCamera0Flag1000.inc.c" @@ -89,35 +89,32 @@ EvtScript N(EVS_NpcInit_Kammy) = { EVT_END }; -StaticNpc N(NpcData_Goomba) = { +NpcData N(NpcData_Goomba) = { .id = NPC_Goomba, - .settings = &N(NpcSettings_Goomba), .pos = { 1100.0f, 0.0f, 0.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_Goomba), - .drops = NPC_NO_DROPS, + .settings = &N(NpcSettings_Goomba), + .flags = ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_400000, + .drops = NO_DROPS, .animations = GOOMBA_ANIMS, }; -StaticNpc N(NpcData_Clubba) = { +NpcData N(NpcData_Clubba) = { .id = NPC_Clubba, - .settings = &N(NpcSettings_Clubba), .pos = { 1100.0f, 0.0f, 0.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_Clubba), - .drops = NPC_NO_DROPS, + .settings = &N(NpcSettings_Clubba), + .flags = ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_400000, + .drops = NO_DROPS, .animations = CLUBBA_ANIMS_ALT, }; -StaticNpc N(NpcData_ShyGuy) = { +NpcData N(NpcData_ShyGuy) = { .id = NPC_ShyGuy, - .settings = &N(NpcSettings_ShyGuy_Wander), .pos = { -770.0f, 0.0f, 0.0f }, .yaw = 270, - .flags = ENEMY_FLAG_800, - .drops = SHY_GUY_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -130,17 +127,17 @@ StaticNpc N(NpcData_ShyGuy) = { .detectSize = { 200 }, } }, + .settings = &N(NpcSettings_ShyGuy_Wander), + .flags = ENEMY_FLAG_800, + .drops = SHY_GUY_DROPS, .animations = PINK_SHY_GUY_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, }; -StaticNpc N(NpcData_SkyGuy) = { +NpcData N(NpcData_SkyGuy) = { .id = NPC_SkyGuy, - .settings = &N(NpcSettings_SkyGuy), .pos = { -170.0f, 60.0f, 30.0f }, .yaw = 270, - .flags = ENEMY_FLAG_800, - .drops = SKY_GUY_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -153,28 +150,31 @@ StaticNpc N(NpcData_SkyGuy) = { .detectSize = { 200 }, } }, + .settings = &N(NpcSettings_SkyGuy), + .flags = ENEMY_FLAG_800, + .drops = SKY_GUY_DROPS, .animations = SKY_GUY_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, }; -s32 N(ExtraAnims_Kammy)[] = { +AnimID N(ExtraAnims_Kammy)[] = { ANIM_WorldKammy_Anim0E, ANIM_WorldKammy_Anim0F, ANIM_WorldKammy_Anim10, ANIM_WorldKammy_Anim13, ANIM_WorldKammy_Anim15, ANIM_WorldKammy_Anim16, - -1 + ANIM_LIST_END }; -StaticNpc N(NpcData_Kammy) = { +NpcData 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, + .settings = &N(NpcSettings_Kammy_Flying), + .flags = ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = NO_DROPS, .animations = KAMMY_ANIMS, .extraAnimations = N(ExtraAnims_Kammy), }; 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 81fb3c907c..a407859c8a 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 @@ -1,14 +1,10 @@ #include "omo_05.h" -#include "world/common/enemy/complete/ShyGuy_Wander.inc.c" -#include "world/common/enemy/complete/GrooveGuy.inc.c" -#include "world/common/enemy/complete/SkyGuy.inc.c" +#include "world/common/enemy/ShyGuy_Wander.inc.c" +#include "world/common/enemy/GrooveGuy.inc.c" +#include "world/common/enemy/SkyGuy.inc.c" -NpcSettings N(NpcSettings_GourmetGuy) = { - .height = 68, - .radius = 60, - .level = 99, -}; +#include "world/common/npc/GourmetGuy.inc.c" #include "world/common/complete/NormalItemChoice.inc.c" @@ -39,8 +35,9 @@ API_CALLABLE(N(SpinCameraAround)) { if (script->functionTempF[0] >= 360.0) { return ApiStatus_DONE2; + } else { + return ApiStatus_BLOCK; } - return ApiStatus_BLOCK; } BSS s32 N(AllConsumables)[ITEM_NUM_CONSUMABLES + 1]; @@ -392,110 +389,44 @@ EvtScript N(EVS_NpcInit_GourmetGuy) = { EVT_END }; -StaticNpc N(NpcData_GourmetGuy)[] = { +NpcData N(NpcData_GourmetGuy)[] = { { .id = NPC_GourmetGuy, - .settings = &N(NpcSettings_GourmetGuy), .pos = { -250.0f, 10.0f, 85.0f }, .yaw = 90, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_800 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_GourmetGuy), - .drops = { - .dropFlags = NPC_DROP_FLAG_80, - .heartDrops = NO_DROPS, - .flowerDrops = NO_DROPS, - }, - .animations = { - .idle = ANIM_GourmetGuy_Idle, - .walk = ANIM_GourmetGuy_Idle, - .run = ANIM_GourmetGuy_Idle, - .chase = ANIM_GourmetGuy_Idle, - .anim_4 = ANIM_GourmetGuy_Idle, - .anim_5 = ANIM_GourmetGuy_Idle, - .death = ANIM_GourmetGuy_Idle, - .hit = ANIM_GourmetGuy_Idle, - .anim_8 = ANIM_GourmetGuy_Idle, - .anim_9 = ANIM_GourmetGuy_Idle, - .anim_A = ANIM_GourmetGuy_Idle, - .anim_B = ANIM_GourmetGuy_Idle, - .anim_C = ANIM_GourmetGuy_Idle, - .anim_D = ANIM_GourmetGuy_Idle, - .anim_E = ANIM_GourmetGuy_Idle, - .anim_F = ANIM_GourmetGuy_Idle, - }, + .settings = &N(NpcSettings_GourmetGuy), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_800 | ENEMY_FLAG_400000, + .drops = NO_DROPS, + .animations = GOURMET_GUY_ANIMS, .tattle = MSG_NpcTattle_GourmetGuy, }, { .id = NPC_GourmetGuy_Knife, - .settings = &N(NpcSettings_GourmetGuy), .pos = { -250.0f, 10.0f, 85.0f }, .yaw = 90, + .settings = &N(NpcSettings_GourmetGuy), .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_800, - .drops = { - .dropFlags = NPC_DROP_FLAG_80, - .heartDrops = NO_DROPS, - .flowerDrops = NO_DROPS, - }, - .animations = { - .idle = ANIM_GourmetGuy_Idle, - .walk = ANIM_GourmetGuy_Idle, - .run = ANIM_GourmetGuy_Idle, - .chase = ANIM_GourmetGuy_Idle, - .anim_4 = ANIM_GourmetGuy_Idle, - .anim_5 = ANIM_GourmetGuy_Idle, - .death = ANIM_GourmetGuy_Idle, - .hit = ANIM_GourmetGuy_Idle, - .anim_8 = ANIM_GourmetGuy_Idle, - .anim_9 = ANIM_GourmetGuy_Idle, - .anim_A = ANIM_GourmetGuy_Idle, - .anim_B = ANIM_GourmetGuy_Idle, - .anim_C = ANIM_GourmetGuy_Idle, - .anim_D = ANIM_GourmetGuy_Idle, - .anim_E = ANIM_GourmetGuy_Idle, - .anim_F = ANIM_GourmetGuy_Idle, - }, + .drops = NO_DROPS, + .animations = GOURMET_GUY_ANIMS, .tattle = MSG_NpcTattle_GourmetGuy, }, { .id = NPC_GourmetGuy_Fork, - .settings = &N(NpcSettings_GourmetGuy), .pos = { -250.0f, 10.0f, 85.0f }, .yaw = 90, + .settings = &N(NpcSettings_GourmetGuy), .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_800, - .drops = { - .dropFlags = NPC_DROP_FLAG_80, - .heartDrops = NO_DROPS, - .flowerDrops = NO_DROPS, - }, - .animations = { - .idle = ANIM_GourmetGuy_Idle, - .walk = ANIM_GourmetGuy_Idle, - .run = ANIM_GourmetGuy_Idle, - .chase = ANIM_GourmetGuy_Idle, - .anim_4 = ANIM_GourmetGuy_Idle, - .anim_5 = ANIM_GourmetGuy_Idle, - .death = ANIM_GourmetGuy_Idle, - .hit = ANIM_GourmetGuy_Idle, - .anim_8 = ANIM_GourmetGuy_Idle, - .anim_9 = ANIM_GourmetGuy_Idle, - .anim_A = ANIM_GourmetGuy_Idle, - .anim_B = ANIM_GourmetGuy_Idle, - .anim_C = ANIM_GourmetGuy_Idle, - .anim_D = ANIM_GourmetGuy_Idle, - .anim_E = ANIM_GourmetGuy_Idle, - .anim_F = ANIM_GourmetGuy_Idle, - }, + .drops = NO_DROPS, + .animations = GOURMET_GUY_ANIMS, .tattle = MSG_NpcTattle_GourmetGuy, }, }; -StaticNpc N(NpcData_GrooveGuy) = { +NpcData N(NpcData_GrooveGuy) = { .id = NPC_GrooveGuy, - .settings = &N(NpcSettings_GrooveGuy), .pos = { 320.0f, 10.0f, -145.0f }, .yaw = 270, - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, - .drops = GROOVE_GUY_DROPS_A, .territory = { .wander = { .isFlying = TRUE, @@ -508,6 +439,9 @@ StaticNpc N(NpcData_GrooveGuy) = { .detectSize = { 200 }, } }, + .settings = &N(NpcSettings_GrooveGuy), + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = GROOVE_GUY_DROPS_A, .animations = GROOVE_GUY_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, }; 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 index 208f781cbd..e34bb1405b 100644 --- a/src/world/area_omo/omo_06/omo_06_5_npc.c +++ b/src/world/area_omo/omo_06/omo_06_5_npc.c @@ -45,26 +45,26 @@ EvtScript N(EVS_NpcInit_TrainToad) = { EVT_END }; -StaticNpc N(NpcSettings_Toads)[] = { +NpcData N(NpcSettings_Toads)[] = { { .id = NPC_Conductor, - .settings = &N(NpcSettings_TrainToad), .pos = { 50.0f, 50.0f, 45.0f }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_Conductor), - .drops = TRAIN_CONDUCTOR_DROPS, + .settings = &N(NpcSettings_TrainToad), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_400000, + .drops = NO_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_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_TrainToad), - .drops = TRAIN_CONDUCTOR_DROPS, + .settings = &N(NpcSettings_TrainToad), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_400000, + .drops = NO_DROPS, .animations = TRAIN_TOAD_PINK_ANIMS, .tattle = MSG_NpcTattle_OMO_TrainConductor, }, 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 5490f4e926..9695763d60 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 @@ -1,8 +1,8 @@ #include "omo_07.h" -#include "world/common/enemy/complete/ShyGuy_Wander.inc.c" -#include "world/common/enemy/complete/ShyGuy_Patrol.inc.c" -#include "world/common/enemy/complete/SkyGuy.inc.c" +#include "world/common/enemy/ShyGuy_Wander.inc.c" +#include "world/common/enemy/ShyGuy_Patrol.inc.c" +#include "world/common/enemy/SkyGuy.inc.c" NpcSettings N(NpcSettings_Fuzzy) = { .height = 23, @@ -19,7 +19,7 @@ NpcSettings N(NpcSettings_HammerBros) = { .level = 27, }; -#include "world/common/enemy/complete/Kammy.inc.c" +#include "world/common/enemy/Kammy_Flying.inc.c" #include "world/common/todo/SetCamera0Flag1000.inc.c" #include "world/common/todo/UnsetCamera0Flag1000.inc.c" @@ -347,14 +347,10 @@ EvtScript N(EVS_NpcInit_Kammy) = { EVT_END }; -StaticNpc N(NpcData_ShyGuy) = { +NpcData N(NpcData_ShyGuy) = { .id = NPC_ShyGuy_01, - .settings = &N(NpcSettings_ShyGuy_Patrol), .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_ShyGuy), - .drops = SHY_GUY_NO_DROPS, .territory = { .patrol = { .isFlying = TRUE, @@ -373,17 +369,17 @@ StaticNpc N(NpcData_ShyGuy) = { .detectSize = { 100 }, } }, + .init = &N(EVS_NpcInit_ShyGuy), + .settings = &N(NpcSettings_ShyGuy_Patrol), + .flags = ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_200000, + .drops = NO_DROPS, .animations = RED_SHY_GUY_ANIMS, }; -StaticNpc N(NpcData_ShyGuy_02) = { +NpcData N(NpcData_ShyGuy_02) = { .id = NPC_ShyGuy_02, - .settings = &N(NpcSettings_ShyGuy_Patrol), .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_ShyGuy), - .drops = SHY_GUY_NO_DROPS, .territory = { .patrol = { .isFlying = TRUE, @@ -402,17 +398,17 @@ StaticNpc N(NpcData_ShyGuy_02) = { .detectSize = { 100 }, } }, + .init = &N(EVS_NpcInit_ShyGuy), + .settings = &N(NpcSettings_ShyGuy_Patrol), + .flags = ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_200000, + .drops = NO_DROPS, .animations = RED_SHY_GUY_ANIMS, }; -StaticNpc N(NpcData_ShyGuy_03) = { +NpcData N(NpcData_ShyGuy_03) = { .id = NPC_ShyGuy_03, - .settings = &N(NpcSettings_ShyGuy_Patrol), .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_ShyGuy), - .drops = SHY_GUY_NO_DROPS, .territory = { .patrol = { .isFlying = TRUE, @@ -431,17 +427,17 @@ StaticNpc N(NpcData_ShyGuy_03) = { .detectSize = { 100 }, } }, + .init = &N(EVS_NpcInit_ShyGuy), + .settings = &N(NpcSettings_ShyGuy_Patrol), + .flags = ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_200000, + .drops = NO_DROPS, .animations = RED_SHY_GUY_ANIMS, }; -StaticNpc N(NpcData_ShyGuy_04) = { +NpcData N(NpcData_ShyGuy_04) = { .id = NPC_ShyGuy_04, - .settings = &N(NpcSettings_ShyGuy_Patrol), .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_ShyGuy), - .drops = SHY_GUY_NO_DROPS, .territory = { .patrol = { .isFlying = TRUE, @@ -460,17 +456,21 @@ StaticNpc N(NpcData_ShyGuy_04) = { .detectSize = { 100 }, } }, + .init = &N(EVS_NpcInit_ShyGuy), + .settings = &N(NpcSettings_ShyGuy_Patrol), + .flags = ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_200000, + .drops = NO_DROPS, .animations = RED_SHY_GUY_ANIMS, }; -StaticNpc N(NpcData_Fuzzy) = { +NpcData N(NpcData_Fuzzy) = { .id = NPC_Fuzzy, - .settings = &N(NpcSettings_Fuzzy), .pos = { 1050.0f, 0.0f, 0.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_Fuzzy), - .drops = NPC_NO_DROPS, + .settings = &N(NpcSettings_Fuzzy), + .flags = ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_400000, + .drops = NO_DROPS, .animations = { .idle = ANIM_Fuzzy_Walk, .walk = ANIM_Fuzzy_Walk, @@ -491,14 +491,14 @@ StaticNpc N(NpcData_Fuzzy) = { }, }; -StaticNpc N(NpcData_HammerBros) = { +NpcData N(NpcData_HammerBros) = { .id = NPC_HammerBros, - .settings = &N(NpcSettings_HammerBros), .pos = { 1050.0f, 0.0f, 0.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_HammerBros), - .drops = NPC_NO_DROPS, + .settings = &N(NpcSettings_HammerBros), + .flags = ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_400000, + .drops = NO_DROPS, .animations = { .idle = ANIM_HammerBros_Anim02, .walk = ANIM_HammerBros_Anim04, @@ -519,13 +519,10 @@ StaticNpc N(NpcData_HammerBros) = { }, }; -StaticNpc N(NpcData_SkyGuy_01) = { +NpcData N(NpcData_SkyGuy_01) = { .id = NPC_SkyGuy_01, - .settings = &N(NpcSettings_SkyGuy), .pos = { -650.0f, 140.0f, -105.0f }, .yaw = 270, - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, - .drops = SKY_GUY_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -538,17 +535,17 @@ StaticNpc N(NpcData_SkyGuy_01) = { .detectSize = { 200 }, } }, + .settings = &N(NpcSettings_SkyGuy), + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = SKY_GUY_DROPS, .animations = SKY_GUY_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, }; -StaticNpc N(NpcData_SkyGuy_02) = { +NpcData N(NpcData_SkyGuy_02) = { .id = NPC_SkyGuy_02, - .settings = &N(NpcSettings_SkyGuy), .pos = { -550.0f, 60.0f, 70.0f }, .yaw = 270, - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, - .drops = SKY_GUY_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -561,28 +558,31 @@ StaticNpc N(NpcData_SkyGuy_02) = { .detectSize = { 200 }, } }, + .settings = &N(NpcSettings_SkyGuy), + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = SKY_GUY_DROPS, .animations = SKY_GUY_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, }; -s32 N(ExtraAnims_Kammy)[] = { +AnimID N(ExtraAnims_Kammy)[] = { ANIM_WorldKammy_Anim0E, ANIM_WorldKammy_Anim0F, ANIM_WorldKammy_Anim10, ANIM_WorldKammy_Anim13, ANIM_WorldKammy_Anim15, ANIM_WorldKammy_Anim16, - -1 + ANIM_LIST_END }; -StaticNpc N(NpcData_Kammy) = { +NpcData 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, + .settings = &N(NpcSettings_Kammy_Flying), + .flags = ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = NO_DROPS, .animations = KAMMY_ANIMS, .extraAnimations = N(ExtraAnims_Kammy), }; 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 index d51ab62b5e..be45168d52 100644 --- a/src/world/area_omo/omo_08/omo_08_6_npc.c +++ b/src/world/area_omo/omo_08/omo_08_6_npc.c @@ -1,7 +1,7 @@ #include "omo_08.h" #include "world/common/npc/TrainToad.inc.c" -#include "world/common/enemy/complete/ShyGuy_Wander.inc.c" +#include "world/common/enemy/ShyGuy_Wander.inc.c" EvtScript N(EVS_NpcInteract_Conductor) = { EVT_CALL(DisablePlayerInput, TRUE) @@ -97,47 +97,35 @@ EvtScript N(EVS_NpcInit_BoxedShyGuy) = { EVT_END }; -StaticNpc N(NpcData_Toads)[] = { +NpcData N(NpcData_Toads)[] = { { .id = NPC_Conductor, - .settings = &N(NpcSettings_TrainToad), .pos = { -145.0f, 50.0f, -110.0f }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | 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, - }, + .settings = &N(NpcSettings_TrainToad), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_400000, + .drops = 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_PASSIVE | 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, - }, + .settings = &N(NpcSettings_TrainToad), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_400000, + .drops = NO_DROPS, .animations = TRAIN_TOAD_GREEN_ANIMS, .tattle = MSG_NpcTattle_OMO_TrainConductor, }, }; -StaticNpc N(NpcData_ShyGuy_01) = { +NpcData 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, @@ -150,17 +138,17 @@ StaticNpc N(NpcData_ShyGuy_01) = { .detectSize = { 120 }, } }, + .init = &N(EVS_NpcInit_BoxedShyGuy), + .settings = &N(NpcSettings_ShyGuy_Wander), + .flags = ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_200000, + .drops = NO_DROPS, .animations = RED_SHY_GUY_ANIMS, }; -StaticNpc N(NpcData_ShyGuy_02) = { +NpcData 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, @@ -173,17 +161,17 @@ StaticNpc N(NpcData_ShyGuy_02) = { .detectSize = { 120 }, } }, + .init = &N(EVS_NpcInit_BoxedShyGuy), + .settings = &N(NpcSettings_ShyGuy_Wander), + .flags = ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_200000, + .drops = NO_DROPS, .animations = RED_SHY_GUY_ANIMS, }; -StaticNpc N(NpcData_ShyGuy_03) = { +NpcData 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, @@ -196,17 +184,17 @@ StaticNpc N(NpcData_ShyGuy_03) = { .detectSize = { 120 }, } }, + .init = &N(EVS_NpcInit_BoxedShyGuy), + .settings = &N(NpcSettings_ShyGuy_Wander), + .flags = ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_200000, + .drops = NO_DROPS, .animations = RED_SHY_GUY_ANIMS, }; -StaticNpc N(NpcData_ShyGuy_04) = { +NpcData 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, @@ -219,6 +207,10 @@ StaticNpc N(NpcData_ShyGuy_04) = { .detectSize = { 120 }, } }, + .init = &N(EVS_NpcInit_BoxedShyGuy), + .settings = &N(NpcSettings_ShyGuy_Wander), + .flags = ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_200000, + .drops = NO_DROPS, .animations = RED_SHY_GUY_ANIMS, }; 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 index 2dc2b162df..bd1c9e356e 100644 --- a/src/world/area_omo/omo_09/omo_09_7_npc.c +++ b/src/world/area_omo/omo_09/omo_09_7_npc.c @@ -1,6 +1,6 @@ #include "omo_09.h" -#include "world/common/enemy/complete/ShyGuy_Wander.inc.c" +#include "world/common/enemy/ShyGuy_Wander.inc.c" MobileAISettings N(AISettings_ShyGuy_Wander_NoReaction) = { .moveSpeed = 2.0f, @@ -33,11 +33,11 @@ NpcSettings N(NpcSettings_ShyGuy_Wander_NoReaction) = { .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/enemy/ShyGuy_Patrol.inc.c" +#include "world/common/enemy/SpyGuy.inc.c" +#include "world/common/enemy/Koopatrol_Stationary.inc.c" +#include "world/common/enemy/Pokey.inc.c" +#include "world/common/enemy/Kammy_Flying.inc.c" #include "world/common/todo/SetCamera0Flag1000.inc.c" #include "world/common/todo/UnsetCamera0Flag1000.inc.c" @@ -209,36 +209,32 @@ EvtScript N(EVS_NpcInit_ShyGuy_Jackpot) = { EVT_END }; -StaticNpc N(NpcData_Pokey) = { +NpcData 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, + .settings = &N(NpcSettings_Pokey), + .flags = ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_400000, + .drops = NO_DROPS, .animations = POKEY_ANIMS, }; -StaticNpc N(NpcData_Koopatrol) = { +NpcData 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, + .settings = &N(NpcSettings_Koopatrol_Stationary), + .flags = ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_400000, + .drops = NO_DROPS, .animations = KOOPATROL_ANIMS, }; -StaticNpc N(NpcData_ShyGuy_01) = { +NpcData 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, @@ -251,17 +247,17 @@ StaticNpc N(NpcData_ShyGuy_01) = { .detectSize = { 200 }, } }, + .init = &N(EVS_NpcInit_ShyGuy_Jackpot), + .settings = &N(NpcSettings_ShyGuy_Wander), + .flags = ENEMY_FLAG_4 | ENEMY_FLAG_200000, + .drops = NO_DROPS, .animations = RED_SHY_GUY_ANIMS, }; -StaticNpc N(NpcData_ShyGuy_02) = { +NpcData 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, @@ -274,17 +270,17 @@ StaticNpc N(NpcData_ShyGuy_02) = { .detectSize = { 200 }, } }, + .init = &N(EVS_NpcInit_ShyGuy_Jackpot), + .settings = &N(NpcSettings_ShyGuy_Wander), + .flags = ENEMY_FLAG_4 | ENEMY_FLAG_200000, + .drops = NO_DROPS, .animations = RED_SHY_GUY_ANIMS, }; -StaticNpc N(NpcData_ShyGuy_03) = { +NpcData 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, @@ -297,17 +293,17 @@ StaticNpc N(NpcData_ShyGuy_03) = { .detectSize = { 200 }, } }, + .init = &N(EVS_NpcInit_ShyGuy_Jackpot), + .settings = &N(NpcSettings_ShyGuy_Wander), + .flags = ENEMY_FLAG_4 | ENEMY_FLAG_200000, + .drops = NO_DROPS, .animations = RED_SHY_GUY_ANIMS, }; -StaticNpc N(NpcData_ShyGuy_04) = { +NpcData 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, @@ -320,17 +316,17 @@ StaticNpc N(NpcData_ShyGuy_04) = { .detectSize = { 200 }, } }, + .init = &N(EVS_NpcInit_ShyGuy_Jackpot), + .settings = &N(NpcSettings_ShyGuy_Wander), + .flags = ENEMY_FLAG_4 | ENEMY_FLAG_200000, + .drops = NO_DROPS, .animations = RED_SHY_GUY_ANIMS, }; -StaticNpc N(NpcData_ShyGuy_05) = { +NpcData 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, @@ -343,27 +339,31 @@ StaticNpc N(NpcData_ShyGuy_05) = { .detectSize = { 200 }, } }, + .init = &N(EVS_NpcInit_ShyGuy_Jackpot), + .settings = &N(NpcSettings_ShyGuy_Wander), + .flags = ENEMY_FLAG_4 | ENEMY_FLAG_200000, + .drops = NO_DROPS, .animations = RED_SHY_GUY_ANIMS, }; -s32 N(ExtraAnims_Kammy)[] = { +AnimID N(ExtraAnims_Kammy)[] = { ANIM_WorldKammy_Anim0E, ANIM_WorldKammy_Anim0F, ANIM_WorldKammy_Anim10, ANIM_WorldKammy_Anim13, ANIM_WorldKammy_Anim15, ANIM_WorldKammy_Anim16, - -1 + ANIM_LIST_END }; -StaticNpc N(NpcData_Kammy) = { +NpcData 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, + .settings = &N(NpcSettings_Kammy_Flying), + .flags = ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = NO_DROPS, .animations = KAMMY_ANIMS, .extraAnimations = N(ExtraAnims_Kammy), }; @@ -383,14 +383,10 @@ EvtScript N(EVS_ShyGuy_Thief) = { EVT_END }; -StaticNpc N(NpcData_ShyGuy_Thief) = { +NpcData 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, @@ -405,19 +401,20 @@ StaticNpc N(NpcData_ShyGuy_Thief) = { .detectSize = { 105, 140 }, } }, + .init = &N(EVS_ShyGuy_Thief), + .settings = &N(NpcSettings_ShyGuy_Patrol), + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = SHY_GUY_DROPS, .animations = YELLOW_SHY_GUY_ANIMS, - .aiDetectFlags = AI_DETECT_SIGHT, .aiFlags = ENEMY_AI_FLAG_1, + .aiDetectFlags = AI_DETECT_SIGHT, }; -StaticNpc N(NpcData_SpyGuy)[] = { +NpcData 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, @@ -430,6 +427,9 @@ StaticNpc N(NpcData_SpyGuy)[] = { .detectSize = { 200 }, } }, + .settings = &N(NpcSettings_SpyGuy), + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = SPY_GUY_DROPS, .animations = SPY_GUY_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, }, 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 index 99c379384d..f6dda6737e 100644 --- a/src/world/area_omo/omo_10/omo_10_5_npc.c +++ b/src/world/area_omo/omo_10/omo_10_5_npc.c @@ -35,26 +35,26 @@ EvtScript N(EVS_NpcInit_TrainToad) = { EVT_END }; -StaticNpc N(NpcData_Toads)[] = { +NpcData N(NpcData_Toads)[] = { { .id = NPC_Conductor, - .settings = &N(NpcSettings_TrainToad), .pos = { 10.0f, 50.0f, -105.0f }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_Conductor), - .drops = NPC_NO_DROPS, + .settings = &N(NpcSettings_TrainToad), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_400000, + .drops = 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_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_TrainToad), - .drops = NPC_NO_DROPS, + .settings = &N(NpcSettings_TrainToad), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_400000, + .drops = NO_DROPS, .animations = TRAIN_TOAD_RED_ANIMS, .tattle = MSG_NpcTattle_OMO_TrainConductor, }, 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 index d4d4cfc00f..4e07e825f9 100644 --- a/src/world/area_omo/omo_11/omo_11_5_npc.c +++ b/src/world/area_omo/omo_11/omo_11_5_npc.c @@ -1,14 +1,11 @@ #include "omo_11.h" -#include "world/common/enemy/complete/PyroGuy.inc.c" +#include "world/common/enemy/PyroGuy.inc.c" -StaticNpc N(NpcData_PyroGuy_01) = { +NpcData 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, @@ -21,17 +18,17 @@ StaticNpc N(NpcData_PyroGuy_01) = { .detectSize = { 200 }, } }, + .settings = &N(NpcSettings_PyroGuy), + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = PYRO_GUY_DROPS, .animations = PYRO_GUY_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, }; -StaticNpc N(NpcData_PyroGuy_02) = { +NpcData 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, @@ -44,6 +41,9 @@ StaticNpc N(NpcData_PyroGuy_02) = { .detectSize = { 200 }, } }, + .settings = &N(NpcSettings_PyroGuy), + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = PYRO_GUY_DROPS, .animations = PYRO_GUY_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, }; 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 index 29b919bd73..d7f5ac48e7 100644 --- a/src/world/area_omo/omo_12/omo_12_3_npc.c +++ b/src/world/area_omo/omo_12/omo_12_3_npc.c @@ -607,7 +607,7 @@ EvtScript N(EVS_NpcInit_Watt) = { EVT_END }; -s32 N(ExtraAnims_LanternGhost)[] = { +AnimID N(ExtraAnims_LanternGhost)[] = { ANIM_BigLanternGhost_Anim01, ANIM_BigLanternGhost_Anim06, ANIM_BigLanternGhost_Anim07, @@ -617,34 +617,34 @@ s32 N(ExtraAnims_LanternGhost)[] = { ANIM_BigLanternGhost_Anim02, ANIM_BigLanternGhost_Anim03, ANIM_BigLanternGhost_Anim04, - -1 + ANIM_LIST_END }; -StaticNpc N(NpcData_BigLanternGhost) = { +NpcData 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, + .settings = &N(NpcSettings_BigLanternGhost), + .flags = ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000, + .drops = NO_DROPS, .animations = BIG_LANTERN_GHOST_ANIMS, .extraAnimations = N(ExtraAnims_LanternGhost), .tattle = MSG_NpcTattle_OMO_Lantern, }; -StaticNpc N(NpcData_Watt) = { +NpcData N(NpcData_Watt) = { .id = NPC_Watt, - .settings = &N(NpcSettings_Watt), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 270, - .flags = COMMON_PASSIVE_FLAGS, .init = &N(EVS_NpcInit_Watt), .initVarCount = 1, .initVar = { .value = 0 }, - .drops = NPC_NO_DROPS, + .settings = &N(NpcSettings_Watt), + .flags = COMMON_PASSIVE_FLAGS, + .drops = NO_DROPS, .animations = { .idle = ANIM_WorldWatt_Idle, .walk = ANIM_WorldWatt_Idle, @@ -666,31 +666,31 @@ StaticNpc N(NpcData_Watt) = { .tattle = MSG_NpcTattle_OMO_Lantern, }; -StaticNpc N(NpcData_LanternTop) = { +NpcData N(NpcData_LanternTop) = { .id = NPC_LaternTop, - .settings = &N(NpcSettings_Watt), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 270, - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_LanternTop), .initVarCount = 1, .initVar = { .value = 0 }, - .drops = NPC_NO_DROPS, + .settings = &N(NpcSettings_Watt), + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_400000, + .drops = NO_DROPS, .animations = BIG_LANTERN_GHOST_ANIMS, .extraAnimations = N(ExtraAnims_LanternGhost), .tattle = MSG_NpcTattle_OMO_Lantern, }; -StaticNpc N(NpcData_LanternBottom) = { +NpcData N(NpcData_LanternBottom) = { .id = NPC_LaternBottom, - .settings = &N(NpcSettings_Watt), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 270, - .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | 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, + .settings = &N(NpcSettings_Watt), + .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_100000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_8000000, + .drops = NO_DROPS, .animations = BIG_LANTERN_GHOST_ANIMS, .extraAnimations = N(ExtraAnims_LanternGhost), .tattle = MSG_NpcTattle_OMO_Lantern, 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 index e264dae3ad..6004f75390 100644 --- a/src/world/area_omo/omo_13/omo_13_4_npc.c +++ b/src/world/area_omo/omo_13/omo_13_4_npc.c @@ -1,7 +1,7 @@ #include "omo_13.h" -#include "world/common/enemy/complete/ShyGuy_Wander.inc.c" -#include "world/common/enemy/complete/GrooveGuy.inc.c" +#include "world/common/enemy/ShyGuy_Wander.inc.c" +#include "world/common/enemy/GrooveGuy.inc.c" NpcSettings N(NpcSettings_AntiGuy) = { .height = 23, @@ -208,18 +208,14 @@ EvtScript N(EVS_NpcInit_AntiGuy) = { EVT_END }; -StaticNpc N(NpcData_AntiGuy) = { +NpcData N(NpcData_AntiGuy) = { .id = NPC_AntiGuy, - .settings = &N(NpcSettings_AntiGuy), .pos = { 110.0f, 0.0f, -20.0f }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | 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, - }, + .settings = &N(NpcSettings_AntiGuy), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000, + .drops = NO_DROPS, .animations = { .idle = ANIM_ShyGuy_Black_Anim01, .walk = ANIM_ShyGuy_Black_Anim02, @@ -241,13 +237,10 @@ StaticNpc N(NpcData_AntiGuy) = { .tattle = MSG_NpcTattle_AntiGuy, }; -StaticNpc N(NpcData_ShyGuy) = { +NpcData 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, @@ -260,17 +253,17 @@ StaticNpc N(NpcData_ShyGuy) = { .detectSize = { 200 }, } }, + .settings = &N(NpcSettings_ShyGuy_Wander), + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = SHY_GUY_DROPS, .animations = YELLOW_SHY_GUY_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, }; -StaticNpc N(NpcData_GrooveGuy) = { +NpcData 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, @@ -283,6 +276,9 @@ StaticNpc N(NpcData_GrooveGuy) = { .detectSize = { 200 }, } }, + .settings = &N(NpcSettings_GrooveGuy), + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = GROOVE_GUY_DROPS_B, .animations = GROOVE_GUY_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, }; 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 index cf3b9ab13e..1ab6fd4dcf 100644 --- a/src/world/area_omo/omo_14/omo_14_3_npc.c +++ b/src/world/area_omo/omo_14/omo_14_3_npc.c @@ -77,7 +77,7 @@ API_CALLABLE(N(IsPartnerWatt)) { return ApiStatus_DONE2; } -#include "world/common/enemy/complete/ShyGuy_Stationary.inc.c" +#include "world/common/enemy/ShyGuy_Stationary.inc.c" Vec2i N(CrowdChaseGoalPositions)[] = { { 200, 0 }, @@ -381,116 +381,116 @@ EvtScript N(EVS_NpcInit_ShyGuy_Crowd) = { EVT_END }; -StaticNpc N(NpcData_ShyGuy_Loner) = { +NpcData N(NpcData_ShyGuy_Loner) = { .id = NPC_ShyGuy_01, - .settings = &N(NpcSettings_ShyGuy_Stationary), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200, .init = &N(EVS_NpcInit_ShyGuy_Loner), - .drops = NPC_NO_DROPS, + .settings = &N(NpcSettings_ShyGuy_Stationary), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200, + .drops = NO_DROPS, .animations = RED_SHY_GUY_ANIMS, }; -StaticNpc N(NpcData_ShyGuy_Crowd)[] = { +NpcData N(NpcData_ShyGuy_Crowd)[] = { { .id = NPC_ShyGuy_02, - .settings = &N(NpcSettings_ShyGuy_Stationary), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_200, .init = &N(EVS_NpcInit_ShyGuy_Crowd), - .drops = NPC_NO_DROPS, + .settings = &N(NpcSettings_ShyGuy_Stationary), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_200, + .drops = 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_PASSIVE | ENEMY_FLAG_200, .init = &N(EVS_NpcInit_ShyGuy_Crowd), - .drops = NPC_NO_DROPS, + .settings = &N(NpcSettings_ShyGuy_Stationary), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_200, + .drops = 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_PASSIVE | ENEMY_FLAG_200, .init = &N(EVS_NpcInit_ShyGuy_Crowd), - .drops = NPC_NO_DROPS, + .settings = &N(NpcSettings_ShyGuy_Stationary), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_200, + .drops = 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_PASSIVE | ENEMY_FLAG_200, .init = &N(EVS_NpcInit_ShyGuy_Crowd), - .drops = NPC_NO_DROPS, + .settings = &N(NpcSettings_ShyGuy_Stationary), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_200, + .drops = 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_PASSIVE | ENEMY_FLAG_200, .init = &N(EVS_NpcInit_ShyGuy_Crowd), - .drops = NPC_NO_DROPS, + .settings = &N(NpcSettings_ShyGuy_Stationary), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_200, + .drops = 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_PASSIVE | ENEMY_FLAG_200, .init = &N(EVS_NpcInit_ShyGuy_Crowd), - .drops = NPC_NO_DROPS, + .settings = &N(NpcSettings_ShyGuy_Stationary), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_200, + .drops = 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_PASSIVE | ENEMY_FLAG_200, .init = &N(EVS_NpcInit_ShyGuy_Crowd), - .drops = NPC_NO_DROPS, + .settings = &N(NpcSettings_ShyGuy_Stationary), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_200, + .drops = 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_PASSIVE | ENEMY_FLAG_200, .init = &N(EVS_NpcInit_ShyGuy_Crowd), - .drops = NPC_NO_DROPS, + .settings = &N(NpcSettings_ShyGuy_Stationary), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_200, + .drops = 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_PASSIVE | ENEMY_FLAG_200, .init = &N(EVS_NpcInit_ShyGuy_Crowd), - .drops = NPC_NO_DROPS, + .settings = &N(NpcSettings_ShyGuy_Stationary), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_200, + .drops = 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_PASSIVE | ENEMY_FLAG_200, .init = &N(EVS_NpcInit_ShyGuy_Crowd), - .drops = NPC_NO_DROPS, + .settings = &N(NpcSettings_ShyGuy_Stationary), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_200, + .drops = NO_DROPS, .animations = RED_SHY_GUY_ANIMS, }, }; diff --git a/src/world/area_omo/omo_15/omo_15.h b/src/world/area_omo/omo_15/omo_15.h index b1d4ec89bb..d23b0ead29 100644 --- a/src/world/area_omo/omo_15/omo_15.h +++ b/src/world/area_omo/omo_15/omo_15.h @@ -24,6 +24,10 @@ enum { NPC_ShyGuy_09 = 9, }; +enum { + MV_Unk_01 = MapVar(1), +}; + #define NAMESPACE omo_15 extern EvtScript N(EVS_Main); 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 index a4b41a38b2..a1971828ea 100644 --- a/src/world/area_omo/omo_15/omo_15_2_main.c +++ b/src/world/area_omo/omo_15/omo_15_2_main.c @@ -1,5 +1,6 @@ #include "omo_15.h" +#define STAR_SPIRIT_DATA_VAR MV_Unk_01 #include "world/common/todo/StarSpiritEffectFunc.inc.c" EvtScript N(EVS_TrySpawningStarCard) = { 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 index 5d2807d6ab..8eba6d6312 100644 --- a/src/world/area_omo/omo_15/omo_15_3_npc.c +++ b/src/world/area_omo/omo_15/omo_15_3_npc.c @@ -1,6 +1,6 @@ #include "omo_15.h" -#include "world/common/enemy/complete/ShyGuy_Stationary.inc.c" +#include "world/common/enemy/ShyGuy_Stationary.inc.c" enum { MANAGER_IDLE_STATE = 0, @@ -438,15 +438,15 @@ EvtScript N(EVS_NpcInit_GeneralGuy) = { EVT_END }; -StaticNpc N(NpcData_GeneralGuy)[] = { +NpcData N(NpcData_GeneralGuy)[] = { { .id = NPC_GeneralGuy, - .settings = &N(NpcSettings_ShyGuy_Stationary), .pos = { 187.0f, 38.0f, 20.0f }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | 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, + .settings = &N(NpcSettings_ShyGuy_Stationary), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_GRAVITY | ENEMY_FLAG_40000, + .drops = NO_DROPS, .animations = { .idle = ANIM_GeneralGuy_Anim02, .walk = ANIM_GeneralGuy_Anim02, @@ -468,92 +468,92 @@ StaticNpc N(NpcData_GeneralGuy)[] = { }, { .id = NPC_ShyGuy_01, - .settings = &N(NpcSettings_ShyGuy_Stationary), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | 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, + .settings = &N(NpcSettings_ShyGuy_Stationary), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_GRAVITY | ENEMY_FLAG_40000, + .drops = 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_PASSIVE | 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, + .settings = &N(NpcSettings_ShyGuy_Stationary), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_GRAVITY | ENEMY_FLAG_40000, + .drops = 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_PASSIVE | 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, + .settings = &N(NpcSettings_ShyGuy_Stationary), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_GRAVITY | ENEMY_FLAG_40000, + .drops = 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_PASSIVE | 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, + .settings = &N(NpcSettings_ShyGuy_Stationary), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_GRAVITY | ENEMY_FLAG_40000, + .drops = 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_PASSIVE | 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, + .settings = &N(NpcSettings_ShyGuy_Stationary), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_GRAVITY | ENEMY_FLAG_40000, + .drops = 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_PASSIVE | 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, + .settings = &N(NpcSettings_ShyGuy_Stationary), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_GRAVITY | ENEMY_FLAG_40000, + .drops = 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_PASSIVE | 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, + .settings = &N(NpcSettings_ShyGuy_Stationary), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_GRAVITY | ENEMY_FLAG_40000, + .drops = 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_PASSIVE | 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, + .settings = &N(NpcSettings_ShyGuy_Stationary), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_GRAVITY | ENEMY_FLAG_40000, + .drops = 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_PASSIVE | 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, + .settings = &N(NpcSettings_ShyGuy_Stationary), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_GRAVITY | ENEMY_FLAG_40000, + .drops = NO_DROPS, .animations = RED_SHY_GUY_ANIMS, }, }; 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 index f14df00de1..0635fd3ca4 100644 --- a/src/world/area_omo/omo_16/omo_16_3_npc.c +++ b/src/world/area_omo/omo_16/omo_16_3_npc.c @@ -2,13 +2,13 @@ #include "world/common/npc/TrainToad.inc.c" -StaticNpc N(NpcData_TrainToad) = { +NpcData N(NpcData_TrainToad) = { .id = NPC_Conductor, - .settings = &N(NpcSettings_TrainToad), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 90, + .settings = &N(NpcSettings_TrainToad), .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_400000, - .drops = NPC_NO_DROPS, + .drops = NO_DROPS, .animations = TRAIN_CONDUCTOR_ANIMS, }; 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 35ddbb49d5..fbc7733f9b 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 @@ -1,10 +1,10 @@ #include "omo_17.h" -#include "world/common/enemy/complete/ShyGuy_Wander.inc.c" -#include "world/common/enemy/complete/PyroGuy.inc.c" -#include "world/common/enemy/complete/GrooveGuy.inc.c" -#include "world/common/enemy/complete/SkyGuy.inc.c" -#include "world/common/enemy/complete/SpyGuy.inc.c" +#include "world/common/enemy/ShyGuy_Wander.inc.c" +#include "world/common/enemy/PyroGuy.inc.c" +#include "world/common/enemy/GrooveGuy.inc.c" +#include "world/common/enemy/SkyGuy.inc.c" +#include "world/common/enemy/SpyGuy.inc.c" EvtScript N(EVS_NpcAuxAI_Conductor) = { EVT_RETURN @@ -31,24 +31,21 @@ NpcSettings N(NpcSettings_Conductor) = { .flags = ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, }; -StaticNpc N(NpcData_Conductor) = { +NpcData N(NpcData_Conductor) = { .id = NPC_Conductor, - .settings = &N(NpcSettings_Conductor), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAG_PASSIVE, .initVarCount = 1, .initVar = { .value = 0 }, + .settings = &N(NpcSettings_Conductor), + .flags = ENEMY_FLAG_PASSIVE, }; -StaticNpc N(NpcData_SpyGuy)[] = { +NpcData N(NpcData_SpyGuy)[] = { { .id = NPC_SpyGuy, - .settings = &N(NpcSettings_SpyGuy), .pos = { -305.0f, 0.0f, 135.0f }, .yaw = 270, - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, - .drops = SPY_GUY_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -61,6 +58,9 @@ StaticNpc N(NpcData_SpyGuy)[] = { .detectSize = { 250 }, } }, + .settings = &N(NpcSettings_SpyGuy), + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = SPY_GUY_DROPS, .animations = SPY_GUY_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, }, @@ -69,13 +69,10 @@ StaticNpc N(NpcData_SpyGuy)[] = { SPY_GUY_ROCK_HITBOX(NPC_SpyGuy_Rock3), }; -StaticNpc N(NpcData_PyroGuy) = { +NpcData N(NpcData_PyroGuy) = { .id = NPC_PyroGuy, - .settings = &N(NpcSettings_PyroGuy), .pos = { 354.0f, 10.0f, -113.0f }, .yaw = 270, - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, - .drops = PYRO_GUY_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -88,17 +85,17 @@ StaticNpc N(NpcData_PyroGuy) = { .detectSize = { 250 }, } }, + .settings = &N(NpcSettings_PyroGuy), + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = PYRO_GUY_DROPS, .animations = PYRO_GUY_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, }; -StaticNpc N(NpcData_GrooveGuy) = { +NpcData N(NpcData_GrooveGuy) = { .id = NPC_GrooveGuy, - .settings = &N(NpcSettings_GrooveGuy), .pos = { -150.0f, 10.0f, -125.0f }, .yaw = 90, - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, - .drops = GROOVE_GUY_DROPS_B, .territory = { .wander = { .isFlying = TRUE, @@ -111,6 +108,9 @@ StaticNpc N(NpcData_GrooveGuy) = { .detectSize = { 200 }, } }, + .settings = &N(NpcSettings_GrooveGuy), + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = GROOVE_GUY_DROPS_B, .animations = GROOVE_GUY_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, }; diff --git a/src/world/area_osr/osr_00/osr_00_2_main.c b/src/world/area_osr/osr_00/osr_00_2_main.c index 7c884658a9..1f54daf6dc 100644 --- a/src/world/area_osr/osr_00/osr_00_2_main.c +++ b/src/world/area_osr/osr_00/osr_00_2_main.c @@ -2,7 +2,6 @@ #include "effects.h" #include "world/common/atomic/TexturePan.inc.c" -#include "world/common/atomic/TexturePan.data.inc.c" API_CALLABLE(N(CreateSunshine)) { fx_sun(FX_SUN_FROM_RIGHT, 0.0f, 0.0f, 0.0f, 0.0f, 0); diff --git a/src/world/area_osr/osr_00/osr_00_3_npc_intro.c b/src/world/area_osr/osr_00/osr_00_3_npc_intro.c index d18dff90ab..4f5ad3a6d0 100644 --- a/src/world/area_osr/osr_00/osr_00_3_npc_intro.c +++ b/src/world/area_osr/osr_00/osr_00_3_npc_intro.c @@ -2,13 +2,13 @@ #include "world/common/npc/Luigi.inc.c" -StaticNpc N(NpcData_Luigi) = { +NpcData N(NpcData_Luigi) = { .id = NPC_Luigi, - .settings = &N(NpcSettings_Luigi), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 90, + .settings = &N(NpcSettings_Luigi), .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, - .drops = LUIGI_DROPS, + .drops = NO_DROPS, .animations = LUIGI_ANIMS, }; diff --git a/src/world/area_osr/osr_00/osr_00_4_npc_epilogue.c b/src/world/area_osr/osr_00/osr_00_4_npc_epilogue.c index 0a0a161dd0..392d72fc77 100644 --- a/src/world/area_osr/osr_00/osr_00_4_npc_epilogue.c +++ b/src/world/area_osr/osr_00/osr_00_4_npc_epilogue.c @@ -195,253 +195,253 @@ EvtScript N(EVS_NpcInit_ToadGuard_02) = { EVT_END }; -s32 N(ExtraAnims_YoshiLeader)[] = { +AnimID N(ExtraAnims_YoshiLeader)[] = { ANIM_VillageLeader_Still, ANIM_VillageLeader_Idle, ANIM_VillageLeader_Talk, - -1 + ANIM_LIST_END }; -s32 N(ExtraAnims_Yoshi)[] = { +AnimID N(ExtraAnims_Yoshi)[] = { ANIM_Yoshi_Green_Still, ANIM_Yoshi_Green_Idle, ANIM_Yoshi_Green_Talk, - -1 + ANIM_LIST_END }; -s32 N(ExtraAnims_YoshiKid)[] = { +AnimID N(ExtraAnims_YoshiKid)[] = { ANIM_YoshiKid_Green_Still, ANIM_YoshiKid_Green_Idle, ANIM_YoshiKid_Green_Talk, - -1 + ANIM_LIST_END }; -StaticNpc N(NpcData_Yoshis)[] = { +NpcData N(NpcData_Yoshis)[] = { { .id = NPC_YoshiLeader, - .settings = &N(NpcSettings_Yoshi), .pos = { 70.0f, 0.0f, -30.0f }, .yaw = 270, - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_LeaderYoshi), - .drops = YOSHI_DROPS, + .settings = &N(NpcSettings_Yoshi), + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, + .drops = NO_DROPS, .animations = YOSHI_LEADER_ANIMS, .extraAnimations = N(ExtraAnims_YoshiLeader), .tattle = MSG_NpcTattle_VillageLeader, }, { .id = NPC_Yoshi, - .settings = &N(NpcSettings_Yoshi), .pos = { 70.0f, 0.0f, 400.0f }, .yaw = 270, - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_Yoshi), - .drops = YOSHI_DROPS, + .settings = &N(NpcSettings_Yoshi), + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, + .drops = NO_DROPS, .animations = YOSHI_GREEN_ANIMS, .extraAnimations = N(ExtraAnims_Yoshi), .tattle = MSG_NpcTattle_GenericYoshi, }, { .id = NPC_YoshiKid, - .settings = &N(NpcSettings_YoshiKid), .pos = { 160.0f, 0.0f, 540.0f }, .yaw = 270, - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_YoshiKid), - .drops = NPC_NO_DROPS, + .settings = &N(NpcSettings_YoshiKid), + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, + .drops = NO_DROPS, .animations = YOSHI_KID_GREEN_ANIMS, .extraAnimations = N(ExtraAnims_YoshiKid), .tattle = MSG_NpcTattle_GreenYoshiKid, }, }; -s32 N(ExtraAnims_MayorPenguin)[] = { +AnimID N(ExtraAnims_MayorPenguin)[] = { ANIM_MayorPenguin_Still, ANIM_MayorPenguin_Idle, ANIM_MayorPenguin_Talk, - -1 + ANIM_LIST_END }; -s32 N(ExtraAnims_MayorPenguinWife)[] = { +AnimID N(ExtraAnims_MayorPenguinWife)[] = { ANIM_MayorPenguinWife_Still, ANIM_MayorPenguinWife_Idle, ANIM_MayorPenguinWife_Laugh, - -1 + ANIM_LIST_END }; -s32 N(ExtraAnims_Penguin)[] = { +AnimID N(ExtraAnims_Penguin)[] = { ANIM_Penguin_Still, ANIM_Penguin_Idle, ANIM_Penguin_Talk, - -1 + ANIM_LIST_END }; -StaticNpc N(NpcData_Penguins)[] = { +NpcData N(NpcData_Penguins)[] = { { .id = NPC_MayorPenguin, - .settings = &N(NpcSettings_Penguin), .pos = { 150.0f, 0.0f, 105.0f }, .yaw = 270, - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_MayorPenguin), - .drops = PENGUIN_DROPS, + .settings = &N(NpcSettings_Penguin), + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, + .drops = NO_DROPS, .animations = MAYOR_PENGUIN_ANIMS, .extraAnimations = N(ExtraAnims_MayorPenguin), .tattle = MSG_NpcTattle_MayorPenguin, }, { .id = NPC_MayorPenguinWife, - .settings = &N(NpcSettings_Penguin), .pos = { 200.0f, 0.0f, 105.0f }, .yaw = 270, - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_MayorPenguinWife), - .drops = PENGUIN_DROPS, + .settings = &N(NpcSettings_Penguin), + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, + .drops = NO_DROPS, .animations = MAYOR_PENGUIN_WIFE_ANIMS, .extraAnimations = N(ExtraAnims_MayorPenguinWife), .tattle = MSG_NpcTattle_MayorPenguinWife, }, { .id = NPC_Penguin_01, - .settings = &N(NpcSettings_Penguin), .pos = { 115.0f, 0.0f, 540.0f }, .yaw = 90, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_Penguin_01), - .drops = PENGUIN_DROPS, + .settings = &N(NpcSettings_Penguin), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = NO_DROPS, .animations = PENGUIN_ANIMS, .extraAnimations = N(ExtraAnims_Penguin), }, { .id = NPC_Penguin_02, - .settings = &N(NpcSettings_Penguin), .pos = { 208.0f, 0.0f, 540.0f }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_Penguin_02), - .drops = PENGUIN_DROPS, + .settings = &N(NpcSettings_Penguin), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = NO_DROPS, .animations = PENGUIN_ANIMS, .extraAnimations = N(ExtraAnims_Penguin), }, }; -s32 N(ExtraAnims_Moustafa)[] = { +AnimID N(ExtraAnims_Moustafa)[] = { ANIM_Moustafa_Still, ANIM_Moustafa_Idle, ANIM_Moustafa_Shout, - -1 + ANIM_LIST_END }; -s32 N(ExtraAnims_Mouser)[] = { +AnimID N(ExtraAnims_Mouser)[] = { ANIM_Mouser_Blue_Still, ANIM_Mouser_Blue_Idle, ANIM_Mouser_Blue_Talk, - -1 + ANIM_LIST_END }; -StaticNpc N(NpcData_Mousers)[] = { +NpcData N(NpcData_Mousers)[] = { { .id = NPC_Moustafa, - .settings = &N(NpcSettings_Mouser), .pos = { -60.0f, 0.0f, -20.0f }, .yaw = 90, - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_Moustafa), - .drops = MOUSER_DROPS, + .settings = &N(NpcSettings_Mouser), + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, + .drops = NO_DROPS, .animations = MOUSTAFA_ANIMS, .extraAnimations = N(ExtraAnims_Moustafa), .tattle = MSG_NpcTattle_Moustafa, }, { .id = NPC_Mouser, - .settings = &N(NpcSettings_Mouser), .pos = { -100.0f, 0.0f, -50.0f }, .yaw = 90, - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_Mouser), - .drops = MOUSER_DROPS, + .settings = &N(NpcSettings_Mouser), + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, + .drops = NO_DROPS, .animations = MOUSER_PURPLE_ANIMS, .extraAnimations = N(ExtraAnims_Mouser), }, }; -s32 N(ExtraAnims_Boos)[] = { +AnimID N(ExtraAnims_Boos)[] = { ANIM_Boo_Still, ANIM_Boo_Idle, ANIM_Boo_Talk, - -1 + ANIM_LIST_END }; -StaticNpc N(NpcData_Boos)[] = { +NpcData N(NpcData_Boos)[] = { { .id = NPC_Boo_01, - .settings = &N(NpcSettings_Boo), .pos = { 270.0f, 20.0f, 175.0f }, .yaw = 270, - .flags = COMMON_PASSIVE_FLAGS, .init = &N(EVS_NpcInit_Boo_01), - .drops = BOO_DROPS, + .settings = &N(NpcSettings_Boo), + .flags = COMMON_PASSIVE_FLAGS, + .drops = NO_DROPS, .animations = NORMAL_BOO_ANIMS, .extraAnimations = N(ExtraAnims_Boos), }, { .id = NPC_Boo_02, - .settings = &N(NpcSettings_Boo), .pos = { 320.0f, 20.0f, 200.0f }, .yaw = 270, - .flags = COMMON_PASSIVE_FLAGS, .init = &N(EVS_NpcInit_Boo_02), - .drops = BOO_DROPS, + .settings = &N(NpcSettings_Boo), + .flags = COMMON_PASSIVE_FLAGS, + .drops = NO_DROPS, .animations = GUSTY_BOO_ANIMS, .extraAnimations = N(ExtraAnims_Boos), }, }; -s32 N(ExtraAnims_Toad)[] = { +AnimID N(ExtraAnims_Toad)[] = { ANIM_Toad_Red_Still, ANIM_Toad_Red_Idle, ANIM_Toad_Red_Talk, - -1 + ANIM_LIST_END }; -s32 N(ExtraAnims_ToadGuard)[] = { +AnimID N(ExtraAnims_ToadGuard)[] = { ANIM_ToadGuard_Red_Still, ANIM_ToadGuard_Red_Idle, ANIM_ToadGuard_Red_Talk, - -1 + ANIM_LIST_END }; -StaticNpc N(NpcData_Toads)[] = { +NpcData N(NpcData_Toads)[] = { { .id = NPC_Toad, - .settings = &N(NpcSettings_Toad_Stationary), .pos = { -25.0f, 0.0f, 200.0f }, .yaw = 90, - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_Toad), - .drops = TOAD_DROPS, + .settings = &N(NpcSettings_Toad_Stationary), + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, + .drops = NO_DROPS, .animations = TOAD_BLUE_ANIMS, .extraAnimations = N(ExtraAnims_Toad), }, { .id = NPC_ToadGuard_01, - .settings = &N(NpcSettings_Toad_Stationary), .pos = { -50.0f, 0.0f, -200.0f }, .yaw = 90, - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_ToadGuard_01), - .drops = TOAD_DROPS, + .settings = &N(NpcSettings_Toad_Stationary), + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, + .drops = NO_DROPS, .animations = TOAD_GUARD_RED_ANIMS, .extraAnimations = N(ExtraAnims_ToadGuard), }, { .id = NPC_ToadGuard_02, - .settings = &N(NpcSettings_Toad_Stationary), .pos = { 560.0f, 20.0f, 100.0f }, .yaw = 270, - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_ToadGuard_02), - .drops = TOAD_DROPS, + .settings = &N(NpcSettings_Toad_Stationary), + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, + .drops = NO_DROPS, .animations = TOAD_GUARD_YELLOW_ANIMS, .extraAnimations = N(ExtraAnims_ToadGuard), }, diff --git a/src/world/area_osr/osr_01/osr_01_2_main.c b/src/world/area_osr/osr_01/osr_01_2_main.c index 0c639a0404..3c19e7b98a 100644 --- a/src/world/area_osr/osr_01/osr_01_2_main.c +++ b/src/world/area_osr/osr_01/osr_01_2_main.c @@ -2,7 +2,6 @@ #include "osr_01.h" #include "world/common/atomic/TexturePan.inc.c" -#include "world/common/atomic/TexturePan.data.inc.c" EvtScript N(EVS_ExitWalk_mac_01_2) = EVT_EXIT_WALK(60, osr_01_ENTRY_0, "mac_01", mac_01_ENTRY_2); EvtScript N(EVS_ExitWalk_hos_00_0) = EVT_EXIT_WALK(60, osr_01_ENTRY_1, "hos_00", hos_00_ENTRY_0); diff --git a/src/world/area_osr/osr_01/osr_01_3_npc.c b/src/world/area_osr/osr_01/osr_01_3_npc.c index 93a065180d..4a4f419475 100644 --- a/src/world/area_osr/osr_01/osr_01_3_npc.c +++ b/src/world/area_osr/osr_01/osr_01_3_npc.c @@ -99,14 +99,14 @@ EvtScript N(EVS_NpcInit_Toad) = { EVT_END }; -StaticNpc N(NpcData_Toad) = { +NpcData N(NpcData_Toad) = { .id = NPC_Toad, - .settings = &N(NpcSettings_Toad_Stationary), .pos = { 25.0f, 0.0f, 130.0f }, .yaw = 270, - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_10000 | ENEMY_FLAG_100000, .init = &N(EVS_NpcInit_Toad), - .drops = TOAD_DROPS, + .settings = &N(NpcSettings_Toad_Stationary), + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_10000 | ENEMY_FLAG_100000, + .drops = NO_DROPS, .animations = TOAD_RED_ANIMS, .tattle = MSG_NpcTattle_OSR_LovesToClean, }; 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 59d71b3053..689c5476b4 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 @@ -1,26 +1,10 @@ #include "osr_02.h" #include "effects.h" -NpcSettings N(NpcSettings_Peach) = { - .height = 46, - .radius = 36, - .level = 99, -}; - +#include "world/common/npc/Peach.inc.c" #include "world/common/npc/Twink.inc.c" #include "world/common/npc/StarSpirit.inc.c" - -EvtScript N(EVS_NpcAuxAI_StarRod) = { - EVT_RETURN - EVT_END -}; - -NpcSettings N(NpcSettings_StarRod) = { - .height = 24, - .radius = 24, - .level = 99, - .otherAI = &N(EVS_NpcAuxAI_StarRod), -}; +#include "world/common/npc/StarRod.inc.c" Vec3f N(FlightPath_TwinkStepForward)[] = { { -10.0, 40.0, 10.0 }, @@ -481,7 +465,7 @@ EvtScript N(EVS_NpcInit_StarRod) = { EVT_END }; -s32 N(ExtraAnims_Peach)[] = { +AnimID N(ExtraAnims_Peach)[] = { ANIM_Peach_A0001, ANIM_Peach_A0002, ANIM_Peach_C0000, @@ -490,202 +474,168 @@ s32 N(ExtraAnims_Peach)[] = { ANIM_Peach_C0006, ANIM_Peach_C001E, ANIM_Peach_C0026, - -1 + ANIM_LIST_END }; -s32 N(ExtraAnims_Twink)[] = { +AnimID N(ExtraAnims_Twink)[] = { ANIM_Twink_Idle, ANIM_Twink_Talk, ANIM_Twink_Disappointed, - -1 + ANIM_LIST_END }; -s32 N(ExtraAnims_Eldstar)[] = { +AnimID N(ExtraAnims_Eldstar)[] = { ANIM_WorldEldstar_Idle, ANIM_WorldEldstar_Wave, ANIM_WorldEldstar_Leap, - -1 + ANIM_LIST_END }; -s32 N(ExtraAnims_Mamar)[] = { +AnimID N(ExtraAnims_Mamar)[] = { ANIM_WorldMamar_Idle, ANIM_WorldMamar_TalkHappy, - -1 + ANIM_LIST_END }; -s32 N(ExtraAnims_Skolar)[] = { +AnimID N(ExtraAnims_Skolar)[] = { ANIM_WorldSkolar_Idle, ANIM_WorldSkolar_TalkAngry, - -1 + ANIM_LIST_END }; -s32 N(ExtraAnims_Muskular)[] = { +AnimID N(ExtraAnims_Muskular)[] = { ANIM_WorldMuskular_Idle, ANIM_WorldMuskular_Talk, - -1 + ANIM_LIST_END }; -s32 N(ExtraAnims_Misstar)[] = { +AnimID N(ExtraAnims_Misstar)[] = { ANIM_WorldMisstar_Idle, ANIM_WorldMisstar_Talk, - -1 + ANIM_LIST_END }; -s32 N(ExtraAnims_Klevar)[] = { +AnimID N(ExtraAnims_Klevar)[] = { ANIM_WorldKlevar_Idle, ANIM_WorldKlevar_Talk, - -1 + ANIM_LIST_END }; -s32 N(ExtraAnims_Kalmar)[] = { +AnimID N(ExtraAnims_Kalmar)[] = { ANIM_WorldKalmar_Idle, ANIM_WorldKalmar_Talk, - -1 + ANIM_LIST_END }; -StaticNpc N(NpcData_Spirits)[] = { +NpcData N(NpcData_Spirits)[] = { { .id = NPC_Peach, - .settings = &N(NpcSettings_Peach), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_20000, .init = &N(EVS_NpcInit_Peach), - .drops = NPC_NO_DROPS, - .animations = { - .idle = ANIM_Peach_A0000, - .walk = ANIM_Peach_A0000, - .run = ANIM_Peach_A0000, - .chase = ANIM_Peach_A0000, - .anim_4 = ANIM_Peach_A0000, - .anim_5 = ANIM_Peach_A0000, - .death = ANIM_Peach_A0000, - .hit = ANIM_Peach_A0000, - .anim_8 = ANIM_Peach_A0000, - .anim_9 = ANIM_Peach_A0000, - .anim_A = ANIM_Peach_A0000, - .anim_B = ANIM_Peach_A0000, - .anim_C = ANIM_Peach_A0000, - .anim_D = ANIM_Peach_A0000, - .anim_E = ANIM_Peach_A0000, - .anim_F = ANIM_Peach_A0000, - }, + .settings = &N(NpcSettings_Peach), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_20000, + .drops = NO_DROPS, + .animations = PEACH_ANIMS, .extraAnimations = N(ExtraAnims_Peach), }, { .id = NPC_Twink, - .settings = &N(NpcSettings_Twink), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_Twink), - .drops = NPC_NO_DROPS, + .settings = &N(NpcSettings_Twink), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = NO_DROPS, .animations = TWINK_ANIMS, .extraAnimations = N(ExtraAnims_Twink), }, { .id = NPC_Eldstar, - .settings = &N(NpcSettings_StarSpirit), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_Eldstar), - .drops = NPC_NO_DROPS, + .settings = &N(NpcSettings_StarSpirit), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = NO_DROPS, .animations = ELDSTAR_ANIMS, .extraAnimations = N(ExtraAnims_Eldstar), }, { .id = NPC_Mamar, - .settings = &N(NpcSettings_StarSpirit), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_Mamar), - .drops = NPC_NO_DROPS, + .settings = &N(NpcSettings_StarSpirit), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = NO_DROPS, .animations = MAMAR_ANIMS, .extraAnimations = N(ExtraAnims_Mamar), }, { .id = NPC_Skolar, - .settings = &N(NpcSettings_StarSpirit), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 90, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_Skolar), - .drops = NPC_NO_DROPS, + .settings = &N(NpcSettings_StarSpirit), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = NO_DROPS, .animations = SKOLAR_ANIMS, .extraAnimations = N(ExtraAnims_Skolar), }, { .id = NPC_Muskular, - .settings = &N(NpcSettings_StarSpirit), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_Muskular), - .drops = NPC_NO_DROPS, + .settings = &N(NpcSettings_StarSpirit), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = NO_DROPS, .animations = MUSKULAR_ANIMS, .extraAnimations = N(ExtraAnims_Muskular), }, { .id = NPC_Misstar, - .settings = &N(NpcSettings_StarSpirit), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 90, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_Misstar), - .drops = NPC_NO_DROPS, + .settings = &N(NpcSettings_StarSpirit), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = NO_DROPS, .animations = MISSTAR_ANIMS, .extraAnimations = N(ExtraAnims_Misstar), }, { .id = NPC_Klevar, - .settings = &N(NpcSettings_StarSpirit), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_Klevar), - .drops = NPC_NO_DROPS, + .settings = &N(NpcSettings_StarSpirit), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = NO_DROPS, .animations = KLEVAR_ANIMS, .extraAnimations = N(ExtraAnims_Klevar), }, { .id = NPC_Kalmar, - .settings = &N(NpcSettings_StarSpirit), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 90, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_Kalmar), - .drops = NPC_NO_DROPS, + .settings = &N(NpcSettings_StarSpirit), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = NO_DROPS, .animations = KALMAR_ANIMS, .extraAnimations = N(ExtraAnims_Kalmar), }, { .id = NPC_StarRod, - .settings = &N(NpcSettings_StarRod), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_StarRod), - .drops = NPC_NO_DROPS, - .animations = { - .idle = ANIM_StarRod_Still, - .walk = ANIM_StarRod_Still, - .run = ANIM_StarRod_Still, - .chase = ANIM_StarRod_Still, - .anim_4 = ANIM_StarRod_Still, - .anim_5 = ANIM_StarRod_Still, - .death = ANIM_StarRod_Still, - .hit = ANIM_StarRod_Still, - .anim_8 = ANIM_StarRod_Still, - .anim_9 = ANIM_StarRod_Still, - .anim_A = ANIM_StarRod_Still, - .anim_B = ANIM_StarRod_Still, - .anim_C = ANIM_StarRod_Still, - .anim_D = ANIM_StarRod_Still, - .anim_E = ANIM_StarRod_Still, - .anim_F = ANIM_StarRod_Still, - }, + .settings = &N(NpcSettings_StarRod), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = NO_DROPS, + .animations = STAR_ROD_ANIMS, }, }; diff --git a/src/world/area_osr/osr_02/osr_02_4_npc_peach.c b/src/world/area_osr/osr_02/osr_02_4_npc_peach.c index cd71ef86bc..569b56fca6 100644 --- a/src/world/area_osr/osr_02/osr_02_4_npc_peach.c +++ b/src/world/area_osr/osr_02/osr_02_4_npc_peach.c @@ -2,9 +2,9 @@ #include "world/common/todo/GetPeachDisguise.inc.c" -#include "world/common/enemy/complete/Clubba.inc.c" +#include "world/common/enemy/Clubba.inc.c" -s32 N(ExtraAnims_Clubba)[] = { +AnimID N(ExtraAnims_Clubba)[] = { ANIM_WorldClubba_Anim00, ANIM_WorldClubba_Anim02, ANIM_WorldClubba_Anim03, @@ -14,7 +14,7 @@ s32 N(ExtraAnims_Clubba)[] = { ANIM_WorldClubba_Anim07, ANIM_WorldClubba_Anim13, ANIM_WorldClubba_Anim14, - -1 + ANIM_LIST_END }; EvtScript N(EVS_NpcInteract_Clubba) = { @@ -73,14 +73,14 @@ EvtScript N(EVS_NpcInit_Clubba) = { EVT_END }; -StaticNpc N(NpcData_Clubba) = { +NpcData N(NpcData_Clubba) = { .id = NPC_Clubba, - .settings = &N(NpcSettings_Clubba), .pos = { -70.0f, 0.0f, -100.0f }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_Clubba), - .drops = NPC_NO_DROPS, + .settings = &N(NpcSettings_Clubba), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_400000, + .drops = NO_DROPS, .animations = CLUBBA_ANIMS, .extraAnimations = N(ExtraAnims_Clubba), }; diff --git a/src/world/area_osr/osr_03/osr_03_2_npc.c b/src/world/area_osr/osr_03/osr_03_2_npc.c index 3f5d2be46e..176d09d1cb 100644 --- a/src/world/area_osr/osr_03/osr_03_2_npc.c +++ b/src/world/area_osr/osr_03/osr_03_2_npc.c @@ -1,16 +1,8 @@ #include "osr_03.h" -#include "world/common/enemy/complete/Kammy.h" +#include "world/common/enemy/Kammy.inc.c" -NpcSettings N(NpcSettings_Kammy) = { - .height = 40, - .radius = 30, - .level = 26, - .onHit = &EnemyNpcHit, - .onDefeat = &EnemyNpcDefeat, -}; - -s32 N(ExtraAnims_Kammy)[] = { +AnimID N(ExtraAnims_Kammy)[] = { ANIM_WorldKammy_Anim09, ANIM_WorldKammy_Anim0A, ANIM_WorldKammy_Anim0B, @@ -26,16 +18,16 @@ s32 N(ExtraAnims_Kammy)[] = { ANIM_WorldKammy_Anim15, ANIM_WorldKammy_Anim16, ANIM_WorldKammy_Anim1A, - -1 + ANIM_LIST_END }; -StaticNpc N(NpcData_Kammy) = { +NpcData N(NpcData_Kammy) = { .id = NPC_Kammy, - .settings = &N(NpcSettings_Kammy), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 90, + .settings = &N(NpcSettings_Kammy), .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, - .drops = NPC_NO_DROPS, + .drops = NO_DROPS, .animations = KAMMY_ANIMS, .extraAnimations = N(ExtraAnims_Kammy), }; diff --git a/src/world/area_pra/pra_01/pra_01_3_npc.c b/src/world/area_pra/pra_01/pra_01_3_npc.c index 90f74b29fe..cd90bbbffe 100644 --- a/src/world/area_pra/pra_01/pra_01_3_npc.c +++ b/src/world/area_pra/pra_01/pra_01_3_npc.c @@ -177,14 +177,14 @@ EvtScript N(EVS_NpcInit_Kalmar) = { EVT_END }; -StaticNpc N(NpcData_Kalmar) = { +NpcData N(NpcData_Kalmar) = { .id = NPC_Kalmar, - .settings = &N(NpcSettings_StarSpirit), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 90, - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_200000 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_Kalmar), - .drops = NPC_NO_DROPS, + .settings = &N(NpcSettings_StarSpirit), + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_200000 | ENEMY_FLAG_400000, + .drops = NO_DROPS, .animations = KALMAR_ANIMS, }; diff --git a/src/world/area_pra/pra_04/pra_04_4_npc.c b/src/world/area_pra/pra_04/pra_04_4_npc.c index 39561bbf68..90c40dad30 100644 --- a/src/world/area_pra/pra_04/pra_04_4_npc.c +++ b/src/world/area_pra/pra_04/pra_04_4_npc.c @@ -1,14 +1,11 @@ #include "pra_04.h" -#include "world/common/enemy/complete/Swooper.inc.c" +#include "world/common/enemy/Swooper.inc.c" -StaticNpc N(NpcData_Swoopula) = { +NpcData N(NpcData_Swoopula) = { .id = NPC_Swoopula, - .settings = &N(NpcSettings_Swoopula), .pos = { 50.0f, 130.0f, 75.0f }, .yaw = 90, - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_200000, - .drops = SWOOPULA_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -21,6 +18,9 @@ StaticNpc N(NpcData_Swoopula) = { .detectSize = { 200 }, } }, + .settings = &N(NpcSettings_Swoopula), + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_200000, + .drops = SWOOPULA_DROPS, .animations = SWOOPULA_ANIMS, }; diff --git a/src/world/area_pra/pra_09/pra_09_3_npc.c b/src/world/area_pra/pra_09/pra_09_3_npc.c index 0ae5a83e52..836e05a2c5 100644 --- a/src/world/area_pra/pra_09/pra_09_3_npc.c +++ b/src/world/area_pra/pra_09/pra_09_3_npc.c @@ -1,7 +1,7 @@ #include "pra_09.h" #include "effects.h" -#include "world/common/enemy/complete/Duplighost.h" +#include "world/common/enemy/Duplighost.h" NpcSettings N(NpcSettings_Duplighost) = { .height = 30, @@ -9,7 +9,7 @@ NpcSettings N(NpcSettings_Duplighost) = { .level = 99, }; -#include "world/common/enemy/complete/Bombette.inc.c" +#include "world/common/enemy/Bombette.inc.c" #include "world/common/complete/KeyItemChoice.inc.c" MAP_STATIC_PAD(1,key_item); @@ -756,108 +756,108 @@ EvtScript N(EVS_NpcInit_Duplighost_04) = { EVT_END }; -StaticNpc N(NpcData_InteractableBombettes)[] = { +NpcData N(NpcData_InteractableBombettes)[] = { { .id = NPC_Bombette_01, - .settings = &N(NpcSettings_Bombette), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 90, - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, .init = &N(EVS_NpcInit_Bombette_01), - .drops = NPC_NO_DROPS, + .settings = &N(NpcSettings_Bombette), + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, + .drops = NO_DROPS, .animations = BOMBETTE_ANIMS, }, { .id = NPC_Bombette_02, - .settings = &N(NpcSettings_Bombette), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 90, - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, .init = &N(EVS_NpcInit_Bombette_02), - .drops = NPC_NO_DROPS, + .settings = &N(NpcSettings_Bombette), + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, + .drops = NO_DROPS, .animations = BOMBETTE_ANIMS, }, { .id = NPC_Bombette_03, - .settings = &N(NpcSettings_Bombette), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 90, - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, .init = &N(EVS_NpcInit_Bombette_03), - .drops = NPC_NO_DROPS, + .settings = &N(NpcSettings_Bombette), + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, + .drops = NO_DROPS, .animations = BOMBETTE_ANIMS, }, { .id = NPC_Bombette_04, - .settings = &N(NpcSettings_Bombette), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 90, - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, .init = &N(EVS_NpcInit_Bombette_04), - .drops = NPC_NO_DROPS, + .settings = &N(NpcSettings_Bombette), + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, + .drops = NO_DROPS, .animations = BOMBETTE_ANIMS, }, { .id = NPC_Bombette_05, - .settings = &N(NpcSettings_Bombette), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 90, - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, .init = &N(EVS_NpcInit_Bombette_05), - .drops = NPC_NO_DROPS, + .settings = &N(NpcSettings_Bombette), + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, + .drops = NO_DROPS, .animations = BOMBETTE_ANIMS, }, }; -StaticNpc N(NpcData_Duplighosts)[] = { +NpcData N(NpcData_Duplighosts)[] = { { .id = NPC_Duplighost_01, - .settings = &N(NpcSettings_Duplighost), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 90, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS, .init = &N(EVS_NpcInit_Duplighost_01), - .drops = NPC_NO_DROPS, + .settings = &N(NpcSettings_Duplighost), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS, + .drops = NO_DROPS, .animations = DUPLIGHOST_ANIMS, }, { .id = NPC_Duplighost_02, - .settings = &N(NpcSettings_Duplighost), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 90, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS, .init = &N(EVS_NpcInit_Duplighost_02), - .drops = NPC_NO_DROPS, + .settings = &N(NpcSettings_Duplighost), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS, + .drops = NO_DROPS, .animations = DUPLIGHOST_ANIMS, }, { .id = NPC_Duplighost_03, - .settings = &N(NpcSettings_Duplighost), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 90, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS, .init = &N(EVS_NpcInit_Duplighost_03), - .drops = NPC_NO_DROPS, + .settings = &N(NpcSettings_Duplighost), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS, + .drops = NO_DROPS, .animations = DUPLIGHOST_ANIMS, }, { .id = NPC_Duplighost_04, - .settings = &N(NpcSettings_Duplighost), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 90, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS, .init = &N(EVS_NpcInit_Duplighost_04), - .drops = NPC_NO_DROPS, + .settings = &N(NpcSettings_Duplighost), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS, + .drops = NO_DROPS, .animations = DUPLIGHOST_ANIMS, }, { .id = NPC_Duplighost_05, - .settings = &N(NpcSettings_Duplighost), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 90, - .flags = ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_4000 | ENEMY_FLAG_40000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS, .init = &N(EVS_NpcInit_Duplighost_05), - .drops = NPC_NO_DROPS, + .settings = &N(NpcSettings_Duplighost), + .flags = ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_4000 | ENEMY_FLAG_40000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS, + .drops = NO_DROPS, .animations = DUPLIGHOST_ANIMS, }, }; @@ -1002,55 +1002,55 @@ EvtScript N(EVS_NpcInit_TargetBombette_05) = { EVT_END }; -StaticNpc N(NpcData_TargetBombettes)[] = { +NpcData N(NpcData_TargetBombettes)[] = { { .id = NPC_Bombette_01_Target, - .settings = &N(NpcSettings_Bombette), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 90, - .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_4000 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, .init = &N(EVS_NpcInit_TargetBombette_01), - .drops = NPC_NO_DROPS, + .settings = &N(NpcSettings_Bombette), + .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_4000 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, + .drops = NO_DROPS, .animations = BOMBETTE_ANIMS, }, { .id = NPC_Bombette_02_Target, - .settings = &N(NpcSettings_Bombette), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 90, - .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_4000 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, .init = &N(EVS_NpcInit_TargetBombette_02), - .drops = NPC_NO_DROPS, + .settings = &N(NpcSettings_Bombette), + .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_4000 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, + .drops = NO_DROPS, .animations = BOMBETTE_ANIMS, }, { .id = NPC_Bombette_03_Target, - .settings = &N(NpcSettings_Bombette), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 90, - .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_4000 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, .init = &N(EVS_NpcInit_TargetBombette_03), - .drops = NPC_NO_DROPS, + .settings = &N(NpcSettings_Bombette), + .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_4000 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, + .drops = NO_DROPS, .animations = BOMBETTE_ANIMS, }, { .id = NPC_Bombette_04_Target, - .settings = &N(NpcSettings_Bombette), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 90, - .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_4000 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, .init = &N(EVS_NpcInit_TargetBombette_04), - .drops = NPC_NO_DROPS, + .settings = &N(NpcSettings_Bombette), + .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_4000 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, + .drops = NO_DROPS, .animations = BOMBETTE_ANIMS, }, { .id = NPC_Bombette_05_Target, - .settings = &N(NpcSettings_Bombette), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 90, - .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_4000 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, .init = &N(EVS_NpcInit_TargetBombette_05), - .drops = NPC_NO_DROPS, + .settings = &N(NpcSettings_Bombette), + .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_4000 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, + .drops = NO_DROPS, .animations = BOMBETTE_ANIMS, }, }; diff --git a/src/world/area_pra/pra_10/pra_10_3_npc.c b/src/world/area_pra/pra_10/pra_10_3_npc.c index 1cea4338eb..a83b97214f 100644 --- a/src/world/area_pra/pra_10/pra_10_3_npc.c +++ b/src/world/area_pra/pra_10/pra_10_3_npc.c @@ -1,6 +1,6 @@ #include "pra_10.h" -#include "world/common/enemy/complete/Swooper.inc.c" +#include "world/common/enemy/Swooper.inc.c" EvtScript N(EVS_NpcInit_Swoopula) = { EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_REFLECT_FLOOR, TRUE) @@ -8,14 +8,10 @@ EvtScript N(EVS_NpcInit_Swoopula) = { EVT_END }; -StaticNpc N(NpcData_Swoopula_01) = { +NpcData N(NpcData_Swoopula_01) = { .id = NPC_Swoopula_01, - .settings = &N(NpcSettings_Swoopula), .pos = { 166.0f, 130.0f, 90.0f }, .yaw = 270, - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_200000, - .init = &N(EVS_NpcInit_Swoopula), - .drops = SWOOPULA_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -28,17 +24,17 @@ StaticNpc N(NpcData_Swoopula_01) = { .detectSize = { 250 }, } }, + .init = &N(EVS_NpcInit_Swoopula), + .settings = &N(NpcSettings_Swoopula), + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_200000, + .drops = SWOOPULA_DROPS, .animations = SWOOPULA_ANIMS, }; -StaticNpc N(NpcData_Swoopula_02) = { +NpcData N(NpcData_Swoopula_02) = { .id = NPC_Swoopula_02, - .settings = &N(NpcSettings_Swoopula), .pos = { 358.0f, 130.0f, 75.0f }, .yaw = 270, - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_200000, - .init = &N(EVS_NpcInit_Swoopula), - .drops = SWOOPULA_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -51,6 +47,10 @@ StaticNpc N(NpcData_Swoopula_02) = { .detectSize = { 250 }, } }, + .init = &N(EVS_NpcInit_Swoopula), + .settings = &N(NpcSettings_Swoopula), + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_200000, + .drops = SWOOPULA_DROPS, .animations = SWOOPULA_ANIMS, }; diff --git a/src/world/area_pra/pra_13/pra_13_3_npc.c b/src/world/area_pra/pra_13/pra_13_3_npc.c index 451082db2a..fe4bc0aa45 100644 --- a/src/world/area_pra/pra_13/pra_13_3_npc.c +++ b/src/world/area_pra/pra_13/pra_13_3_npc.c @@ -1,8 +1,8 @@ #include "pra_13.h" #include "sprite.h" -#include "world/common/enemy/complete/Bombette.h" -#include "world/common/enemy/complete/Duplighost.h" +#include "world/common/enemy/Bombette.h" +#include "world/common/enemy/Duplighost.h" NpcSettings N(NpcSettings_Player) = { .height = 30, @@ -219,46 +219,46 @@ EvtScript N(EVS_NpcInit_Duplighost_02) = { EVT_END }; -StaticNpc N(NpcData_FakeMario) = { +NpcData N(NpcData_FakeMario) = { .id = NPC_FakeMario, - .settings = &N(NpcSettings_Player), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 90, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_4000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_FakeMario), - .drops = NPC_NO_DROPS, + .settings = &N(NpcSettings_Player), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_4000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000, + .drops = NO_DROPS, .animations = BOMBETTE_ANIMS, }; -StaticNpc N(NpcData_Imposters)[] = { +NpcData N(NpcData_Imposters)[] = { { .id = NPC_FakeBombette, - .settings = &N(NpcSettings_Player), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 90, - .flags = ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS, .init = &N(EVS_NpcInit_FakeBombette), - .drops = NPC_NO_DROPS, + .settings = &N(NpcSettings_Player), + .flags = ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS, + .drops = NO_DROPS, .animations = BOMBETTE_ANIMS, }, { .id = NPC_Duplighost_01, - .settings = &N(NpcSettings_Player), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 270, - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_40000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS, .init = &N(EVS_NpcInit_Duplighost_01), - .drops = NPC_NO_DROPS, + .settings = &N(NpcSettings_Player), + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_40000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS, + .drops = NO_DROPS, .animations = DUPLIGHOST_ANIMS, }, { .id = NPC_Duplighost_02, - .settings = &N(NpcSettings_Player), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 270, - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_40000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS, .init = &N(EVS_NpcInit_Duplighost_02), - .drops = NPC_NO_DROPS, + .settings = &N(NpcSettings_Player), + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_40000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS, + .drops = NO_DROPS, .animations = DUPLIGHOST_ANIMS, }, }; diff --git a/src/world/area_pra/pra_18/pra_18_3_npc.c b/src/world/area_pra/pra_18/pra_18_3_npc.c index 9df7f2d46f..8e7e1891ec 100644 --- a/src/world/area_pra/pra_18/pra_18_3_npc.c +++ b/src/world/area_pra/pra_18/pra_18_3_npc.c @@ -1,7 +1,7 @@ #include "pra_18.h" #include "effects.h" -#include "world/common/enemy/complete/FrostClubba.h" +#include "world/common/enemy/FrostClubba.h" NpcSettings N(NpcSettings_Clubba) = { .height = 70, @@ -332,71 +332,71 @@ EvtScript N(EVS_NpcInit_Clubba_03_Aux) = { EVT_END }; -StaticNpc N(NpcData_Clubba_01)[] = { +NpcData N(NpcData_Clubba_01)[] = { { .id = NPC_Clubba_01, - .settings = &N(NpcSettings_Clubba), .pos = { 268.0f, 0.0f, 70.0f }, .yaw = 270, - .flags = ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_100000 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_Clubba_01), - .drops = NPC_NO_DROPS, + .settings = &N(NpcSettings_Clubba), + .flags = ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_100000 | ENEMY_FLAG_400000, + .drops = NO_DROPS, .animations = FROST_CLUBBA_ANIMS, }, { .id = NPC_Clubba_01_Aux, - .settings = &N(NpcSettings_Clubba), .pos = { 268.0f, 0.0f, 70.0f }, .yaw = 270, - .flags = ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_4000 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_Clubba_01_Aux), - .drops = NPC_NO_DROPS, + .settings = &N(NpcSettings_Clubba), + .flags = ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_4000 | ENEMY_FLAG_400000, + .drops = NO_DROPS, .animations = FROST_CLUBBA_ANIMS, }, }; -StaticNpc N(NpcData_Clubba_02)[] = { +NpcData N(NpcData_Clubba_02)[] = { { .id = NPC_Clubba_02, - .settings = &N(NpcSettings_Clubba), .pos = { 490.0f, 0.0f, 70.0f }, .yaw = 270, - .flags = ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_100000 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_Clubba_02), - .drops = NPC_NO_DROPS, + .settings = &N(NpcSettings_Clubba), + .flags = ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_100000 | ENEMY_FLAG_400000, + .drops = NO_DROPS, .animations = FROST_CLUBBA_ANIMS, }, { .id = NPC_Clubba_02_Aux, - .settings = &N(NpcSettings_Clubba), .pos = { 490.0f, 0.0f, 70.0f }, .yaw = 270, - .flags = ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_4000 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_Clubba_02_Aux), - .drops = NPC_NO_DROPS, + .settings = &N(NpcSettings_Clubba), + .flags = ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_4000 | ENEMY_FLAG_400000, + .drops = NO_DROPS, .animations = FROST_CLUBBA_ANIMS, }, }; -StaticNpc N(NpcData_Clubba_03)[] = { +NpcData N(NpcData_Clubba_03)[] = { { .id = NPC_Clubba_03, - .settings = &N(NpcSettings_Clubba), .pos = { 717.0f, 0.0f, 70.0f }, .yaw = 270, - .flags = ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_100000 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_Clubba_03), - .drops = NPC_NO_DROPS, + .settings = &N(NpcSettings_Clubba), + .flags = ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_100000 | ENEMY_FLAG_400000, + .drops = NO_DROPS, .animations = FROST_CLUBBA_ANIMS, }, { .id = NPC_Clubba_03_Aux, - .settings = &N(NpcSettings_Clubba), .pos = { 717.0f, 0.0f, 70.0f }, .yaw = 270, - .flags = ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_4000 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_Clubba_03_Aux), - .drops = NPC_NO_DROPS, + .settings = &N(NpcSettings_Clubba), + .flags = ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_4000 | ENEMY_FLAG_400000, + .drops = NO_DROPS, .animations = FROST_CLUBBA_ANIMS, }, }; diff --git a/src/world/area_pra/pra_19/pra_19_3_npc.c b/src/world/area_pra/pra_19/pra_19_3_npc.c index 508979e679..1d66202e7a 100644 --- a/src/world/area_pra/pra_19/pra_19_3_npc.c +++ b/src/world/area_pra/pra_19/pra_19_3_npc.c @@ -998,55 +998,55 @@ EvtScript N(EVS_NpcInit_Duplighost_Kolorado) = { EVT_END }; -s32 N(ExtraAnims_Goompa)[] = { +AnimID N(ExtraAnims_Goompa)[] = { ANIM_Goompa_Idle, ANIM_Goompa_Walk, ANIM_Goompa_Talk, ANIM_Goompa_Run, - -1 + ANIM_LIST_END }; -s32 N(ExtraAnims_Luigi)[] = { +AnimID N(ExtraAnims_Luigi)[] = { ANIM_Luigi_Idle, ANIM_Luigi_Walk, ANIM_Luigi_Talk, ANIM_Luigi_Run, - -1 + ANIM_LIST_END }; -s32 N(ExtraAnims_KoopaKoot)[] = { +AnimID N(ExtraAnims_KoopaKoot)[] = { ANIM_KoopaKoot_Idle, ANIM_KoopaKoot_Walk, ANIM_KoopaKoot_Talk, ANIM_KoopaKoot_Run, - -1 + ANIM_LIST_END }; -s32 N(ExtraAnims_Kolorado)[] = { +AnimID N(ExtraAnims_Kolorado)[] = { ANIM_Kolorado_Idle, ANIM_Kolorado_Walk, ANIM_Kolorado_Talk, ANIM_Kolorado_Run, - -1 + ANIM_LIST_END }; -s32 N(ExtraAnims_Duplighost)[] = { +AnimID N(ExtraAnims_Duplighost)[] = { ANIM_Duplighost_Anim02, ANIM_Duplighost_Anim03, ANIM_Duplighost_Anim05, ANIM_Duplighost_Anim04, - -1 + ANIM_LIST_END }; -StaticNpc N(NpcData_Imposters)[] = { +NpcData N(NpcData_Imposters)[] = { { .id = NPC_FakeKooper, - .settings = &N(NpcSettings_Kooper), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 90, - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, .init = &N(EVS_NpcInit_FakeKooper), - .drops = NPC_NO_DROPS, + .settings = &N(NpcSettings_Kooper), + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, + .drops = NO_DROPS, .animations = { .idle = ANIM_WorldKooper_Idle, .walk = ANIM_WorldKooper_Walk, @@ -1068,12 +1068,12 @@ StaticNpc N(NpcData_Imposters)[] = { }, { .id = NPC_FakeGoompa, - .settings = &N(NpcSettings_Goompa), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 90, - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, .init = &N(EVS_NpcInit_FakeGoompa), - .drops = NPC_NO_DROPS, + .settings = &N(NpcSettings_Goompa), + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, + .drops = NO_DROPS, .animations = { .idle = ANIM_Goompa_Idle, .walk = ANIM_Goompa_Walk, @@ -1096,23 +1096,23 @@ StaticNpc N(NpcData_Imposters)[] = { }, { .id = NPC_FakeLuigi, - .settings = &N(NpcSettings_Kooper), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 90, - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, .init = &N(EVS_NpcInit_FakeLuigi), - .drops = NPC_NO_DROPS, + .settings = &N(NpcSettings_Kooper), + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, + .drops = NO_DROPS, .animations = LUIGI_ANIMS, .extraAnimations = N(ExtraAnims_Luigi), }, { .id = NPC_FakeKoopaKoot, - .settings = &N(NpcSettings_KoopaKoot), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 90, - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, .init = &N(EVS_NpcInit_FakeKoopaKoot), - .drops = NPC_NO_DROPS, + .settings = &N(NpcSettings_KoopaKoot), + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, + .drops = NO_DROPS, .animations = { .idle = ANIM_KoopaKoot_Idle, .walk = ANIM_KoopaKoot_Idle, @@ -1135,23 +1135,23 @@ StaticNpc N(NpcData_Imposters)[] = { }, { .id = NPC_FakeKolorado, - .settings = &N(NpcSettings_Kolorado), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 90, - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, .init = &N(EVS_NpcInit_FakeKolorado), - .drops = NPC_NO_DROPS, + .settings = &N(NpcSettings_Kolorado), + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, + .drops = NO_DROPS, .animations = KOLORADO_ANIMS, .extraAnimations = N(ExtraAnims_Kolorado), }, { .id = NPC_ExamplePlayer, - .settings = &N(NpcSettings_Duplighost), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 90, - .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_4000 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, .init = &N(EVS_NpcInit_ExamplePlayer), - .drops = NPC_NO_DROPS, + .settings = &N(NpcSettings_Duplighost), + .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_4000 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, + .drops = NO_DROPS, .animations = { .idle = ANIM_Duplighost_Anim02, .walk = ANIM_Duplighost_Anim03, @@ -1174,12 +1174,12 @@ StaticNpc N(NpcData_Imposters)[] = { }, { .id = NPC_ExampleKooper, - .settings = &N(NpcSettings_Kooper), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 90, - .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, .init = &N(EVS_NpcInit_ExampleKooper), - .drops = NPC_NO_DROPS, + .settings = &N(NpcSettings_Kooper), + .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, + .drops = NO_DROPS, .animations = { .idle = ANIM_WorldKooper_Idle, .walk = ANIM_WorldKooper_Walk, @@ -1201,15 +1201,15 @@ StaticNpc N(NpcData_Imposters)[] = { }, }; -StaticNpc N(NpcData_Duplighosts)[] = { +NpcData N(NpcData_Duplighosts)[] = { { .id = NPC_GoompaGhost, - .settings = &N(NpcSettings_Duplighost), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 90, - .flags = ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS, .init = &N(EVS_NpcInit_Duplighost_Goompa), - .drops = NPC_NO_DROPS, + .settings = &N(NpcSettings_Duplighost), + .flags = ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS, + .drops = NO_DROPS, .animations = { .idle = ANIM_Duplighost_Anim02, .walk = ANIM_Duplighost_Anim03, @@ -1232,12 +1232,12 @@ StaticNpc N(NpcData_Duplighosts)[] = { }, { .id = NPC_LuigiGhost, - .settings = &N(NpcSettings_Duplighost), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 90, - .flags = ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS, .init = &N(EVS_NpcInit_Duplighost_Luigi), - .drops = NPC_NO_DROPS, + .settings = &N(NpcSettings_Duplighost), + .flags = ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS, + .drops = NO_DROPS, .animations = { .idle = ANIM_Duplighost_Anim02, .walk = ANIM_Duplighost_Anim03, @@ -1260,12 +1260,12 @@ StaticNpc N(NpcData_Duplighosts)[] = { }, { .id = NPC_KoopaKootGhost, - .settings = &N(NpcSettings_Duplighost), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 90, - .flags = ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS, .init = &N(EVS_NpcInit_Duplighost_KoopaKoot), - .drops = NPC_NO_DROPS, + .settings = &N(NpcSettings_Duplighost), + .flags = ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS, + .drops = NO_DROPS, .animations = { .idle = ANIM_Duplighost_Anim02, .walk = ANIM_Duplighost_Anim03, @@ -1288,12 +1288,12 @@ StaticNpc N(NpcData_Duplighosts)[] = { }, { .id = NPC_KoloradoGhost, - .settings = &N(NpcSettings_Duplighost), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 90, - .flags = ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS, .init = &N(EVS_NpcInit_Duplighost_Kolorado), - .drops = NPC_NO_DROPS, + .settings = &N(NpcSettings_Duplighost), + .flags = ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS, + .drops = NO_DROPS, .animations = { .idle = ANIM_Duplighost_Anim02, .walk = ANIM_Duplighost_Anim03, @@ -1316,12 +1316,12 @@ StaticNpc N(NpcData_Duplighosts)[] = { }, { .id = NPC_Duplighost_Controller, - .settings = &N(NpcSettings_Duplighost), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 90, - .flags = ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_4000 | ENEMY_FLAG_40000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS, .init = &N(EVS_NpcInit_Duplighost_Controller), - .drops = NPC_NO_DROPS, + .settings = &N(NpcSettings_Duplighost), + .flags = ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_4000 | ENEMY_FLAG_40000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS, + .drops = NO_DROPS, .animations = { .idle = ANIM_Duplighost_Anim02, .walk = ANIM_Duplighost_Anim03, @@ -1484,15 +1484,15 @@ EvtScript N(EVS_NpcInit_TargetKolorado) = { EVT_END }; -StaticNpc N(NpcData_Targets)[] = { +NpcData N(NpcData_Targets)[] = { { .id = NPC_TargetKooper, - .settings = &N(NpcSettings_Kooper), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 90, - .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_4000 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, .init = &N(EVS_NpcInit_TargetKooper), - .drops = NPC_NO_DROPS, + .settings = &N(NpcSettings_Kooper), + .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_4000 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, + .drops = NO_DROPS, .animations = { .idle = ANIM_WorldKooper_Idle, .walk = ANIM_WorldKooper_Walk, @@ -1514,12 +1514,12 @@ StaticNpc N(NpcData_Targets)[] = { }, { .id = NPC_TargetGoompa, - .settings = &N(NpcSettings_Goompa), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 90, - .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_4000 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, .init = &N(EVS_NpcInit_TargetGoompa), - .drops = NPC_NO_DROPS, + .settings = &N(NpcSettings_Goompa), + .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_4000 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, + .drops = NO_DROPS, .animations = { .idle = ANIM_Goompa_Idle, .walk = ANIM_Goompa_Walk, @@ -1542,23 +1542,23 @@ StaticNpc N(NpcData_Targets)[] = { }, { .id = NPC_TargetLuigi, - .settings = &N(NpcSettings_Kooper), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 90, - .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_4000 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, .init = &N(EVS_NpcInit_TargetLuigi), - .drops = NPC_NO_DROPS, + .settings = &N(NpcSettings_Kooper), + .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_4000 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, + .drops = NO_DROPS, .animations = LUIGI_ANIMS, .extraAnimations = N(ExtraAnims_Luigi), }, { .id = NPC_TargetKoopaKoot, - .settings = &N(NpcSettings_KoopaKoot), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 90, - .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_4000 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, .init = &N(EVS_NpcInit_TargetKoopaKoot), - .drops = NPC_NO_DROPS, + .settings = &N(NpcSettings_KoopaKoot), + .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_4000 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, + .drops = NO_DROPS, .animations = { .idle = ANIM_KoopaKoot_Idle, .walk = ANIM_KoopaKoot_Idle, @@ -1581,12 +1581,12 @@ StaticNpc N(NpcData_Targets)[] = { }, { .id = NPC_TargetKolorado, - .settings = &N(NpcSettings_Kolorado), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 90, - .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_4000 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, .init = &N(EVS_NpcInit_TargetKolorado), - .drops = NPC_NO_DROPS, + .settings = &N(NpcSettings_Kolorado), + .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_4000 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, + .drops = NO_DROPS, .animations = KOLORADO_ANIMS, .extraAnimations = N(ExtraAnims_Kolorado), }, diff --git a/src/world/area_pra/pra_31/pra_31.h b/src/world/area_pra/pra_31/pra_31.h index 23e4a4f5c0..a461f13501 100644 --- a/src/world/area_pra/pra_31/pra_31.h +++ b/src/world/area_pra/pra_31/pra_31.h @@ -38,9 +38,9 @@ extern NpcGroupList N(DefaultNPCs); API_CALLABLE(N(SetDinoAngle)); -ApiStatus InitAnimatedModels(Evt* script, s32 isInitialCall); -ApiStatus SetAnimatedModelRenderMode(Evt* script, s32 isInitialCall); -ApiStatus DeleteAnimatedModel(Evt* script, s32 isInitialCall); +API_CALLABLE(InitAnimatedModels); +API_CALLABLE(SetAnimatedModelRenderMode); +API_CALLABLE(DeleteAnimatedModel); extern StaticAnimatorNode* N(AS_Stairs_Skeleton)[]; extern AnimScript N(AS_Stairs_InitializeBefore); diff --git a/src/world/area_pra/pra_31/pra_31_2_npc.c b/src/world/area_pra/pra_31/pra_31_2_npc.c index c27453b0ee..7607300695 100644 --- a/src/world/area_pra/pra_31/pra_31_2_npc.c +++ b/src/world/area_pra/pra_31/pra_31_2_npc.c @@ -1,6 +1,6 @@ #include "pra_31.h" -#include "world/common/enemy/complete/AlbinoDino.inc.c" +#include "world/common/enemy/AlbinoDino.inc.c" #include "world/common/complete/KeyItemChoice.inc.c" MAP_STATIC_PAD(1,key_item); @@ -166,37 +166,37 @@ EvtScript N(EVS_NpcInit_AlbinoDino_03) = { EVT_END }; -StaticNpc N(NpcData_AlbinoDinos)[] = { +NpcData N(NpcData_AlbinoDinos)[] = { { .id = NPC_AlbinoDino_01, - .settings = &N(NpcSettings_AlbinoDino), .pos = { 190.0f, -10.0f, 165.0f }, .yaw = 270, - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_AlbinoDino_01), - .drops = NPC_NO_DROPS, + .settings = &N(NpcSettings_AlbinoDino), + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_400000, + .drops = NO_DROPS, .animations = ALBINO_DINO_ANIMS, .tattle = MSG_NpcTattle_AlbinoDino, }, { .id = NPC_AlbinoDino_02, - .settings = &N(NpcSettings_AlbinoDino), .pos = { 300.0f, -10.0f, 89.0f }, .yaw = 270, - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_AlbinoDino_02), - .drops = NPC_NO_DROPS, + .settings = &N(NpcSettings_AlbinoDino), + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_400000, + .drops = NO_DROPS, .animations = ALBINO_DINO_ANIMS, .tattle = MSG_NpcTattle_AlbinoDino, }, { .id = NPC_AlbinoDino_03, - .settings = &N(NpcSettings_AlbinoDino), .pos = { 452.0f, -10.0f, 139.0f }, .yaw = 270, - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_AlbinoDino_03), - .drops = NPC_NO_DROPS, + .settings = &N(NpcSettings_AlbinoDino), + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_400000, + .drops = NO_DROPS, .animations = ALBINO_DINO_ANIMS, .tattle = MSG_NpcTattle_AlbinoDino, }, diff --git a/src/world/area_pra/pra_32/pra_32.h b/src/world/area_pra/pra_32/pra_32.h index 70c416fbd4..1c8155115b 100644 --- a/src/world/area_pra/pra_32/pra_32.h +++ b/src/world/area_pra/pra_32/pra_32.h @@ -18,6 +18,7 @@ enum { enum { MV_CamDistance = MapVar(0), + MV_Unk_01 = MapVar(1), }; #define NAMESPACE pra_32 diff --git a/src/world/area_pra/pra_32/pra_32_2_main.c b/src/world/area_pra/pra_32/pra_32_2_main.c index 97db44f7ef..bd7a887892 100644 --- a/src/world/area_pra/pra_32/pra_32_2_main.c +++ b/src/world/area_pra/pra_32/pra_32_2_main.c @@ -1,5 +1,6 @@ #include "pra_32.h" +#define STAR_SPIRIT_DATA_VAR MV_Unk_01 #include "world/common/todo/StarSpiritEffectFunc.inc.c" API_CALLABLE(N(DisableFloorReflections)) { diff --git a/src/world/area_pra/pra_32/pra_32_3_npc.c b/src/world/area_pra/pra_32/pra_32_3_npc.c index 5a4cf1dd3d..0bb878a440 100644 --- a/src/world/area_pra/pra_32/pra_32_3_npc.c +++ b/src/world/area_pra/pra_32/pra_32_3_npc.c @@ -1,7 +1,7 @@ #include "pra_32.h" #include "effects.h" -#include "world/common/enemy/complete/CrystalKing.inc.c" +#include "world/common/enemy/CrystalKing.inc.c" #include "world/common/npc/StarSpirit.inc.c" EvtScript N(EVS_AnimateCam_CrystalKing) = { @@ -131,7 +131,7 @@ EvtScript N(EVS_Scene_BossDefeated) = { EVT_WAIT(2) EVT_CALL(FadeOutMusic, 0, 500) EVT_END_THREAD - EVT_CALL(SetEncounterStatusFlags, 1, TRUE) + EVT_CALL(SetEncounterStatusFlags, ENCOUNTER_STATUS_FLAG_1, TRUE) EVT_CALL(SetPlayerPos, 475, 100, 116) EVT_CALL(DisablePartnerAI, 0) EVT_CALL(GetNpcPos, NPC_CrystalKing_01, LVar0, LVar1, LVar2) @@ -236,44 +236,44 @@ EvtScript N(EVS_NpcInit_Kalmar) = { EVT_END }; -StaticNpc N(NpcData_CrystalKing_01)[] = { +NpcData N(NpcData_CrystalKing_01)[] = { { .id = NPC_CrystalKing_01, - .settings = &N(NpcSettings_CrystalKing), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 90, - .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_CrystalKing_Aux), - .drops = NPC_NO_DROPS, + .settings = &N(NpcSettings_CrystalKing), + .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000, + .drops = NO_DROPS, .animations = CRYSTAL_KING_ANIMS, }, { .id = NPC_CrystalKing_02, - .settings = &N(NpcSettings_CrystalKing), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 90, + .settings = &N(NpcSettings_CrystalKing), .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000, - .drops = NPC_NO_DROPS, + .drops = NO_DROPS, .animations = CRYSTAL_KING_ANIMS, }, { .id = NPC_Kalmar, - .settings = &N(NpcSettings_StarSpirit), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 90, - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_40000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_Kalmar), - .drops = NPC_NO_DROPS, + .settings = &N(NpcSettings_StarSpirit), + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_40000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000, + .drops = NO_DROPS, .animations = KALMAR_ANIMS, }, { .id = NPC_CrystalKing_03, - .settings = &N(NpcSettings_CrystalKing), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 90, - .flags = ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_4000 | ENEMY_FLAG_40000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_CrystalKing), - .drops = NPC_NO_DROPS, + .settings = &N(NpcSettings_CrystalKing), + .flags = ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_4000 | ENEMY_FLAG_40000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000, + .drops = NO_DROPS, .animations = CRYSTAL_KING_ANIMS, }, }; diff --git a/src/world/area_pra/pra_35/pra_35_3_npc.c b/src/world/area_pra/pra_35/pra_35_3_npc.c index 66f9e4d333..cf1dfd64d7 100644 --- a/src/world/area_pra/pra_35/pra_35_3_npc.c +++ b/src/world/area_pra/pra_35/pra_35_3_npc.c @@ -1,8 +1,8 @@ #include "pra_35.h" #define INCLUDE_FROST_CLUBBA_PATROL -#include "world/common/enemy/complete/FrostClubba_Multi.inc.c" -#include "world/common/enemy/complete/Duplighost_Patrol.inc.c" +#include "world/common/enemy/FrostClubba_Multi.inc.c" +#include "world/common/enemy/Duplighost_Patrol.inc.c" #include "world/common/enemy/ai/WanderMeleeAI.inc.c" @@ -12,15 +12,11 @@ EvtScript N(EVS_NpcInit_EnableReflection) = { EVT_END }; -StaticNpc N(NpcData_Clubba)[] = { +NpcData N(NpcData_Clubba)[] = { { .id = NPC_Clubba, - .settings = &N(NpcSettings_FrostClubba_Patrol), .pos = { 200.0f, 0.0f, 75.0f }, .yaw = 90, - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, - .init = &N(EVS_NpcInit_EnableReflection), - .drops = FROST_CLUBBA_DROPS, .territory = { .patrol = { .isFlying = TRUE, @@ -35,20 +31,20 @@ StaticNpc N(NpcData_Clubba)[] = { .detectSize = { 200, 100 }, } }, + .init = &N(EVS_NpcInit_EnableReflection), + .settings = &N(NpcSettings_FrostClubba_Patrol), + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = FROST_CLUBBA_DROPS, .animations = FROST_CLUBBA_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT | AI_DETECT_SENSITIVE_MOTION, }, FROST_CLUBBA_MACE_HITBOX(NPC_Clubba_Hitbox), }; -StaticNpc N(NpcData_Duplighost) = { +NpcData N(NpcData_Duplighost) = { .id = NPC_Duplighost, - .settings = &N(NpcSettings_Duplighost_Patrol), .pos = { 200.0f, 0.0f, -75.0f }, .yaw = 90, - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_200000, - .init = &N(EVS_NpcInit_EnableReflection), - .drops = DUPLIGHOST_DROPS, .territory = { .patrol = { .isFlying = TRUE, @@ -63,6 +59,10 @@ StaticNpc N(NpcData_Duplighost) = { .detectSize = { 200, 100 }, } }, + .init = &N(EVS_NpcInit_EnableReflection), + .settings = &N(NpcSettings_Duplighost_Patrol), + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_200000, + .drops = DUPLIGHOST_DROPS, .animations = DUPLIGHOST_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT | AI_DETECT_SENSITIVE_MOTION, }; diff --git a/src/world/area_pra/pra_36/pra_36_3_npc.c b/src/world/area_pra/pra_36/pra_36_3_npc.c index 0591539818..bdedc55b96 100644 --- a/src/world/area_pra/pra_36/pra_36_3_npc.c +++ b/src/world/area_pra/pra_36/pra_36_3_npc.c @@ -1,6 +1,6 @@ #include "pra_36.h" -#include "world/common/enemy/complete/Duplighost_Wander.inc.c" +#include "world/common/enemy/Duplighost_Wander.inc.c" EvtScript N(EVS_NpcInit_Duplighost) = { EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_REFLECT_FLOOR, TRUE) @@ -8,14 +8,10 @@ EvtScript N(EVS_NpcInit_Duplighost) = { EVT_END }; -StaticNpc N(NpcData_Duplighost) = { +NpcData N(NpcData_Duplighost) = { .id = NPC_Duplighost, - .settings = &N(NpcSettings_Duplighost_Wander), .pos = { 250.0f, 0.0f, 75.0f }, .yaw = 90, - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_200000, - .init = &N(EVS_NpcInit_Duplighost), - .drops = DUPLIGHOST_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -28,6 +24,10 @@ StaticNpc N(NpcData_Duplighost) = { .detectSize = { 200 }, } }, + .init = &N(EVS_NpcInit_Duplighost), + .settings = &N(NpcSettings_Duplighost_Wander), + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_200000, + .drops = DUPLIGHOST_DROPS, .animations = DUPLIGHOST_ANIMS, .aiDetectFlags = AI_DETECT_SENSITIVE_MOTION, }; diff --git a/src/world/area_pra/pra_37/pra_37_3_npc.c b/src/world/area_pra/pra_37/pra_37_3_npc.c index 79195e492b..cb5d48f481 100644 --- a/src/world/area_pra/pra_37/pra_37_3_npc.c +++ b/src/world/area_pra/pra_37/pra_37_3_npc.c @@ -1,7 +1,7 @@ #include "pra_37.h" #define INCLUDE_FROST_CLUBBA_WANDER -#include "world/common/enemy/complete/FrostClubba_Multi.inc.c" +#include "world/common/enemy/FrostClubba_Multi.inc.c" EvtScript N(EVS_NpcInit_FrostClubba) = { EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_REFLECT_FLOOR, TRUE) @@ -9,15 +9,11 @@ EvtScript N(EVS_NpcInit_FrostClubba) = { EVT_END }; -StaticNpc N(NpcData_FrostClubba)[] = { +NpcData N(NpcData_FrostClubba)[] = { { .id = NPC_FrostClubba, - .settings = &N(NpcSettings_FrostClubba_Wander), .pos = { 175.0f, 0.0f, 75.0f }, .yaw = 90, - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, - .init = &N(EVS_NpcInit_FrostClubba), - .drops = FROST_CLUBBA_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -30,6 +26,10 @@ StaticNpc N(NpcData_FrostClubba)[] = { .detectSize = { 200 }, } }, + .init = &N(EVS_NpcInit_FrostClubba), + .settings = &N(NpcSettings_FrostClubba_Wander), + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = FROST_CLUBBA_DROPS, .animations = FROST_CLUBBA_ANIMS, .aiDetectFlags = AI_DETECT_SENSITIVE_MOTION, }, diff --git a/src/world/area_pra/pra_38/pra_38_3_npc.c b/src/world/area_pra/pra_38/pra_38_3_npc.c index 4f85ba81aa..528b65e70b 100644 --- a/src/world/area_pra/pra_38/pra_38_3_npc.c +++ b/src/world/area_pra/pra_38/pra_38_3_npc.c @@ -1,6 +1,6 @@ #include "pra_38.h" -#include "world/common/enemy/complete/Swooper.inc.c" +#include "world/common/enemy/Swooper.inc.c" EvtScript N(EVS_NpcInit_Swoopula) = { EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_REFLECT_FLOOR, TRUE) @@ -8,14 +8,10 @@ EvtScript N(EVS_NpcInit_Swoopula) = { EVT_END }; -StaticNpc N(NpcData_Swoopula_01) = { +NpcData N(NpcData_Swoopula_01) = { .id = NPC_Swoopula_01, - .settings = &N(NpcSettings_Swoopula), .pos = { 175.0f, 130.0f, 75.0f }, .yaw = 270, - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_200000, - .init = &N(EVS_NpcInit_Swoopula), - .drops = SWOOPULA_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -28,18 +24,18 @@ StaticNpc N(NpcData_Swoopula_01) = { .detectSize = { 200 }, } }, + .init = &N(EVS_NpcInit_Swoopula), + .settings = &N(NpcSettings_Swoopula), + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_200000, + .drops = SWOOPULA_DROPS, .animations = SWOOPULA_ANIMS, .aiDetectFlags = AI_DETECT_SENSITIVE_MOTION, }; -StaticNpc N(NpcData_Swoopula_02) = { +NpcData N(NpcData_Swoopula_02) = { .id = NPC_Swoopula_02, - .settings = &N(NpcSettings_Swoopula), .pos = { 325.0f, 130.0f, 75.0f }, .yaw = 270, - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_200000, - .init = &N(EVS_NpcInit_Swoopula), - .drops = SWOOPULA_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -52,6 +48,10 @@ StaticNpc N(NpcData_Swoopula_02) = { .detectSize = { 200 }, } }, + .init = &N(EVS_NpcInit_Swoopula), + .settings = &N(NpcSettings_Swoopula), + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_200000, + .drops = SWOOPULA_DROPS, .animations = SWOOPULA_ANIMS, .aiDetectFlags = AI_DETECT_SENSITIVE_MOTION, }; diff --git a/src/world/area_pra/pra_39/pra_39_3_npc.c b/src/world/area_pra/pra_39/pra_39_3_npc.c index 0a5cf5185c..889cdde17c 100644 --- a/src/world/area_pra/pra_39/pra_39_3_npc.c +++ b/src/world/area_pra/pra_39/pra_39_3_npc.c @@ -1,7 +1,7 @@ #include "pra_39.h" -#include "world/common/enemy/complete/Swooper.inc.c" -#include "world/common/enemy/complete/Duplighost_Wander.inc.c" +#include "world/common/enemy/Swooper.inc.c" +#include "world/common/enemy/Duplighost_Wander.inc.c" EvtScript N(EVS_NpcInit_Duplighost) = { EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_REFLECT_FLOOR, TRUE) @@ -9,14 +9,10 @@ EvtScript N(EVS_NpcInit_Duplighost) = { EVT_END }; -StaticNpc N(NpcData_Duplighost) = { +NpcData N(NpcData_Duplighost) = { .id = NPC_Duplighost, - .settings = &N(NpcSettings_Duplighost_Wander), .pos = { 250.0f, 0.0f, 75.0f }, .yaw = 90, - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_200000, - .init = &N(EVS_NpcInit_Duplighost), - .drops = DUPLIGHOST_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -29,6 +25,10 @@ StaticNpc N(NpcData_Duplighost) = { .detectSize = { 200 }, } }, + .init = &N(EVS_NpcInit_Duplighost), + .settings = &N(NpcSettings_Duplighost_Wander), + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_200000, + .drops = DUPLIGHOST_DROPS, .animations = DUPLIGHOST_ANIMS, .aiDetectFlags = AI_DETECT_SENSITIVE_MOTION, }; diff --git a/src/world/area_sam/sam.h b/src/world/area_sam/sam.h index ec11e0996c..b65f5f3f2b 100644 --- a/src/world/area_sam/sam.h +++ b/src/world/area_sam/sam.h @@ -2,22 +2,22 @@ #define _WORLD_AREA_SAM_SAM_H_ enum { - AB_SAM_0 = AreaByte(0), - AB_SAM_1 = AreaByte(1), - AB_SAM_2 = AreaByte(2), - AB_SAM_3 = AreaByte(3), - AB_SAM_4 = AreaByte(4), - AB_SAM_5 = AreaByte(5), - AB_SAM_6 = AreaByte(6), - AB_SAM_7 = AreaByte(7), - AB_SAM_8 = AreaByte(8), - AB_SAM_9 = AreaByte(9), - AB_SAM_A = AreaByte(10), - AB_SAM_B = AreaByte(11), - AB_SAM_C = AreaByte(12), - AB_SAM_D = AreaByte(13), - AB_SAM_E = AreaByte(14), - AB_SAM_F = AreaByte(15), + AB_SAM_Unused_0 = AreaByte(0), + AB_SAM_Unused_1 = AreaByte(1), + AB_SAM_Unused_2 = AreaByte(2), + AB_SAM_Unused_3 = AreaByte(3), + AB_SAM_Unused_4 = AreaByte(4), + AB_SAM_Unused_5 = AreaByte(5), + AB_SAM_Unused_6 = AreaByte(6), + AB_SAM_Unused_7 = AreaByte(7), + AB_SAM_Unused_8 = AreaByte(8), + AB_SAM_Unused_9 = AreaByte(9), + AB_SAM_Unused_A = AreaByte(10), + AB_SAM_Unused_B = AreaByte(11), + AB_SAM_Unused_C = AreaByte(12), + AB_SAM_Unused_D = AreaByte(13), + AB_SAM_Unused_E = AreaByte(14), + AB_SAM_Unused_F = AreaByte(15), }; enum { diff --git a/src/world/area_sam/sam_01/sam_01_2_main.c b/src/world/area_sam/sam_01/sam_01_2_main.c index 272e07ff40..4651b1c491 100644 --- a/src/world/area_sam/sam_01/sam_01_2_main.c +++ b/src/world/area_sam/sam_01/sam_01_2_main.c @@ -2,7 +2,6 @@ #include "effects.h" #include "world/common/atomic/TexturePan.inc.c" -#include "world/common/atomic/TexturePan.data.inc.c" EvtScript N(EVS_ExitWalk_sam_02_0) = EVT_EXIT_WALK(60, sam_01_ENTRY_0, "sam_02", sam_02_ENTRY_0); diff --git a/src/world/area_sam/sam_01/sam_01_4_npc.c b/src/world/area_sam/sam_01/sam_01_4_npc.c index 40f6d3d477..98ca7aa3ec 100644 --- a/src/world/area_sam/sam_01/sam_01_4_npc.c +++ b/src/world/area_sam/sam_01/sam_01_4_npc.c @@ -626,70 +626,66 @@ EvtScript N(EVS_NpcInit_Penguin_09) = { EVT_END }; -StaticNpc N(NpcData_MayorPenguin)[] = { +NpcData N(NpcData_MayorPenguin)[] = { { .id = NPC_MayorPenguin, - .settings = &N(NpcSettings_Penguin), .pos = { -272.0f, 0.0f, -180.0f }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_MayorPenguin), - .drops = NPC_NO_DROPS, + .settings = &N(NpcSettings_Penguin), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_400000, + .drops = NO_DROPS, .animations = MAYOR_PENGUIN_ANIMS, .tattle = MSG_NpcTattle_MayorPenguin, }, { .id = NPC_MayorDummy, - .settings = &N(NpcSettings_Penguin), .pos = { -272.0f, 0.0f, -180.0f }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_4000 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_MayorDummy), - .drops = NPC_NO_DROPS, + .settings = &N(NpcSettings_Penguin), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_4000 | ENEMY_FLAG_400000, + .drops = NO_DROPS, .animations = MAYOR_PENGUIN_ANIMS, .tattle = MSG_NpcTattle_MayorPenguin, }, { .id = NPC_MayorPenguinWife, - .settings = &N(NpcSettings_Penguin), .pos = { -316.0f, 0.0f, 113.0f }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_MayorPenguinWife), - .drops = NPC_NO_DROPS, + .settings = &N(NpcSettings_Penguin), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_400000, + .drops = NO_DROPS, .animations = MAYOR_PENGUIN_WIFE_ANIMS, .tattle = MSG_NpcTattle_MayorPenguinWife, }, { .id = NPC_PenguinPatrol, - .settings = &N(NpcSettings_Penguin), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_PenguinPatrol), - .drops = NPC_NO_DROPS, + .settings = &N(NpcSettings_Penguin), + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_400000, + .drops = NO_DROPS, .animations = PENGUIN_PATROL_ANIMS, .tattle = MSG_NpcTattle_SAM_Patrol, }, { .id = NPC_Herringway, - .settings = &N(NpcSettings_Penguin), .pos = { 0.0f, 0.0f, 0.0f }, .yaw = 0, - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_Herringway), - .drops = NPC_NO_DROPS, + .settings = &N(NpcSettings_Penguin), + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_400000, + .drops = NO_DROPS, .animations = HERRINGWAY_ANIMS, .tattle = MSG_NpcTattle_Herringway, }, { .id = NPC_Penguin_01, - .settings = &N(NpcSettings_Penguin_Wander), .pos = { -150.0f, 0.0f, 400.0f }, .yaw = 0, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_400000, - .init = &N(EVS_NpcInit_Penguin_01), - .drops = NPC_NO_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -702,17 +698,17 @@ StaticNpc N(NpcData_MayorPenguin)[] = { .detectSize = { 0 }, } }, + .init = &N(EVS_NpcInit_Penguin_01), + .settings = &N(NpcSettings_Penguin_Wander), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_400000, + .drops = NO_DROPS, .animations = PENGUIN_ANIMS, .tattle = MSG_NpcTattle_SAM_GossipPenguin, }, { .id = NPC_Penguin_02, - .settings = &N(NpcSettings_Penguin_Wander), .pos = { 100.0f, 0.0f, 250.0f }, .yaw = 0, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_400000, - .init = &N(EVS_NpcInit_Penguin_02), - .drops = NPC_NO_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -725,17 +721,17 @@ StaticNpc N(NpcData_MayorPenguin)[] = { .detectSize = { 0 }, } }, + .init = &N(EVS_NpcInit_Penguin_02), + .settings = &N(NpcSettings_Penguin_Wander), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_400000, + .drops = NO_DROPS, .animations = PENGUIN_ANIMS, .tattle = MSG_NpcTattle_SAM_FriendlyPenguin, }, { .id = NPC_Penguin_03, - .settings = &N(NpcSettings_Penguin_Wander), .pos = { 400.0f, 0.0f, 50.0f }, .yaw = 0, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_400000, - .init = &N(EVS_NpcInit_Penguin_03), - .drops = NPC_NO_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -748,89 +744,93 @@ StaticNpc N(NpcData_MayorPenguin)[] = { .detectSize = { 0 }, } }, + .init = &N(EVS_NpcInit_Penguin_03), + .settings = &N(NpcSettings_Penguin_Wander), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_400000, + .drops = NO_DROPS, .animations = PENGUIN_ANIMS, .tattle = MSG_NpcTattle_SAM_CheerfulPenguin, }, { .id = NPC_Penguin_04, - .settings = &N(NpcSettings_Penguin), .pos = { 350.0f, 0.0f, -190.0f }, .yaw = 0, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_Penguin_04), - .drops = NPC_NO_DROPS, + .settings = &N(NpcSettings_Penguin), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_400000, + .drops = NO_DROPS, .animations = PENGUIN_ANIMS, .tattle = MSG_NpcTattle_SAM_GenericPenguin, }, }; -StaticNpc N(NpcData_Penguin_05)[] = { +NpcData N(NpcData_Penguin_05)[] = { { .id = NPC_Penguin_05, - .settings = &N(NpcSettings_Penguin), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 90, - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_200000 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_Penguin_05), - .drops = NPC_NO_DROPS, + .settings = &N(NpcSettings_Penguin), + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_200000 | ENEMY_FLAG_400000, + .drops = NO_DROPS, .animations = PENGUIN_ANIMS, .tattle = MSG_NpcTattle_SAM_RumorLovingPenguins, }, { .id = NPC_Penguin_06, - .settings = &N(NpcSettings_Penguin), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 270, - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_200000 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_Penguin_06), - .drops = NPC_NO_DROPS, + .settings = &N(NpcSettings_Penguin), + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_200000 | ENEMY_FLAG_400000, + .drops = NO_DROPS, .animations = PENGUIN_ANIMS, .tattle = MSG_NpcTattle_SAM_NotAdventurous, }, { .id = NPC_Penguin_07, - .settings = &N(NpcSettings_Penguin), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 180, - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_200000 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_Penguin_07), - .drops = NPC_NO_DROPS, + .settings = &N(NpcSettings_Penguin), + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_200000 | ENEMY_FLAG_400000, + .drops = NO_DROPS, .animations = PENGUIN_ANIMS, .tattle = MSG_NpcTattle_SAM_GenericPenguin, }, { .id = NPC_Penguin_08, - .settings = &N(NpcSettings_Penguin), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_200000 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_Penguin_08), - .drops = NPC_NO_DROPS, + .settings = &N(NpcSettings_Penguin), + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_200000 | ENEMY_FLAG_400000, + .drops = NO_DROPS, .animations = PENGUIN_ANIMS, .tattle = MSG_NpcTattle_SAM_GenericPenguin, }, }; -StaticNpc N(NpcData_Penguin_09) = { +NpcData N(NpcData_Penguin_09) = { .id = NPC_Penguin_09, - .settings = &N(NpcSettings_Penguin), .pos = { 0.0f, 0.0f, 0.0f }, .yaw = 0, - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_Penguin_09), - .drops = NPC_NO_DROPS, + .settings = &N(NpcSettings_Penguin), + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_400000, + .drops = NO_DROPS, .animations = PENGUIN_ANIMS, }; -StaticNpc N(NpcData_ChuckQuizmo) = { +NpcData N(NpcData_ChuckQuizmo) = { .id = NPC_ChuckQuizmo, - .settings = &N(NpcSettings_ChuckQuizmo), .pos = { 230.0f, 0.0f, 150.0f }, .yaw = 90, - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, .initVarCount = 1, .initVar = { .bytes = { 0, QUIZ_AREA_SAM, QUIZ_COUNT_SAM, QUIZ_MAP_SAM_01 }}, - .drops = NPC_NO_DROPS, + .settings = &N(NpcSettings_ChuckQuizmo), + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, + .drops = NO_DROPS, .animations = QUIZMO_ANIMS, .tattle = MSG_NpcTattle_ChuckQuizmo, }; diff --git a/src/world/area_sam/sam_02/sam_02.h b/src/world/area_sam/sam_02/sam_02.h index edf6298719..10e5b342b4 100644 --- a/src/world/area_sam/sam_02/sam_02.h +++ b/src/world/area_sam/sam_02/sam_02.h @@ -12,15 +12,15 @@ #include "sprite/npc/Penguin.h" enum { - NPC_Penguin_ShopOwner = 0, - NPC_ShiverToad = 1, - NPC_Penguin_02 = 2, - NPC_Penguin_03 = 3, - NPC_Penguin_04 = 4, - NPC_Penguin_05 = 5, - NPC_Penguin_06 = 6, - NPC_Penguin_07 = 7, - NPC_ChuckQuizmo = 8, + NPC_Penguin_ShopOwner = 0, + NPC_ShiverToad = 1, + NPC_Penguin_02 = 2, + NPC_Penguin_03 = 3, + NPC_Penguin_04 = 4, + NPC_Penguin_05 = 5, + NPC_Penguin_06 = 6, + NPC_Penguin_07 = 7, + NPC_ChuckQuizmo = 8, }; enum { @@ -32,7 +32,7 @@ enum { }; enum { - MF_SkipIcedPotato = MapFlag(10), + MF_SkipIcedPotato = MapFlag(10), }; #define NAMESPACE sam_02 diff --git a/src/world/area_sam/sam_02/sam_02_2_main.c b/src/world/area_sam/sam_02/sam_02_2_main.c index 5de17c159a..b227fe2fcd 100644 --- a/src/world/area_sam/sam_02/sam_02_2_main.c +++ b/src/world/area_sam/sam_02/sam_02_2_main.c @@ -3,7 +3,6 @@ #include "world/common/entity/Pipe.inc.c" #include "world/common/atomic/TexturePan.inc.c" -#include "world/common/atomic/TexturePan.data.inc.c" #include "common/foliage.inc.c" diff --git a/src/world/area_sam/sam_02/sam_02_3_rooms.c b/src/world/area_sam/sam_02/sam_02_3_rooms.c index 9f8f790d32..2a3a7bb427 100644 --- a/src/world/area_sam/sam_02/sam_02_3_rooms.c +++ b/src/world/area_sam/sam_02/sam_02_3_rooms.c @@ -125,40 +125,40 @@ s32 N(InteriorNPCs_ToadHouse)[] = { EvtScript N(EVS_SetupRooms) = { // left house EVT_CALL(SetGroupEnabled, MODEL_m_naiso, 0) - EVT_CALL(CreateMapRoom, - PACK_ROOM_FLAGS(VIS_GROUP_0, ROOM_DOOR_LEFT_HINGE_OPENS_OUT), - EVT_PTR(N(EVS_SetDoorRot_LeftHouse)), - EVT_PTR(N(EVS_SetWallRot_LeftHouse)), - EVT_PTR(N(EVS_DropDoor_LeftHouse)), - EVT_PTR(N(EVS_RoomListener_LeftHouse)), - COLLIDER_c_doa, - COLLIDER_o470, - MODEL_min, - EVT_PTR(N(InteriorNPCs_LeftHouse))) + EVT_CALL(CreateMapRoom, + PACK_ROOM_FLAGS(VIS_GROUP_0, ROOM_DOOR_LEFT_HINGE_OPENS_OUT), + EVT_PTR(N(EVS_SetDoorRot_LeftHouse)), + EVT_PTR(N(EVS_SetWallRot_LeftHouse)), + EVT_PTR(N(EVS_DropDoor_LeftHouse)), + EVT_PTR(N(EVS_RoomListener_LeftHouse)), + COLLIDER_c_doa, + COLLIDER_o470, + MODEL_min, + EVT_PTR(N(InteriorNPCs_LeftHouse))) // shop EVT_CALL(SetGroupEnabled, MODEL_t_naiso, 0) - EVT_CALL(CreateMapRoom, - PACK_ROOM_FLAGS(VIS_GROUP_1, ROOM_DOOR_LEFT_HINGE_OPENS_OUT), - EVT_PTR(N(EVS_SetDoorRot_Shop)), - EVT_PTR(N(EVS_SetWallRot_Shop)), - NULL, - EVT_PTR(N(EVS_RoomListener_Shop)), - COLLIDER_o382, - COLLIDER_o471, - MODEL_ten, - EVT_PTR(N(InteriorNPCs_Shop))) + EVT_CALL(CreateMapRoom, + PACK_ROOM_FLAGS(VIS_GROUP_1, ROOM_DOOR_LEFT_HINGE_OPENS_OUT), + EVT_PTR(N(EVS_SetDoorRot_Shop)), + EVT_PTR(N(EVS_SetWallRot_Shop)), + NULL, + EVT_PTR(N(EVS_RoomListener_Shop)), + COLLIDER_o382, + COLLIDER_o471, + MODEL_ten, + EVT_PTR(N(InteriorNPCs_Shop))) // toad house EVT_CALL(SetGroupEnabled, MODEL_k_naisou, 0) - EVT_CALL(CreateMapRoom, - PACK_ROOM_FLAGS(VIS_GROUP_0, ROOM_DOOR_LEFT_HINGE_OPENS_OUT), - EVT_PTR(N(EVS_SetDoorRot_ToadHouse)), - EVT_PTR(N(EVS_SetWallRot_ToadHouse)), - NULL, - EVT_PTR(N(EVS_RoomListener_ToadHouse)), - COLLIDER_k_doa, - COLLIDER_o472, - MODEL_kino, - EVT_PTR(N(InteriorNPCs_ToadHouse))) + EVT_CALL(CreateMapRoom, + PACK_ROOM_FLAGS(VIS_GROUP_0, ROOM_DOOR_LEFT_HINGE_OPENS_OUT), + EVT_PTR(N(EVS_SetDoorRot_ToadHouse)), + EVT_PTR(N(EVS_SetWallRot_ToadHouse)), + NULL, + EVT_PTR(N(EVS_RoomListener_ToadHouse)), + COLLIDER_k_doa, + COLLIDER_o472, + MODEL_kino, + EVT_PTR(N(InteriorNPCs_ToadHouse))) EVT_RETURN EVT_END }; diff --git a/src/world/area_sam/sam_02/sam_02_4_npc.c b/src/world/area_sam/sam_02/sam_02_4_npc.c index 45ed65bd7a..d473018210 100644 --- a/src/world/area_sam/sam_02/sam_02_4_npc.c +++ b/src/world/area_sam/sam_02/sam_02_4_npc.c @@ -368,38 +368,34 @@ EvtScript N(EVS_NpcInit_Penguin_07) = { EVT_END }; -StaticNpc N(NpcData_Townsfolk)[] = { +NpcData N(NpcData_Townsfolk)[] = { { .id = NPC_Penguin_ShopOwner, - .settings = &N(NpcSettings_Penguin), .pos = { 35.0f, 0.0f, -365.0f }, .yaw = 180, - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_Penguin_ShopOwner), - .drops = NPC_NO_DROPS, + .settings = &N(NpcSettings_Penguin), + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_400000, + .drops = NO_DROPS, .animations = PENGUIN_ANIMS, .tattle = MSG_NpcTattle_SAM_ShopOwner, }, { .id = NPC_ShiverToad, - .settings = &N(NpcSettings_ShiverToad), .pos = { 329.0f, 0.0f, -167.0f }, .yaw = 180, - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_ShiverToad), - .drops = NPC_NO_DROPS, + .settings = &N(NpcSettings_ShiverToad), + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_400000, + .drops = NO_DROPS, .animations = SHIVER_TOAD_RED_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT | AI_DETECT_FLAG_8, .tattle = MSG_NpcTattle_SAM02_ToadHouseToad, }, { .id = NPC_Penguin_04, - .settings = &N(NpcSettings_Penguin_Wander), .pos = { 0.0f, 0.0f, 60.0f }, .yaw = 0, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_400000, - .init = &N(EVS_NpcInit_Penguin_04), - .drops = NPC_NO_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -412,17 +408,17 @@ StaticNpc N(NpcData_Townsfolk)[] = { .detectSize = { 0 }, } }, + .init = &N(EVS_NpcInit_Penguin_04), + .settings = &N(NpcSettings_Penguin_Wander), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_400000, + .drops = NO_DROPS, .animations = PENGUIN_ANIMS, .tattle = MSG_NpcTattle_SAM_CorroboratesRumors, }, { .id = NPC_Penguin_05, - .settings = &N(NpcSettings_Penguin_Wander), .pos = { -400.0f, 0.0f, 60.0f }, .yaw = 0, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_400000, - .init = &N(EVS_NpcInit_Penguin_05), - .drops = NPC_NO_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -435,17 +431,17 @@ StaticNpc N(NpcData_Townsfolk)[] = { .detectSize = { 0 }, } }, + .init = &N(EVS_NpcInit_Penguin_05), + .settings = &N(NpcSettings_Penguin_Wander), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_400000, + .drops = NO_DROPS, .animations = PENGUIN_ANIMS, .tattle = MSG_NpcTattle_SAM_EasyGoing, }, { .id = NPC_Penguin_06, - .settings = &N(NpcSettings_Penguin_Wander), .pos = { 400.0f, 0.0f, 60.0f }, .yaw = 0, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_400000, - .init = &N(EVS_NpcInit_Penguin_06), - .drops = NPC_NO_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -458,42 +454,42 @@ StaticNpc N(NpcData_Townsfolk)[] = { .detectSize = { 0 }, } }, + .init = &N(EVS_NpcInit_Penguin_06), + .settings = &N(NpcSettings_Penguin_Wander), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_400000, + .drops = NO_DROPS, .animations = PENGUIN_ANIMS, .tattle = MSG_NpcTattle_SAM_NeverLeavesTown, }, { .id = NPC_Penguin_07, - .settings = &N(NpcSettings_Penguin), .pos = { -237.0f, 0.0f, 273.0f }, .yaw = 0, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_Penguin_07), - .drops = NPC_NO_DROPS, + .settings = &N(NpcSettings_Penguin), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_400000, + .drops = NO_DROPS, .animations = PENGUIN_ANIMS, .tattle = MSG_NpcTattle_SAM_VisitedTheDojo, }, }; -StaticNpc N(NpcData_MysteryOnly)[] = { +NpcData N(NpcData_MysteryOnly)[] = { { .id = NPC_Penguin_02, - .settings = &N(NpcSettings_Penguin), .pos = { -380.0f, 0.0f, -140.0f }, .yaw = 0, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_Penguin_02), - .drops = NPC_NO_DROPS, + .settings = &N(NpcSettings_Penguin), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_400000, + .drops = NO_DROPS, .animations = PENGUIN_ANIMS, .tattle = MSG_NpcTattle_SAM_RumorLovingPenguins, }, { .id = NPC_Penguin_03, - .settings = &N(NpcSettings_Penguin_Wander), .pos = { 200.0f, 0.0f, 60.0f }, .yaw = 0, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_400000, - .init = &N(EVS_NpcInit_Penguin_03), - .drops = NPC_NO_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -506,20 +502,24 @@ StaticNpc N(NpcData_MysteryOnly)[] = { .detectSize = { 0 }, } }, + .init = &N(EVS_NpcInit_Penguin_03), + .settings = &N(NpcSettings_Penguin_Wander), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_400000, + .drops = NO_DROPS, .animations = PENGUIN_ANIMS, .tattle = MSG_NpcTattle_SAM_NotAdventurous, }, }; -StaticNpc N(NpcData_ChuckQuizmo) = { +NpcData N(NpcData_ChuckQuizmo) = { .id = NPC_ChuckQuizmo, - .settings = &N(NpcSettings_ChuckQuizmo), .pos = { -230.0f, 0.0f, 160.0f }, .yaw = 90, - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, .initVarCount = 1, .initVar = { .bytes = { 0, QUIZ_AREA_SAM, QUIZ_COUNT_SAM, QUIZ_MAP_SAM_02 }}, - .drops = NPC_NO_DROPS, + .settings = &N(NpcSettings_ChuckQuizmo), + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, + .drops = NO_DROPS, .animations = QUIZMO_ANIMS, .tattle = MSG_NpcTattle_ChuckQuizmo, }; diff --git a/src/world/area_sam/sam_03/sam_03_3_npc1.c b/src/world/area_sam/sam_03/sam_03_3_npc1.c index fb416ff87c..18ead21b62 100644 --- a/src/world/area_sam/sam_03/sam_03_3_npc1.c +++ b/src/world/area_sam/sam_03/sam_03_3_npc1.c @@ -144,26 +144,26 @@ EvtScript N(EVS_NpcInit_JrTroopaHitbox) = { }; // first Jr Troopa is for interacting with player, the second is 'hostile' and can respond to being hit -StaticNpc N(NpcData_JrTroopa)[] = { +NpcData N(NpcData_JrTroopa)[] = { { .id = NPC_JrTroopa, - .settings = &N(NpcSettings_JrTroopa), .pos = { 261.0f, 0.0f, -76.0f }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_JrTroopa), - .drops = NPC_NO_DROPS, + .settings = &N(NpcSettings_JrTroopa), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_400000, + .drops = NO_DROPS, .animations = JR_TROOPA_ANIMS, .tattle = MSG_NpcTattle_JrTroopa, }, { .id = NPC_JrTroopa_Hitbox, - .settings = &N(NpcSettings_JrTroopa), .pos = { 261.0f, 0.0f, -76.0f }, .yaw = 270, - .flags = ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_400000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_20000000, .init = &N(EVS_NpcInit_JrTroopaHitbox), - .drops = NPC_NO_DROPS, + .settings = &N(NpcSettings_JrTroopa), + .flags = ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_400000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_20000000, + .drops = NO_DROPS, .animations = JR_TROOPA_ANIMS, .tattle = MSG_NpcTattle_JrTroopa, }, diff --git a/src/world/area_sam/sam_03/sam_03_4_npc2.c b/src/world/area_sam/sam_03/sam_03_4_npc2.c index a3b591827f..b3b51d1a47 100644 --- a/src/world/area_sam/sam_03/sam_03_4_npc2.c +++ b/src/world/area_sam/sam_03/sam_03_4_npc2.c @@ -1,15 +1,12 @@ #include "sam_03.h" -#include "world/common/enemy/complete/Gulpit.inc.c" +#include "world/common/enemy/Gulpit.inc.c" -StaticNpc N(NpcData_Gulpit_01)[] = { +NpcData N(NpcData_Gulpit_01)[] = { { .id = NPC_Gulpit_01, - .settings = &N(NpcSettings_Gulpit), .pos = { -345.0f, 0.0f, 115.0f }, .yaw = 90, - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, - .drops = GULPIT_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -22,6 +19,9 @@ StaticNpc N(NpcData_Gulpit_01)[] = { .detectSize = { 250 }, } }, + .settings = &N(NpcSettings_Gulpit), + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = GULPIT_DROPS, .animations = GULPIT_ANIMS, .extraAnimations = N(ExtraAnims_Gulpit), .aiDetectFlags = AI_DETECT_SIGHT | AI_DETECT_SENSITIVE_MOTION, @@ -29,14 +29,11 @@ StaticNpc N(NpcData_Gulpit_01)[] = { GULPIT_HITBOX(NPC_Gulpit_01_Hitbox), }; -StaticNpc N(NpcData_Gulpit_02)[] = { +NpcData N(NpcData_Gulpit_02)[] = { { .id = NPC_Gulpit_02, - .settings = &N(NpcSettings_Gulpit), .pos = { 200.0f, 0.0f, 0.0f }, .yaw = 270, - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, - .drops = GULPIT_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -49,6 +46,9 @@ StaticNpc N(NpcData_Gulpit_02)[] = { .detectSize = { 250 }, } }, + .settings = &N(NpcSettings_Gulpit), + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = GULPIT_DROPS, .animations = GULPIT_ANIMS, .extraAnimations = N(ExtraAnims_Gulpit), .aiDetectFlags = AI_DETECT_SIGHT | AI_DETECT_SENSITIVE_MOTION, diff --git a/src/world/area_sam/sam_04/sam_04_4_npc.c b/src/world/area_sam/sam_04/sam_04_4_npc.c index 404834673f..5d7eae2446 100644 --- a/src/world/area_sam/sam_04/sam_04_4_npc.c +++ b/src/world/area_sam/sam_04/sam_04_4_npc.c @@ -219,83 +219,83 @@ EvtScript N(EVS_NpcInit_Dummy) = { EVT_END }; -StaticNpc N(NpcData_Snowmen)[] = { +NpcData N(NpcData_Snowmen)[] = { { .id = NPC_Snowman_01, - .settings = &N(NpcSettings_Snowman), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_Snowman_01), - .drops = NPC_NO_DROPS, + .settings = &N(NpcSettings_Snowman), + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_400000, + .drops = NO_DROPS, .animations = PENGUIN_ANIMS, .tattle = MSG_NpcTattle_Snowman, }, { .id = NPC_Snowman_02, - .settings = &N(NpcSettings_Snowman), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_Snowman_02), - .drops = NPC_NO_DROPS, + .settings = &N(NpcSettings_Snowman), + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_400000, + .drops = NO_DROPS, .animations = PENGUIN_ANIMS, .tattle = MSG_NpcTattle_Snowman, }, { .id = NPC_Snowman_03, - .settings = &N(NpcSettings_Snowman), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_Snowman_03), - .drops = NPC_NO_DROPS, + .settings = &N(NpcSettings_Snowman), + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_400000, + .drops = NO_DROPS, .animations = PENGUIN_ANIMS, .tattle = MSG_NpcTattle_Snowman, }, { .id = NPC_Snowman_04, - .settings = &N(NpcSettings_Snowman), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_Snowman_04), - .drops = NPC_NO_DROPS, + .settings = &N(NpcSettings_Snowman), + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_400000, + .drops = NO_DROPS, .animations = PENGUIN_ANIMS, .tattle = MSG_NpcTattle_Snowman, }, { .id = NPC_Snowman_05, - .settings = &N(NpcSettings_Snowman), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_Snowman_05), - .drops = NPC_NO_DROPS, + .settings = &N(NpcSettings_Snowman), + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_400000, + .drops = NO_DROPS, .animations = PENGUIN_ANIMS, .tattle = MSG_NpcTattle_Snowman, }, { .id = NPC_Snowman_06, - .settings = &N(NpcSettings_Snowman), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_Snowman_06), - .drops = NPC_NO_DROPS, + .settings = &N(NpcSettings_Snowman), + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_400000, + .drops = NO_DROPS, .animations = PENGUIN_ANIMS, .tattle = MSG_NpcTattle_Snowman, }, }; -StaticNpc N(NpcData_Dummy) = { +NpcData N(NpcData_Dummy) = { .id = NPC_LetterDummy, - .settings = &N(NpcSettings_Snowman), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_4000 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_Dummy), - .drops = NPC_NO_DROPS, + .settings = &N(NpcSettings_Snowman), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_4000 | ENEMY_FLAG_400000, + .drops = NO_DROPS, .animations = PENGUIN_ANIMS, }; diff --git a/src/world/area_sam/sam_05/sam_05_4_npc.c b/src/world/area_sam/sam_05/sam_05_4_npc.c index 7193fc4fcc..c333f8cb1f 100644 --- a/src/world/area_sam/sam_05/sam_05_4_npc.c +++ b/src/world/area_sam/sam_05/sam_05_4_npc.c @@ -11,8 +11,8 @@ NpcSettings N(NpcSettings_Monstar) = { #include "world/common/npc/Twink.inc.c" -#include "world/common/enemy/complete/Gulpit.inc.c" -#include "world/common/enemy/complete/FrostPiranha.inc.c" +#include "world/common/enemy/Gulpit.inc.c" +#include "world/common/enemy/FrostPiranha.inc.c" EvtScript N(EVS_NpcAI_Monstar) = { EVT_LABEL(0) @@ -150,7 +150,7 @@ EvtScript N(EVS_NpcInit_StarKid) = { EVT_END }; -s32 N(ExtraAnims_Monstar)[] = { +AnimID N(ExtraAnims_Monstar)[] = { ANIM_Monstar_Still, ANIM_Monstar_Idle1, ANIM_Monstar_Hurt, @@ -159,21 +159,17 @@ s32 N(ExtraAnims_Monstar)[] = { ANIM_Monstar_Flail, ANIM_Monstar_HappyRearUp, ANIM_Monstar_RearUp, - -1 + ANIM_LIST_END }; -StaticNpc N(NpcData_Monstar) = { +NpcData N(NpcData_Monstar) = { .id = NPC_Monstar, - .settings = &N(NpcSettings_Monstar), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000, .init = &N(EVS_NpcInit_Monstar), - .drops = { - .dropFlags = NPC_DROP_FLAG_80, - .heartDrops = NO_DROPS, - .flowerDrops = NO_DROPS, - }, + .settings = &N(NpcSettings_Monstar), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000, + .drops = NO_DROPS, .animations = { .idle = ANIM_Monstar_Idle1, .walk = ANIM_Monstar_Idle1, @@ -195,201 +191,198 @@ StaticNpc N(NpcData_Monstar) = { .extraAnimations = N(ExtraAnims_Monstar), }; -s32 N(ExtraAnims_StarKid)[] = { +AnimID N(ExtraAnims_StarKid)[] = { ANIM_Twink_Idle, ANIM_Twink_Fly, ANIM_Twink_Angry, ANIM_Twink_Shout, - -1 + ANIM_LIST_END }; -StaticNpc N(NpcData_StarKids)[] = { +NpcData N(NpcData_StarKids)[] = { { .id = NPC_StarKid_01, - .settings = &N(NpcSettings_Twink), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 90, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_StarKid), - .drops = NPC_NO_DROPS, + .settings = &N(NpcSettings_Twink), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = NO_DROPS, .animations = TWINK_ANIMS, .extraAnimations = N(ExtraAnims_StarKid), }, { .id = NPC_StarKid_02, - .settings = &N(NpcSettings_Twink), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 90, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_StarKid), - .drops = NPC_NO_DROPS, + .settings = &N(NpcSettings_Twink), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = NO_DROPS, .animations = TWINK_ANIMS, .extraAnimations = N(ExtraAnims_StarKid), }, { .id = NPC_StarKid_03, - .settings = &N(NpcSettings_Twink), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 90, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_StarKid), - .drops = NPC_NO_DROPS, + .settings = &N(NpcSettings_Twink), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = NO_DROPS, .animations = TWINK_ANIMS, .extraAnimations = N(ExtraAnims_StarKid), }, { .id = NPC_StarKid_04, - .settings = &N(NpcSettings_Twink), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 90, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_StarKid), - .drops = NPC_NO_DROPS, + .settings = &N(NpcSettings_Twink), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = NO_DROPS, .animations = TWINK_ANIMS, .extraAnimations = N(ExtraAnims_StarKid), }, { .id = NPC_StarKid_05, - .settings = &N(NpcSettings_Twink), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 90, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_StarKid), - .drops = NPC_NO_DROPS, + .settings = &N(NpcSettings_Twink), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = NO_DROPS, .animations = TWINK_ANIMS, .extraAnimations = N(ExtraAnims_StarKid), }, { .id = NPC_StarKid_06, - .settings = &N(NpcSettings_Twink), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 90, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_StarKid), - .drops = NPC_NO_DROPS, + .settings = &N(NpcSettings_Twink), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = NO_DROPS, .animations = TWINK_ANIMS, .extraAnimations = N(ExtraAnims_StarKid), }, { .id = NPC_StarKid_07, - .settings = &N(NpcSettings_Twink), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 90, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_StarKid), - .drops = NPC_NO_DROPS, + .settings = &N(NpcSettings_Twink), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = NO_DROPS, .animations = TWINK_ANIMS, .extraAnimations = N(ExtraAnims_StarKid), }, { .id = NPC_StarKid_08, - .settings = &N(NpcSettings_Twink), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 90, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_StarKid), - .drops = NPC_NO_DROPS, + .settings = &N(NpcSettings_Twink), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = NO_DROPS, .animations = TWINK_ANIMS, .extraAnimations = N(ExtraAnims_StarKid), }, { .id = NPC_StarKid_09, - .settings = &N(NpcSettings_Twink), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 90, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_StarKid), - .drops = NPC_NO_DROPS, + .settings = &N(NpcSettings_Twink), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = NO_DROPS, .animations = TWINK_ANIMS, .extraAnimations = N(ExtraAnims_StarKid), }, { .id = NPC_StarKid_10, - .settings = &N(NpcSettings_Twink), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 90, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_StarKid), - .drops = NPC_NO_DROPS, + .settings = &N(NpcSettings_Twink), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = NO_DROPS, .animations = TWINK_ANIMS, .extraAnimations = N(ExtraAnims_StarKid), }, { .id = NPC_StarKid_11, - .settings = &N(NpcSettings_Twink), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 90, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_StarKid), - .drops = NPC_NO_DROPS, + .settings = &N(NpcSettings_Twink), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = NO_DROPS, .animations = TWINK_ANIMS, .extraAnimations = N(ExtraAnims_StarKid), }, { .id = NPC_StarKid_12, - .settings = &N(NpcSettings_Twink), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 90, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_StarKid), - .drops = NPC_NO_DROPS, + .settings = &N(NpcSettings_Twink), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = NO_DROPS, .animations = TWINK_ANIMS, .extraAnimations = N(ExtraAnims_StarKid), }, { .id = NPC_StarKid_13, - .settings = &N(NpcSettings_Twink), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 90, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_StarKid), - .drops = NPC_NO_DROPS, + .settings = &N(NpcSettings_Twink), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = NO_DROPS, .animations = TWINK_ANIMS, .extraAnimations = N(ExtraAnims_StarKid), }, { .id = NPC_StarKid_14, - .settings = &N(NpcSettings_Twink), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 90, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_StarKid), - .drops = NPC_NO_DROPS, + .settings = &N(NpcSettings_Twink), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = NO_DROPS, .animations = TWINK_ANIMS, .extraAnimations = N(ExtraAnims_StarKid), }, { .id = NPC_StarKid_15, - .settings = &N(NpcSettings_Twink), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 90, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_StarKid), - .drops = NPC_NO_DROPS, + .settings = &N(NpcSettings_Twink), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = NO_DROPS, .animations = TWINK_ANIMS, .extraAnimations = N(ExtraAnims_StarKid), }, { .id = NPC_StarKid_16, - .settings = &N(NpcSettings_Twink), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 90, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_StarKid), - .drops = NPC_NO_DROPS, + .settings = &N(NpcSettings_Twink), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = NO_DROPS, .animations = TWINK_ANIMS, .extraAnimations = N(ExtraAnims_StarKid), }, }; -StaticNpc N(NpcData_Gulpit)[] = { +NpcData N(NpcData_Gulpit)[] = { { .id = NPC_Gulpit, - .settings = &N(NpcSettings_Gulpit), .pos = { -75.0f, 0.0f, 0.0f }, .yaw = 270, - .flags = ENEMY_FLAG_400, - .drops = GULPIT_DROPS, .territory = { .wander = { .isFlying = FALSE, @@ -402,6 +395,9 @@ StaticNpc N(NpcData_Gulpit)[] = { .detectSize = { 200 }, } }, + .settings = &N(NpcSettings_Gulpit), + .flags = ENEMY_FLAG_400, + .drops = GULPIT_DROPS, .animations = GULPIT_ANIMS, .extraAnimations = N(ExtraAnims_Gulpit), .aiDetectFlags = AI_DETECT_SIGHT | AI_DETECT_SENSITIVE_MOTION, @@ -409,14 +405,11 @@ StaticNpc N(NpcData_Gulpit)[] = { GULPIT_HITBOX(NPC_Gulpit_Hitbox), }; -StaticNpc N(NpcData_FrostPiranha_01)[] = { +NpcData N(NpcData_FrostPiranha_01)[] = { { .id = NPC_FrostPiranha_01, - .settings = &N(NpcSettings_FrostPiranha), .pos = { 100.0f, 0.0f, 50.0f }, .yaw = 90, - .flags = ENEMY_FLAG_400, - .drops = FROST_PIRANHA_DROPS, .territory = { .wander = { .isFlying = FALSE, @@ -429,6 +422,9 @@ StaticNpc N(NpcData_FrostPiranha_01)[] = { .detectSize = { 200 }, } }, + .settings = &N(NpcSettings_FrostPiranha), + .flags = ENEMY_FLAG_400, + .drops = FROST_PIRANHA_DROPS, .animations = FROST_PIRANHA_ANIMS, .extraAnimations = N(ExtraAnims_FrostPiranha), .aiDetectFlags = AI_DETECT_SIGHT | AI_DETECT_SENSITIVE_MOTION, @@ -436,14 +432,11 @@ StaticNpc N(NpcData_FrostPiranha_01)[] = { FROST_PIRANHA_HITBOX(NPC_FrostPiranha_01_Hitbox), }; -StaticNpc N(NpcData_FrostPiranha_02)[] = { +NpcData N(NpcData_FrostPiranha_02)[] = { { .id = NPC_FrostPiranha_02, - .settings = &N(NpcSettings_FrostPiranha), .pos = { -400.0f, 0.0f, 0.0f }, .yaw = 90, - .flags = ENEMY_FLAG_400, - .drops = FROST_PIRANHA_DROPS, .territory = { .wander = { .isFlying = FALSE, @@ -456,6 +449,9 @@ StaticNpc N(NpcData_FrostPiranha_02)[] = { .detectSize = { 200 }, } }, + .settings = &N(NpcSettings_FrostPiranha), + .flags = ENEMY_FLAG_400, + .drops = FROST_PIRANHA_DROPS, .animations = FROST_PIRANHA_ANIMS, .extraAnimations = N(ExtraAnims_FrostPiranha), .aiDetectFlags = AI_DETECT_SIGHT | AI_DETECT_SENSITIVE_MOTION, diff --git a/src/world/area_sam/sam_06/sam_06_2_main.c b/src/world/area_sam/sam_06/sam_06_2_main.c index c6d1beea9c..51fd1bb07b 100644 --- a/src/world/area_sam/sam_06/sam_06_2_main.c +++ b/src/world/area_sam/sam_06/sam_06_2_main.c @@ -2,7 +2,6 @@ #include "effects.h" #include "world/common/atomic/TexturePan.inc.c" -#include "world/common/atomic/TexturePan.data.inc.c" #include "common/foliage.inc.c" diff --git a/src/world/area_sam/sam_06/sam_06_4_npc.c b/src/world/area_sam/sam_06/sam_06_4_npc.c index 6ae54d52cd..315551dd68 100644 --- a/src/world/area_sam/sam_06/sam_06_4_npc.c +++ b/src/world/area_sam/sam_06/sam_06_4_npc.c @@ -887,19 +887,15 @@ EvtScript N(EVS_NpcInit_ShiverToad_04) = { EVT_END }; -StaticNpc N(NpcData_Merle)[] = { +NpcData N(NpcData_Merle)[] = { { .id = NPC_Merle, - .settings = &N(NpcSettings_Toad_Stationary), .pos = { 0.0f, 90.0f, -300.0f }, .yaw = 0, - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_Merle), - .drops = { - .dropFlags = NPC_DROP_FLAG_80, - .heartDrops = NO_DROPS, - .flowerDrops = NO_DROPS, - }, + .settings = &N(NpcSettings_Toad_Stationary), + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_400000, + .drops = NO_DROPS, .animations = { .idle = ANIM_Merle_Idle, .walk = ANIM_Merle_Idle, @@ -922,16 +918,12 @@ StaticNpc N(NpcData_Merle)[] = { }, { .id = NPC_ShiverToad_01, - .settings = &N(NpcSettings_ShiverToad_Stationary), .pos = { -376.0f, 60.0f, 112.0f }, .yaw = 0, - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_ShiverToad_01), - .drops = { - .dropFlags = NPC_DROP_FLAG_80, - .heartDrops = NO_DROPS, - .flowerDrops = NO_DROPS, - }, + .settings = &N(NpcSettings_ShiverToad_Stationary), + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, + .drops = NO_DROPS, .animations = { .idle = ANIM_ShiverToad_Red_Idle, .walk = ANIM_ShiverToad_Red_Walk, @@ -954,16 +946,8 @@ StaticNpc N(NpcData_Merle)[] = { }, { .id = NPC_ShiverToad_02, - .settings = &N(NpcSettings_ShiverToad_Wander), .pos = { 208.0f, 80.0f, 150.0f }, .yaw = 180, - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, - .init = &N(EVS_NpcInit_ShiverToad_02), - .drops = { - .dropFlags = NPC_DROP_FLAG_80, - .heartDrops = NO_DROPS, - .flowerDrops = NO_DROPS, - }, .territory = { .wander = { .isFlying = TRUE, @@ -976,6 +960,10 @@ StaticNpc N(NpcData_Merle)[] = { .detectSize = { 0 }, } }, + .init = &N(EVS_NpcInit_ShiverToad_02), + .settings = &N(NpcSettings_ShiverToad_Wander), + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, + .drops = NO_DROPS, .animations = { .idle = ANIM_ShiverToad_Blue_Idle, .walk = ANIM_ShiverToad_Blue_Walk, @@ -998,16 +986,12 @@ StaticNpc N(NpcData_Merle)[] = { }, { .id = NPC_ShiverToad_03, - .settings = &N(NpcSettings_ShiverToad_Stationary), .pos = { 127.0f, 0.0f, 445.0f }, .yaw = 180, - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_ShiverToad_03), - .drops = { - .dropFlags = NPC_DROP_FLAG_80, - .heartDrops = NO_DROPS, - .flowerDrops = NO_DROPS, - }, + .settings = &N(NpcSettings_ShiverToad_Stationary), + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, + .drops = NO_DROPS, .animations = { .idle = ANIM_ShiverToad_Green_Idle, .walk = ANIM_ShiverToad_Green_Walk, @@ -1030,16 +1014,8 @@ StaticNpc N(NpcData_Merle)[] = { }, { .id = NPC_Ninji_01, - .settings = &N(NpcSettings_Ninji_Wander), .pos = { -99.0f, 90.0f, -90.0f }, .yaw = 0, - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, - .init = &N(EVS_NpcInit_Ninji_01), - .drops = { - .dropFlags = NPC_DROP_FLAG_80, - .heartDrops = NO_DROPS, - .flowerDrops = NO_DROPS, - }, .territory = { .wander = { .isFlying = TRUE, @@ -1052,6 +1028,10 @@ StaticNpc N(NpcData_Merle)[] = { .detectSize = { 0 }, } }, + .init = &N(EVS_NpcInit_Ninji_01), + .settings = &N(NpcSettings_Ninji_Wander), + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, + .drops = NO_DROPS, .animations = { .idle = ANIM_Ninji_Idle, .walk = ANIM_Ninji_Walk, @@ -1074,16 +1054,8 @@ StaticNpc N(NpcData_Merle)[] = { }, { .id = NPC_Ninji_02, - .settings = &N(NpcSettings_Ninji_Wander), .pos = { -48.0f, 0.0f, 400.0f }, .yaw = 180, - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, - .init = &N(EVS_NpcInit_Ninji_02), - .drops = { - .dropFlags = NPC_DROP_FLAG_80, - .heartDrops = NO_DROPS, - .flowerDrops = NO_DROPS, - }, .territory = { .wander = { .isFlying = TRUE, @@ -1096,6 +1068,10 @@ StaticNpc N(NpcData_Merle)[] = { .detectSize = { 0 }, } }, + .init = &N(EVS_NpcInit_Ninji_02), + .settings = &N(NpcSettings_Ninji_Wander), + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, + .drops = NO_DROPS, .animations = { .idle = ANIM_Ninji_Idle, .walk = ANIM_Ninji_Walk, @@ -1118,16 +1094,12 @@ StaticNpc N(NpcData_Merle)[] = { }, { .id = NPC_Ninji_03, - .settings = &N(NpcSettings_Ninji_Stationary), .pos = { 239.0f, 50.0f, 315.0f }, .yaw = 180, - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_Ninji_03), - .drops = { - .dropFlags = NPC_DROP_FLAG_80, - .heartDrops = NO_DROPS, - .flowerDrops = NO_DROPS, - }, + .settings = &N(NpcSettings_Ninji_Stationary), + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, + .drops = NO_DROPS, .animations = { .idle = ANIM_Ninji_Idle, .walk = ANIM_Ninji_Walk, @@ -1150,16 +1122,12 @@ StaticNpc N(NpcData_Merle)[] = { }, { .id = NPC_Ninji_04, - .settings = &N(NpcSettings_Ninji_Stationary), .pos = { 390.0f, 80.0f, 50.0f }, .yaw = 0, - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_Ninji_04), - .drops = { - .dropFlags = NPC_DROP_FLAG_80, - .heartDrops = NO_DROPS, - .flowerDrops = NO_DROPS, - }, + .settings = &N(NpcSettings_Ninji_Stationary), + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, + .drops = NO_DROPS, .animations = { .idle = ANIM_Ninji_Idle, .walk = ANIM_Ninji_Walk, @@ -1182,12 +1150,8 @@ StaticNpc N(NpcData_Merle)[] = { }, { .id = NPC_StarKid_01, - .settings = &N(NpcSettings_StarKid_Wander), .pos = { -166.0f, 10.0f, 390.0f }, .yaw = 180, - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_400000, - .init = &N(EVS_NpcInit_StarKid_01), - .drops = STAR_KID_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -1200,76 +1164,76 @@ StaticNpc N(NpcData_Merle)[] = { .detectSize = { 0 }, } }, + .init = &N(EVS_NpcInit_StarKid_01), + .settings = &N(NpcSettings_StarKid_Wander), + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_400000, + .drops = NO_DROPS, .animations = STAR_KID_ANIMS, .tattle = MSG_NpcTattle_SAM_StarKidA, }, { .id = NPC_StarKid_02, - .settings = &N(NpcSettings_StarKid), .pos = { 3.0f, 60.0f, 137.0f }, .yaw = 180, - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_StarKid_02), - .drops = STAR_KID_DROPS, + .settings = &N(NpcSettings_StarKid), + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_400000, + .drops = NO_DROPS, .animations = STAR_KID_ANIMS, .tattle = MSG_NpcTattle_SAM_StarKidB, }, { .id = NPC_StarKid_03, - .settings = &N(NpcSettings_StarKid), .pos = { 120.0f, 100.0f, -210.0f }, .yaw = 0, - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_StarKid_03), - .drops = STAR_KID_DROPS, + .settings = &N(NpcSettings_StarKid), + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_400000, + .drops = NO_DROPS, .animations = STAR_KID_ANIMS, .tattle = MSG_NpcTattle_SAM_PranksterStarKid, }, { .id = NPC_StarKid_04, - .settings = &N(NpcSettings_StarKid), .pos = { 369.0f, 90.0f, 9.0f }, .yaw = 180, - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_StarKid_04), - .drops = STAR_KID_DROPS, + .settings = &N(NpcSettings_StarKid), + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_400000, + .drops = NO_DROPS, .animations = STAR_KID_ANIMS, .tattle = MSG_NpcTattle_SAM_BabyStarKid, }, { .id = NPC_StarKid_05, - .settings = &N(NpcSettings_StarKid), .pos = { 405.0f, 90.0f, -19.0f }, .yaw = 180, - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_StarKid_05), - .drops = STAR_KID_DROPS, + .settings = &N(NpcSettings_StarKid), + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_400000, + .drops = NO_DROPS, .animations = STAR_KID_ANIMS, .tattle = MSG_NpcTattle_SAM_StarKidC, }, { .id = NPC_StarKid_06, - .settings = &N(NpcSettings_StarKid), .pos = { 364.0f, 90.0f, -47.0f }, .yaw = 180, - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_StarKid_06), - .drops = STAR_KID_DROPS, + .settings = &N(NpcSettings_StarKid), + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_400000, + .drops = NO_DROPS, .animations = STAR_KID_ANIMS, .tattle = MSG_NpcTattle_SAM_StarKidD, }, { .id = NPC_ShiverToad_04, - .settings = &N(NpcSettings_ShiverToad_Stationary), .pos = { -274.0f, 60.0f, -28.0f }, .yaw = 180, - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_ShiverToad_04), - .drops = { - .dropFlags = NPC_DROP_FLAG_80, - .heartDrops = NO_DROPS, - .flowerDrops = NO_DROPS, - }, + .settings = &N(NpcSettings_ShiverToad_Stationary), + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, + .drops = NO_DROPS, .animations = { .idle = ANIM_ShiverToad_Red_Idle, .walk = ANIM_ShiverToad_Red_Walk, diff --git a/src/world/area_sam/sam_07/sam_07.h b/src/world/area_sam/sam_07/sam_07.h index bde177fb0d..732aa0cd5a 100644 --- a/src/world/area_sam/sam_07/sam_07.h +++ b/src/world/area_sam/sam_07/sam_07.h @@ -13,12 +13,12 @@ #include "sprite/npc/LargePiranha.h" enum { - NPC_Gulpit = 0, - NPC_Gulpit_Hitbox = 1, - NPC_FrostPiranha_01 = 2, - NPC_FrostPiranha_01_Hitbox = 3, - NPC_FrostPiranha_02 = 4, - NPC_FrostPiranha_02_Hitbox = 5, + NPC_Gulpit = 0, + NPC_Gulpit_Hitbox = 1, + NPC_FrostPiranha_01 = 2, + NPC_FrostPiranha_01_Hitbox = 3, + NPC_FrostPiranha_02 = 4, + NPC_FrostPiranha_02_Hitbox = 5, }; enum { diff --git a/src/world/area_sam/sam_07/sam_07_5_npc.c b/src/world/area_sam/sam_07/sam_07_5_npc.c index cc04fbc637..887e3660d7 100644 --- a/src/world/area_sam/sam_07/sam_07_5_npc.c +++ b/src/world/area_sam/sam_07/sam_07_5_npc.c @@ -1,16 +1,13 @@ #include "sam_07.h" -#include "world/common/enemy/complete/Gulpit.inc.c" -#include "world/common/enemy/complete/FrostPiranha.inc.c" +#include "world/common/enemy/Gulpit.inc.c" +#include "world/common/enemy/FrostPiranha.inc.c" -StaticNpc N(NpcData_Gulpit)[] = { +NpcData N(NpcData_Gulpit)[] = { { .id = NPC_Gulpit, - .settings = &N(NpcSettings_Gulpit), .pos = { -500.0f, -150.0f, -75.0f }, .yaw = 270, - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, - .drops = GULPIT_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -23,20 +20,20 @@ StaticNpc N(NpcData_Gulpit)[] = { .detectSize = { 200 }, } }, + .settings = &N(NpcSettings_Gulpit), + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = GULPIT_DROPS, .animations = GULPIT_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT | AI_DETECT_SENSITIVE_MOTION, }, GULPIT_HITBOX(NPC_Gulpit_Hitbox), }; -StaticNpc N(NpcData_FrostPiranha_01)[] = { +NpcData N(NpcData_FrostPiranha_01)[] = { { .id = NPC_FrostPiranha_01, - .settings = &N(NpcSettings_FrostPiranha), .pos = { 250.0f, 120.0f, -75.0f }, .yaw = 270, - .flags = ENEMY_FLAG_400, - .drops = FROST_PIRANHA_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -49,20 +46,20 @@ StaticNpc N(NpcData_FrostPiranha_01)[] = { .detectSize = { 260, 65 }, } }, + .settings = &N(NpcSettings_FrostPiranha), + .flags = ENEMY_FLAG_400, + .drops = FROST_PIRANHA_DROPS, .animations = FROST_PIRANHA_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT | AI_DETECT_SENSITIVE_MOTION, }, FROST_PIRANHA_HITBOX(NPC_FrostPiranha_01_Hitbox), }; -StaticNpc N(NpcData_FrostPiranha_02)[] = { +NpcData N(NpcData_FrostPiranha_02)[] = { { .id = NPC_FrostPiranha_02, - .settings = &N(NpcSettings_FrostPiranha), .pos = { 400.0f, 120.0f, -75.0f }, .yaw = 270, - .flags = ENEMY_FLAG_400, - .drops = FROST_PIRANHA_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -75,6 +72,9 @@ StaticNpc N(NpcData_FrostPiranha_02)[] = { .detectSize = { 260, 65 }, } }, + .settings = &N(NpcSettings_FrostPiranha), + .flags = ENEMY_FLAG_400, + .drops = FROST_PIRANHA_DROPS, .animations = FROST_PIRANHA_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT | AI_DETECT_SENSITIVE_MOTION, }, diff --git a/src/world/area_sam/sam_08/sam_08_4_npc.c b/src/world/area_sam/sam_08/sam_08_4_npc.c index 7ef628fe1b..a092d73af9 100644 --- a/src/world/area_sam/sam_08/sam_08_4_npc.c +++ b/src/world/area_sam/sam_08/sam_08_4_npc.c @@ -15,7 +15,7 @@ NpcSettings N(NpcSettings_Duplighost) = { }; #define INCLUDE_FROST_CLUBBA_WANDER -#include "world/common/enemy/complete/FrostClubba_Multi.inc.c" +#include "world/common/enemy/FrostClubba_Multi.inc.c" EvtScript N(EVS_NpcInteract_TrueKooperA) = { EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_WorldKooper_Talk, ANIM_WorldKooper_Idle, 0, MSG_CH7_012B) @@ -123,19 +123,15 @@ EvtScript N(EVS_NpcInit_Duplighost) = { EVT_END }; -StaticNpc N(NpcData_Ambush)[] = { +NpcData N(NpcData_Ambush)[] = { { .id = NPC_Kooper_01A, - .settings = &N(NpcSettings_Kooper), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_40000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS, .init = &N(EVS_NpcInit_TrueKooperA), - .drops = { - .dropFlags = NPC_DROP_FLAG_80, - .heartDrops = NO_DROPS, - .flowerDrops = NO_DROPS, - }, + .settings = &N(NpcSettings_Kooper), + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_40000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS, + .drops = NO_DROPS, .animations = { .idle = ANIM_WorldKooper_Idle, .walk = ANIM_WorldKooper_Walk, @@ -157,16 +153,12 @@ StaticNpc N(NpcData_Ambush)[] = { }, { .id = NPC_Kooper_02A, - .settings = &N(NpcSettings_Kooper), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_40000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS, .init = &N(EVS_NpcInit_RealKooperA), - .drops = { - .dropFlags = NPC_DROP_FLAG_80, - .heartDrops = NO_DROPS, - .flowerDrops = NO_DROPS, - }, + .settings = &N(NpcSettings_Kooper), + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_40000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS, + .drops = NO_DROPS, .animations = { .idle = ANIM_WorldKooper_Idle, .walk = ANIM_WorldKooper_Walk, @@ -188,16 +180,12 @@ StaticNpc N(NpcData_Ambush)[] = { }, { .id = NPC_Duplighost, - .settings = &N(NpcSettings_Duplighost), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_40000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS, .init = &N(EVS_NpcInit_Duplighost), - .drops = { - .dropFlags = NPC_DROP_FLAG_80, - .heartDrops = NO_DROPS, - .flowerDrops = NO_DROPS, - }, + .settings = &N(NpcSettings_Duplighost), + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_40000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS, + .drops = NO_DROPS, .animations = { .idle = ANIM_Duplighost_Anim02, .walk = ANIM_Duplighost_Anim03, @@ -263,19 +251,15 @@ EvtScript N(EVS_NpcInit_FakeKooperB) = { EVT_END }; -StaticNpc N(NpcData_Hittable)[] = { +NpcData N(NpcData_Hittable)[] = { { .id = NPC_Kooper_01B, - .settings = &N(NpcSettings_Kooper), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_4000 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, .init = &N(EVS_NpcInit_TrueKooperB), - .drops = { - .dropFlags = NPC_DROP_FLAG_80, - .heartDrops = NO_DROPS, - .flowerDrops = NO_DROPS, - }, + .settings = &N(NpcSettings_Kooper), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_4000 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, + .drops = NO_DROPS, .animations = { .idle = ANIM_WorldKooper_Idle, .walk = ANIM_WorldKooper_Walk, @@ -297,16 +281,12 @@ StaticNpc N(NpcData_Hittable)[] = { }, { .id = NPC_Kooper_02B, - .settings = &N(NpcSettings_Kooper), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_4000 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, .init = &N(EVS_NpcInit_FakeKooperB), - .drops = { - .dropFlags = NPC_DROP_FLAG_80, - .heartDrops = NO_DROPS, - .flowerDrops = NO_DROPS, - }, + .settings = &N(NpcSettings_Kooper), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_4000 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, + .drops = NO_DROPS, .animations = { .idle = ANIM_WorldKooper_Idle, .walk = ANIM_WorldKooper_Walk, @@ -328,14 +308,11 @@ StaticNpc N(NpcData_Hittable)[] = { }, }; -StaticNpc N(NpcData_FrostClubba)[] = { +NpcData N(NpcData_FrostClubba)[] = { { .id = NPC_Clubba_01, - .settings = &N(NpcSettings_FrostClubba_Wander), .pos = { -450.0f, 0.0f, -90.0f }, .yaw = 270, - .flags = ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, - .drops = FROST_CLUBBA_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -348,6 +325,9 @@ StaticNpc N(NpcData_FrostClubba)[] = { .detectSize = { 200 }, } }, + .settings = &N(NpcSettings_FrostClubba_Wander), + .flags = ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .drops = FROST_CLUBBA_DROPS, .animations = FROST_CLUBBA_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT | AI_DETECT_SENSITIVE_MOTION, }, diff --git a/src/world/area_sam/sam_10/sam_10_5_npc.c b/src/world/area_sam/sam_10/sam_10_5_npc.c index f2e172cfd0..5ffea95c99 100644 --- a/src/world/area_sam/sam_10/sam_10_5_npc.c +++ b/src/world/area_sam/sam_10/sam_10_5_npc.c @@ -1,16 +1,13 @@ #include "sam_10.h" #define INCLUDE_FROST_CLUBBA_WANDER -#include "world/common/enemy/complete/FrostClubba_Multi.inc.c" +#include "world/common/enemy/FrostClubba_Multi.inc.c" -StaticNpc N(NpcData_Clubba)[] = { +NpcData N(NpcData_Clubba)[] = { { .id = NPC_FrostClubba, - .settings = &N(NpcSettings_FrostClubba_Wander), .pos = { 575.0f, 480.0f, -50.0f }, .yaw = 270, - .flags = ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, - .drops = FROST_CLUBBA_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -23,6 +20,9 @@ StaticNpc N(NpcData_Clubba)[] = { .detectSize = { 200 }, } }, + .settings = &N(NpcSettings_FrostClubba_Wander), + .flags = ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .drops = FROST_CLUBBA_DROPS, .animations = FROST_CLUBBA_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT | AI_DETECT_SENSITIVE_MOTION, }, diff --git a/src/world/area_sam/sam_11/sam_11_5_npc.c b/src/world/area_sam/sam_11/sam_11_5_npc.c index 48f8178884..f91b67adb3 100644 --- a/src/world/area_sam/sam_11/sam_11_5_npc.c +++ b/src/world/area_sam/sam_11/sam_11_5_npc.c @@ -541,70 +541,66 @@ EvtScript N(EVS_NpcInit_Toadette_03) = { EVT_END }; -StaticNpc N(NpcData_Townsfolk)[] = { +NpcData N(NpcData_Townsfolk)[] = { { .id = NPC_PenguinPatrol, - .settings = &N(NpcSettings_Penguin), .pos = { -275.0f, 0.0f, 100.0f }, .yaw = 0, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_PenguinPatrol), - .drops = NPC_NO_DROPS, + .settings = &N(NpcSettings_Penguin), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_400000, + .drops = NO_DROPS, .animations = PENGUIN_PATROL_ANIMS, .tattle = MSG_NpcTattle_SAM_Patrol, }, { .id = NPC_PenguinSentry, - .settings = &N(NpcSettings_Penguin), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 180, - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_PenguinSentry), - .drops = NPC_NO_DROPS, + .settings = &N(NpcSettings_Penguin), + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_400000, + .drops = NO_DROPS, .animations = PENGUIN_ANIMS, .tattle = MSG_NpcTattle_SAM_Gatekeeper, }, { .id = NPC_Herringway, - .settings = &N(NpcSettings_Penguin), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_Herringway), - .drops = NPC_NO_DROPS, + .settings = &N(NpcSettings_Penguin), + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_400000, + .drops = NO_DROPS, .animations = HERRINGWAY_ANIMS, .tattle = MSG_NpcTattle_Herringway, }, { .id = NPC_Penguin_04, - .settings = &N(NpcSettings_Penguin), .pos = { 200.0f, 0.0f, -110.0f }, .yaw = 0, - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_Penguin_04), - .drops = NPC_NO_DROPS, + .settings = &N(NpcSettings_Penguin), + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_400000, + .drops = NO_DROPS, .animations = PENGUIN_ANIMS, .tattle = MSG_NpcTattle_SAM_WarehouseGuard, }, { .id = NPC_Penguin_05, - .settings = &N(NpcSettings_Penguin), .pos = { -200.0f, 0.0f, -110.0f }, .yaw = 0, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_Penguin_05), - .drops = NPC_NO_DROPS, + .settings = &N(NpcSettings_Penguin), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_400000, + .drops = NO_DROPS, .animations = PENGUIN_ANIMS, .tattle = MSG_NpcTattle_SAM_HerringwayLoiterer, }, { .id = NPC_Penguin_06, - .settings = &N(NpcSettings_Penguin_Wander), .pos = { 330.0f, 0.0f, 300.0f }, .yaw = 0, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_400000, - .init = &N(EVS_NpcInit_Penguin_06), - .drops = NPC_NO_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -617,20 +613,20 @@ StaticNpc N(NpcData_Townsfolk)[] = { .detectSize = { 0 }, } }, + .init = &N(EVS_NpcInit_Penguin_06), + .settings = &N(NpcSettings_Penguin_Wander), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_400000, + .drops = NO_DROPS, .animations = PENGUIN_ANIMS, .tattle = MSG_NpcTattle_SAM_TimidPenguin, }, }; -StaticNpc N(NpcData_PondPenginsBefore)[] = { +NpcData N(NpcData_PondPenginsBefore)[] = { { .id = NPC_Penguin_02, - .settings = &N(NpcSettings_Penguin_Wander), .pos = { -100.0f, -10.0f, 180.0f }, .yaw = 0, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_400000, - .init = &N(EVS_NpcInit_Penguin_02), - .drops = NPC_NO_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -643,17 +639,17 @@ StaticNpc N(NpcData_PondPenginsBefore)[] = { .detectSize = { 0 }, } }, + .init = &N(EVS_NpcInit_Penguin_02), + .settings = &N(NpcSettings_Penguin_Wander), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_400000, + .drops = NO_DROPS, .animations = PENGUIN_ANIMS, .tattle = MSG_NpcTattle_SAM_SnowMaster, }, { .id = NPC_Penguin_03, - .settings = &N(NpcSettings_Penguin_Wander), .pos = { 57.0f, -10.0f, 194.0f }, .yaw = 0, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_400000, - .init = &N(EVS_NpcInit_Penguin_03), - .drops = NPC_NO_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -666,20 +662,20 @@ StaticNpc N(NpcData_PondPenginsBefore)[] = { .detectSize = { 0 }, } }, + .init = &N(EVS_NpcInit_Penguin_03), + .settings = &N(NpcSettings_Penguin_Wander), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_400000, + .drops = NO_DROPS, .animations = PENGUIN_ANIMS, .tattle = MSG_NpcTattle_SAM_Skater, }, }; -StaticNpc N(NpcData_PondPenginsAfter)[] = { +NpcData N(NpcData_PondPenginsAfter)[] = { { .id = NPC_Penguin_02, - .settings = &N(NpcSettings_Penguin_Wander), .pos = { -323.0f, 0.0f, 160.0f }, .yaw = 0, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_400000, - .init = &N(EVS_NpcInit_Penguin_02), - .drops = NPC_NO_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -692,17 +688,17 @@ StaticNpc N(NpcData_PondPenginsAfter)[] = { .detectSize = { 0 }, } }, + .init = &N(EVS_NpcInit_Penguin_02), + .settings = &N(NpcSettings_Penguin_Wander), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_400000, + .drops = NO_DROPS, .animations = PENGUIN_ANIMS, .tattle = MSG_NpcTattle_SAM_SnowMaster, }, { .id = NPC_Penguin_03, - .settings = &N(NpcSettings_Penguin_Wander), .pos = { 363.0f, 0.0f, 213.0f }, .yaw = 0, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_400000, - .init = &N(EVS_NpcInit_Penguin_03), - .drops = NPC_NO_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -715,42 +711,46 @@ StaticNpc N(NpcData_PondPenginsAfter)[] = { .detectSize = { 0 }, } }, + .init = &N(EVS_NpcInit_Penguin_03), + .settings = &N(NpcSettings_Penguin_Wander), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_400000, + .drops = NO_DROPS, .animations = PENGUIN_ANIMS, .tattle = MSG_NpcTattle_SAM_Skater, }, }; -StaticNpc N(NpcData_Tourists)[] = { +NpcData N(NpcData_Tourists)[] = { { .id = NPC_Toadette_01, - .settings = &N(NpcSettings_Toad_Stationary), .pos = { -400.0f, 0.0f, 230.0f }, .yaw = 90, - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_Toadette_01), - .drops = NPC_NO_DROPS, + .settings = &N(NpcSettings_Toad_Stationary), + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, + .drops = NO_DROPS, .animations = TOADETTE_PINK_ANIMS, .tattle = MSG_NpcTattle_TravelingMaidA, }, { .id = NPC_Toadette_02, - .settings = &N(NpcSettings_Toad_Stationary), .pos = { -350.0f, 0.0f, 230.0f }, .yaw = 90, - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_Toadette_02), - .drops = NPC_NO_DROPS, + .settings = &N(NpcSettings_Toad_Stationary), + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, + .drops = NO_DROPS, .animations = TOADETTE_PINK_ANIMS, .tattle = MSG_NpcTattle_TravelingMaidB, }, { .id = NPC_Toadette_03, - .settings = &N(NpcSettings_Toad_Stationary), .pos = { -375.0f, 0.0f, 220.0f }, .yaw = 90, - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_Toadette_03), - .drops = NPC_NO_DROPS, + .settings = &N(NpcSettings_Toad_Stationary), + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, + .drops = NO_DROPS, .animations = TOADETTE_PINK_ANIMS, .tattle = MSG_NpcTattle_TravelingMaidC, }, @@ -981,45 +981,45 @@ EvtScript N(EVS_NpcInit_Archeologist_01) = { EVT_END }; -StaticNpc N(NpcData_Epilogue)[] = { +NpcData N(NpcData_Epilogue)[] = { { .id = NPC_Kolorado, - .settings = &N(NpcSettings_Kolorado), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_Kolorado), - .drops = NPC_NO_DROPS, + .settings = &N(NpcSettings_Kolorado), + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000, + .drops = NO_DROPS, .animations = KOLORADO_ANIMS, }, { .id = NPC_Archeologist_01, - .settings = &N(NpcSettings_Kolorado), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_Archeologist_01), - .drops = NPC_NO_DROPS, + .settings = &N(NpcSettings_Kolorado), + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, + .drops = NO_DROPS, .animations = ARCHEOLOGIST_ANIMS, }, { .id = NPC_Archeologist_02, - .settings = &N(NpcSettings_Kolorado), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_Archeologist_01), - .drops = NPC_NO_DROPS, + .settings = &N(NpcSettings_Kolorado), + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000, + .drops = NO_DROPS, .animations = ARCHEOLOGIST_ANIMS, }, { .id = NPC_Kooper, - .settings = &N(NpcSettings_Kooper), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_Archeologist_01), - .drops = NPC_NO_DROPS, + .settings = &N(NpcSettings_Kooper), + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000, + .drops = NO_DROPS, .animations = { .idle = ANIM_WorldKooper_Idle, .walk = ANIM_WorldKooper_Walk, @@ -1041,12 +1041,12 @@ StaticNpc N(NpcData_Epilogue)[] = { }, { .id = NPC_Parakarry, - .settings = &N(NpcSettings_Kooper), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_200000 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_Archeologist_01), - .drops = NPC_NO_DROPS, + .settings = &N(NpcSettings_Kooper), + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_200000 | ENEMY_FLAG_400000, + .drops = NO_DROPS, .animations = { .idle = ANIM_WorldParakarry_Idle, .walk = ANIM_WorldParakarry_Walk, @@ -1068,15 +1068,15 @@ StaticNpc N(NpcData_Epilogue)[] = { }, }; -StaticNpc N(NpcData_ChuckQuizmo) = { +NpcData N(NpcData_ChuckQuizmo) = { .id = NPC_ChuckQuizmo, - .settings = &N(NpcSettings_ChuckQuizmo), .pos = { 0.0f, 0.0f, -150.0f }, .yaw = 90, - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, .initVarCount = 1, .initVar = { .bytes = { 0, QUIZ_AREA_SAM, QUIZ_COUNT_SAM, QUIZ_MAP_SAM_11 }}, - .drops = NPC_NO_DROPS, + .settings = &N(NpcSettings_ChuckQuizmo), + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, + .drops = NO_DROPS, .animations = QUIZMO_ANIMS, .tattle = MSG_NpcTattle_ChuckQuizmo, }; diff --git a/src/world/area_sam/sam_11/sam_11_6_pond.c b/src/world/area_sam/sam_11/sam_11_6_pond.c index 8761e8c308..921646412d 100644 --- a/src/world/area_sam/sam_11/sam_11_6_pond.c +++ b/src/world/area_sam/sam_11/sam_11_6_pond.c @@ -2,7 +2,6 @@ #include "effects.h" #include "world/common/atomic/TexturePan.inc.c" -#include "world/common/atomic/TexturePan.data.inc.c" API_CALLABLE(N(SpawnIceShards)) { EffectInstance* effect; diff --git a/src/world/area_sam/sam_12/sam_12_3_npc.c b/src/world/area_sam/sam_12/sam_12_3_npc.c index 32e49252cf..82379dd2d6 100644 --- a/src/world/area_sam/sam_12/sam_12_3_npc.c +++ b/src/world/area_sam/sam_12/sam_12_3_npc.c @@ -10,14 +10,14 @@ EvtScript N(EVS_NpcInit_Merlar) = { EVT_END }; -StaticNpc N(NpcData_Merlar) = { +NpcData N(NpcData_Merlar) = { .id = NPC_Merlar, - .settings = &N(NpcSettings_Merlar), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 180, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_Merlar), - .drops = NPC_NO_DROPS, + .settings = &N(NpcSettings_Merlar), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_400000, + .drops = NO_DROPS, .animations = MERLAR_ANIMS, }; diff --git a/src/world/area_sbk/sbk.h b/src/world/area_sbk/sbk.h index c389651bef..244491bc23 100644 --- a/src/world/area_sbk/sbk.h +++ b/src/world/area_sbk/sbk.h @@ -2,22 +2,22 @@ #define _WORLD_AREA_SBK_SBK_H_ enum { - AB_SBK_0 = AreaByte(0), - AB_SBK_1 = AreaByte(1), - AB_SBK_2 = AreaByte(2), - AB_SBK_3 = AreaByte(3), - AB_SBK_4 = AreaByte(4), - AB_SBK_5 = AreaByte(5), - AB_SBK_6 = AreaByte(6), - AB_SBK_7 = AreaByte(7), - AB_SBK_8 = AreaByte(8), - AB_SBK_9 = AreaByte(9), - AB_SBK_A = AreaByte(10), - AB_SBK_B = AreaByte(11), - AB_SBK_C = AreaByte(12), - AB_SBK_D = AreaByte(13), - AB_SBK_E = AreaByte(14), - AB_SBK_F = AreaByte(15), + AB_SBK_Unused_0 = AreaByte(0), + AB_SBK_Unused_1 = AreaByte(1), + AB_SBK_Unused_2 = AreaByte(2), + AB_SBK_Unused_3 = AreaByte(3), + AB_SBK_Unused_4 = AreaByte(4), + AB_SBK_Unused_5 = AreaByte(5), + AB_SBK_Unused_6 = AreaByte(6), + AB_SBK_Unused_7 = AreaByte(7), + AB_SBK_Unused_8 = AreaByte(8), + AB_SBK_Unused_9 = AreaByte(9), + AB_SBK_Unused_A = AreaByte(10), + AB_SBK_Unused_B = AreaByte(11), + AB_SBK_Unused_C = AreaByte(12), + AB_SBK_Unused_D = AreaByte(13), + AB_SBK_Unused_E = AreaByte(14), + AB_SBK_Unused_F = AreaByte(15), }; enum { diff --git a/src/world/area_sbk/sbk_00/sbk_00.h b/src/world/area_sbk/sbk_00/sbk_00.h index 21863c398b..f43287ec4b 100644 --- a/src/world/area_sbk/sbk_00/sbk_00.h +++ b/src/world/area_sbk/sbk_00/sbk_00.h @@ -17,3 +17,7 @@ enum { }; #define NAMESPACE sbk_00 + +extern EvtScript N(EVS_Main); +extern NpcGroupList N(DefaultNPCs); +extern EvtScript N(EVS_MakeEntities); diff --git a/src/world/area_sbk/sbk_00/sbk_00_0_header.c b/src/world/area_sbk/sbk_00/sbk_00_0_header.c new file mode 100644 index 0000000000..0e876a1b7d --- /dev/null +++ b/src/world/area_sbk/sbk_00/sbk_00_0_header.c @@ -0,0 +1,16 @@ +#include "sbk_00.h" + +EntryList N(Entrances) = { + [sbk_00_ENTRY_0] { -475.0, 0.0, 0.0, 90.0 }, + [sbk_00_ENTRY_1] { 475.0, 0.0, 0.0, 270.0 }, + [sbk_00_ENTRY_2] { 0.0, 0.0, -475.0, 180.0 }, + [sbk_00_ENTRY_3] { 0.0, 0.0, 475.0, 0.0 }, +}; + +MapSettings N(settings) = { + .main = &N(EVS_Main), + .entryList = &N(Entrances), + .entryCount = ENTRY_COUNT(N(Entrances)), + .background = &gBackgroundImage, + .tattle = { MSG_MapTattle_sbk_00 }, +}; diff --git a/src/world/area_sbk/sbk_00/sbk_00_1_main.c b/src/world/area_sbk/sbk_00/sbk_00_1_main.c index 6952b5babc..522a9c4a90 100644 --- a/src/world/area_sbk/sbk_00/sbk_00_1_main.c +++ b/src/world/area_sbk/sbk_00/sbk_00_1_main.c @@ -1,24 +1,5 @@ #include "sbk_00.h" -extern EvtScript N(EVS_Main); -extern NpcGroupList N(DefaultNPCs); -extern EvtScript N(EVS_MakeEntities); - -EntryList N(Entrances) = { - [sbk_00_ENTRY_0] { -475.0, 0.0, 0.0, 90.0 }, - [sbk_00_ENTRY_1] { 475.0, 0.0, 0.0, 270.0 }, - [sbk_00_ENTRY_2] { 0.0, 0.0, -475.0, 180.0 }, - [sbk_00_ENTRY_3] { 0.0, 0.0, 475.0, 0.0 }, -}; - -MapSettings N(settings) = { - .main = &N(EVS_Main), - .entryList = &N(Entrances), - .entryCount = ENTRY_COUNT(N(Entrances)), - .background = &gBackgroundImage, - .tattle = { MSG_MapTattle_sbk_00 }, -}; - #include "world/common/todo/SpawnSunEffect.inc.c" EvtScript N(EVS_ExitWalk_sbk_01_0) = EVT_EXIT_WALK(60, sbk_00_ENTRY_1, "sbk_01", sbk_01_ENTRY_0); diff --git a/src/world/area_sbk/sbk_00/sbk_00_2_npc.c b/src/world/area_sbk/sbk_00/sbk_00_2_npc.c index ad5a6592c7..07a932ccd3 100644 --- a/src/world/area_sbk/sbk_00/sbk_00_2_npc.c +++ b/src/world/area_sbk/sbk_00/sbk_00_2_npc.c @@ -1,14 +1,11 @@ #include "sbk_00.h" -#include "world/common/enemy/complete/Pokey.inc.c" +#include "world/common/enemy/Pokey.inc.c" -StaticNpc N(NpcData_Pokey_01) = { +NpcData N(NpcData_Pokey_01) = { .id = NPC_Pokey_01, - .settings = &N(NpcSettings_Pokey), .pos = { -40.0f, 0.0f, 160.0f }, .yaw = 90, - .flags = ENEMY_FLAG_800, - .drops = POKEY_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -21,17 +18,17 @@ StaticNpc N(NpcData_Pokey_01) = { .detectSize = { 1000 }, } }, + .settings = &N(NpcSettings_Pokey), + .flags = ENEMY_FLAG_800, + .drops = POKEY_DROPS, .animations = POKEY_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, }; -StaticNpc N(NpcData_Pokey_02) = { +NpcData N(NpcData_Pokey_02) = { .id = NPC_Pokey_02, - .settings = &N(NpcSettings_Pokey), .pos = { 245.0f, 0.0f, 75.0f }, .yaw = 270, - .flags = ENEMY_FLAG_800, - .drops = POKEY_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -44,6 +41,9 @@ StaticNpc N(NpcData_Pokey_02) = { .detectSize = { 1000 }, } }, + .settings = &N(NpcSettings_Pokey), + .flags = ENEMY_FLAG_800, + .drops = POKEY_DROPS, .animations = POKEY_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, }; diff --git a/src/world/area_sbk/sbk_01/sbk_01_2_npc.c b/src/world/area_sbk/sbk_01/sbk_01_2_npc.c index ca4251eab6..49f64dfa77 100644 --- a/src/world/area_sbk/sbk_01/sbk_01_2_npc.c +++ b/src/world/area_sbk/sbk_01/sbk_01_2_npc.c @@ -1,15 +1,12 @@ #include "sbk_01.h" #include "sprite/npc/Pokey.h" -#include "world/common/enemy/complete/Pokey.inc.c" +#include "world/common/enemy/Pokey.inc.c" -StaticNpc N(NpcData_Pokey_01) = { +NpcData N(NpcData_Pokey_01) = { .id = NPC_Pokey_01, - .settings = &N(NpcSettings_Pokey), .pos = { 205.0f, 0.0f, -60.0f }, .yaw = 90, - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, - .drops = POKEY_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -22,17 +19,17 @@ StaticNpc N(NpcData_Pokey_01) = { .detectSize = { 1000 }, } }, + .settings = &N(NpcSettings_Pokey), + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .drops = POKEY_DROPS, .animations = POKEY_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, }; -StaticNpc N(NpcData_Pokey_02) = { +NpcData N(NpcData_Pokey_02) = { .id = NPC_Pokey_02, - .settings = &N(NpcSettings_Pokey), .pos = { -200.0f, 0.0f, 180.0f }, .yaw = 270, - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, - .drops = POKEY_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -45,6 +42,9 @@ StaticNpc N(NpcData_Pokey_02) = { .detectSize = { 1000 }, } }, + .settings = &N(NpcSettings_Pokey), + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .drops = POKEY_DROPS, .animations = POKEY_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, }; diff --git a/src/world/area_sbk/sbk_02/sbk_02_4_npc.c b/src/world/area_sbk/sbk_02/sbk_02_4_npc.c index f91a9720ce..96e8ebe840 100644 --- a/src/world/area_sbk/sbk_02/sbk_02_4_npc.c +++ b/src/world/area_sbk/sbk_02/sbk_02_4_npc.c @@ -251,29 +251,25 @@ EvtScript N(EVS_NpcInit_TradingToad) = { EVT_END }; -StaticNpc N(NpcData_Mamar) = { +NpcData N(NpcData_Mamar) = { .id = NPC_Mamar, - .settings = &N(NpcSettings_StarSpirit), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_Mamar), - .drops = MAMAR_DROPS, + .settings = &N(NpcSettings_StarSpirit), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = NO_DROPS, .animations = MAMAR_ANIMS, }; -StaticNpc N(NpcData_TradingToad) = { +NpcData N(NpcData_TradingToad) = { .id = NPC_TradingToad, - .settings = &N(NpcSettings_Toad_Stationary), .pos = { 0.0f, 2.0f, 150.0f }, .yaw = 90, - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_10000 | ENEMY_FLAG_100000, .init = &N(EVS_NpcInit_TradingToad), - .drops = { - .dropFlags = NPC_DROP_FLAG_80, - .heartDrops = NO_DROPS, - .flowerDrops = NO_DROPS, - }, + .settings = &N(NpcSettings_Toad_Stationary), + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_10000 | ENEMY_FLAG_100000, + .drops = NO_DROPS, .animations = { .idle = ANIM_Toad_Pink_Idle, .walk = ANIM_Toad_Pink_Walk, diff --git a/src/world/area_sbk/sbk_03/sbk_03_2_npc.c b/src/world/area_sbk/sbk_03/sbk_03_2_npc.c index e0dfd9929a..b9acd25ac3 100644 --- a/src/world/area_sbk/sbk_03/sbk_03_2_npc.c +++ b/src/world/area_sbk/sbk_03/sbk_03_2_npc.c @@ -1,14 +1,11 @@ #include "sbk_03.h" -#include "world/common/enemy/complete/Pokey.inc.c" +#include "world/common/enemy/Pokey.inc.c" -StaticNpc N(NpcData_Pokey_01) = { +NpcData N(NpcData_Pokey_01) = { .id = NPC_Pokey_01, - .settings = &N(NpcSettings_Pokey), .pos = { -340.0f, 0.0f, -125.0f }, .yaw = 90, - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, - .drops = POKEY_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -21,17 +18,17 @@ StaticNpc N(NpcData_Pokey_01) = { .detectSize = { 1000 }, } }, + .settings = &N(NpcSettings_Pokey), + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .drops = POKEY_DROPS, .animations = POKEY_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, }; -StaticNpc N(NpcData_Pokey_02) = { +NpcData N(NpcData_Pokey_02) = { .id = NPC_Pokey_02, - .settings = &N(NpcSettings_Pokey), .pos = { 10.0f, 0.0f, 100.0f }, .yaw = 270, - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, - .drops = POKEY_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -44,17 +41,17 @@ StaticNpc N(NpcData_Pokey_02) = { .detectSize = { 1000 }, } }, + .settings = &N(NpcSettings_Pokey), + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .drops = POKEY_DROPS, .animations = POKEY_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, }; -StaticNpc N(NpcData_Pokey_03) = { +NpcData N(NpcData_Pokey_03) = { .id = NPC_Pokey_03, - .settings = &N(NpcSettings_Pokey), .pos = { -90.0f, 0.0f, 260.0f }, .yaw = 90, - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, - .drops = POKEY_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -67,17 +64,17 @@ StaticNpc N(NpcData_Pokey_03) = { .detectSize = { 1000 }, } }, + .settings = &N(NpcSettings_Pokey), + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .drops = POKEY_DROPS, .animations = POKEY_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, }; -StaticNpc N(NpcData_Pokey_04) = { +NpcData N(NpcData_Pokey_04) = { .id = NPC_Pokey_04, - .settings = &N(NpcSettings_Pokey), .pos = { 165.0f, 0.0f, 300.0f }, .yaw = 270, - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, - .drops = POKEY_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -90,6 +87,9 @@ StaticNpc N(NpcData_Pokey_04) = { .detectSize = { 1000 }, } }, + .settings = &N(NpcSettings_Pokey), + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .drops = POKEY_DROPS, .animations = POKEY_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, }; diff --git a/src/world/area_sbk/sbk_04/sbk_04_2_npc.c b/src/world/area_sbk/sbk_04/sbk_04_2_npc.c index 6049a1cda7..0f998cc57e 100644 --- a/src/world/area_sbk/sbk_04/sbk_04_2_npc.c +++ b/src/world/area_sbk/sbk_04/sbk_04_2_npc.c @@ -1,14 +1,11 @@ #include "sbk_04.h" -#include "world/common/enemy/complete/Pokey.inc.c" +#include "world/common/enemy/Pokey.inc.c" -StaticNpc N(NpcData_Pokey_01) = { +NpcData N(NpcData_Pokey_01) = { .id = NPC_Pokey_01, - .settings = &N(NpcSettings_Pokey), .pos = { -295.0f, 0.0f, -110.0f }, .yaw = 90, - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, - .drops = POKEY_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -21,17 +18,17 @@ StaticNpc N(NpcData_Pokey_01) = { .detectSize = { 1000 }, } }, + .settings = &N(NpcSettings_Pokey), + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .drops = POKEY_DROPS, .animations = POKEY_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, }; -StaticNpc N(NpcData_Pokey_02) = { +NpcData N(NpcData_Pokey_02) = { .id = NPC_Pokey_02, - .settings = &N(NpcSettings_Pokey), .pos = { -140.0f, 0.0f, -30.0f }, .yaw = 90, - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, - .drops = POKEY_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -44,6 +41,9 @@ StaticNpc N(NpcData_Pokey_02) = { .detectSize = { 1000 }, } }, + .settings = &N(NpcSettings_Pokey), + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .drops = POKEY_DROPS, .animations = POKEY_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, }; diff --git a/src/world/area_sbk/sbk_05/sbk_05_3_npc.c b/src/world/area_sbk/sbk_05/sbk_05_3_npc.c index ad6c1b77da..b469fc7969 100644 --- a/src/world/area_sbk/sbk_05/sbk_05_3_npc.c +++ b/src/world/area_sbk/sbk_05/sbk_05_3_npc.c @@ -1,14 +1,11 @@ #include "sbk_05.h" -#include "world/common/enemy/complete/Pokey.inc.c" +#include "world/common/enemy/Pokey.inc.c" -StaticNpc N(NpcData_Pokey_01) = { +NpcData N(NpcData_Pokey_01) = { .id = NPC_Pokey_01, - .settings = &N(NpcSettings_Pokey), .pos = { -280.0f, 0.0f, -110.0f }, .yaw = 180, - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, - .drops = POKEY_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -21,17 +18,17 @@ StaticNpc N(NpcData_Pokey_01) = { .detectSize = { 1000 }, } }, + .settings = &N(NpcSettings_Pokey), + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .drops = POKEY_DROPS, .animations = POKEY_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, }; -StaticNpc N(NpcData_Pokey_02) = { +NpcData N(NpcData_Pokey_02) = { .id = NPC_Pokey_02, - .settings = &N(NpcSettings_Pokey), .pos = { -200.0f, 0.0f, -80.0f }, .yaw = 120, - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, - .drops = POKEY_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -44,17 +41,17 @@ StaticNpc N(NpcData_Pokey_02) = { .detectSize = { 1000 }, } }, + .settings = &N(NpcSettings_Pokey), + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .drops = POKEY_DROPS, .animations = POKEY_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, }; -StaticNpc N(NpcData_Pokey_03) = { +NpcData N(NpcData_Pokey_03) = { .id = NPC_Pokey_03, - .settings = &N(NpcSettings_Pokey), .pos = { -160.0f, 0.0f, -225.0f }, .yaw = 90, - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, - .drops = POKEY_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -67,17 +64,17 @@ StaticNpc N(NpcData_Pokey_03) = { .detectSize = { 1000 }, } }, + .settings = &N(NpcSettings_Pokey), + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .drops = POKEY_DROPS, .animations = POKEY_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, }; -StaticNpc N(NpcData_Pokey_04) = { +NpcData N(NpcData_Pokey_04) = { .id = NPC_Pokey_04, - .settings = &N(NpcSettings_Pokey), .pos = { -100.0f, 0.0f, 70.0f }, .yaw = 270, - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, - .drops = POKEY_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -90,17 +87,17 @@ StaticNpc N(NpcData_Pokey_04) = { .detectSize = { 1000 }, } }, + .settings = &N(NpcSettings_Pokey), + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .drops = POKEY_DROPS, .animations = POKEY_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, }; -StaticNpc N(NpcData_Pokey_05) = { +NpcData N(NpcData_Pokey_05) = { .id = NPC_Pokey_05, - .settings = &N(NpcSettings_Pokey), .pos = { -10.0f, 0.0f, 30.0f }, .yaw = 80, - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, - .drops = POKEY_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -113,17 +110,17 @@ StaticNpc N(NpcData_Pokey_05) = { .detectSize = { 1000 }, } }, + .settings = &N(NpcSettings_Pokey), + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .drops = POKEY_DROPS, .animations = POKEY_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, }; -StaticNpc N(NpcData_Pokey_06) = { +NpcData N(NpcData_Pokey_06) = { .id = NPC_Pokey_06, - .settings = &N(NpcSettings_Pokey), .pos = { 20.0f, 0.0f, -110.0f }, .yaw = 270, - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, - .drops = POKEY_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -136,17 +133,17 @@ StaticNpc N(NpcData_Pokey_06) = { .detectSize = { 1000 }, } }, + .settings = &N(NpcSettings_Pokey), + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .drops = POKEY_DROPS, .animations = POKEY_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, }; -StaticNpc N(NpcData_Pokey_07) = { +NpcData N(NpcData_Pokey_07) = { .id = NPC_Pokey_07, - .settings = &N(NpcSettings_Pokey), .pos = { 170.0f, 0.0f, -50.0f }, .yaw = 90, - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, - .drops = POKEY_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -159,17 +156,17 @@ StaticNpc N(NpcData_Pokey_07) = { .detectSize = { 1000 }, } }, + .settings = &N(NpcSettings_Pokey), + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .drops = POKEY_DROPS, .animations = POKEY_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, }; -StaticNpc N(NpcData_Pokey_08) = { +NpcData N(NpcData_Pokey_08) = { .id = NPC_Pokey_08, - .settings = &N(NpcSettings_Pokey), .pos = { 250.0f, 0.0f, 130.0f }, .yaw = 90, - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, - .drops = POKEY_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -182,17 +179,17 @@ StaticNpc N(NpcData_Pokey_08) = { .detectSize = { 1000 }, } }, + .settings = &N(NpcSettings_Pokey), + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .drops = POKEY_DROPS, .animations = POKEY_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, }; -StaticNpc N(NpcData_Pokey_09) = { +NpcData N(NpcData_Pokey_09) = { .id = NPC_Pokey_09, - .settings = &N(NpcSettings_Pokey), .pos = { 340.0f, 0.0f, 200.0f }, .yaw = 90, - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, - .drops = POKEY_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -205,17 +202,17 @@ StaticNpc N(NpcData_Pokey_09) = { .detectSize = { 1000 }, } }, + .settings = &N(NpcSettings_Pokey), + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .drops = POKEY_DROPS, .animations = POKEY_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, }; -StaticNpc N(NpcData_Pokey_10) = { +NpcData N(NpcData_Pokey_10) = { .id = NPC_Pokey_10, - .settings = &N(NpcSettings_Pokey), .pos = { -150.0f, 0.0f, 360.0f }, .yaw = 270, - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, - .drops = POKEY_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -228,6 +225,9 @@ StaticNpc N(NpcData_Pokey_10) = { .detectSize = { 1000 }, } }, + .settings = &N(NpcSettings_Pokey), + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .drops = POKEY_DROPS, .animations = POKEY_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, }; diff --git a/src/world/area_sbk/sbk_06/sbk_06_2_npc.c b/src/world/area_sbk/sbk_06/sbk_06_2_npc.c index 58220c8ba7..ddfba33bc2 100644 --- a/src/world/area_sbk/sbk_06/sbk_06_2_npc.c +++ b/src/world/area_sbk/sbk_06/sbk_06_2_npc.c @@ -1,14 +1,11 @@ #include "sbk_06.h" -#include "world/common/enemy/complete/Bandit.inc.c" +#include "world/common/enemy/Bandit.inc.c" -StaticNpc N(NpcData_Bandit) = { +NpcData N(NpcData_Bandit) = { .id = NPC_Bandit, - .settings = &N(NpcSettings_Bandit), .pos = { -200.0f, 0.0f, 230.0f }, .yaw = 90, - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, - .drops = BANDIT_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -21,6 +18,9 @@ StaticNpc N(NpcData_Bandit) = { .detectSize = { 1000 }, } }, + .settings = &N(NpcSettings_Bandit), + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .drops = BANDIT_DROPS, .animations = BANDIT_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, }; diff --git a/src/world/area_sbk/sbk_11/sbk_11_2_npc.c b/src/world/area_sbk/sbk_11/sbk_11_2_npc.c index c88d6c15c5..9b033c8750 100644 --- a/src/world/area_sbk/sbk_11/sbk_11_2_npc.c +++ b/src/world/area_sbk/sbk_11/sbk_11_2_npc.c @@ -1,15 +1,12 @@ #include "sbk_11.h" -#include "world/common/enemy/complete/Bandit.inc.c" -#include "world/common/enemy/complete/Pokey.inc.c" +#include "world/common/enemy/Bandit.inc.c" +#include "world/common/enemy/Pokey.inc.c" -StaticNpc N(NpcData_Pokey) = { +NpcData N(NpcData_Pokey) = { .id = NPC_Pokey, - .settings = &N(NpcSettings_Pokey), .pos = { -120.0f, 0.0f, 90.0f }, .yaw = 90, - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, - .drops = POKEY_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -22,17 +19,17 @@ StaticNpc N(NpcData_Pokey) = { .detectSize = { 1000 }, } }, + .settings = &N(NpcSettings_Pokey), + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .drops = POKEY_DROPS, .animations = POKEY_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, }; -StaticNpc N(NpcData_Bandit) = { +NpcData N(NpcData_Bandit) = { .id = NPC_Bandit, - .settings = &N(NpcSettings_Bandit), .pos = { -200.0f, 0.0f, 230.0f }, .yaw = 90, - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, - .drops = BANDIT_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -45,6 +42,9 @@ StaticNpc N(NpcData_Bandit) = { .detectSize = { 1000 }, } }, + .settings = &N(NpcSettings_Bandit), + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .drops = BANDIT_DROPS, .animations = BANDIT_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, }; diff --git a/src/world/area_sbk/sbk_12/sbk_12_2_npc.c b/src/world/area_sbk/sbk_12/sbk_12_2_npc.c index a82bf51a82..f19f45c00f 100644 --- a/src/world/area_sbk/sbk_12/sbk_12_2_npc.c +++ b/src/world/area_sbk/sbk_12/sbk_12_2_npc.c @@ -1,14 +1,11 @@ #include "sbk_12.h" -#include "world/common/enemy/complete/Pokey.inc.c" +#include "world/common/enemy/Pokey.inc.c" -StaticNpc N(NpcData_Pokey_01) = { +NpcData N(NpcData_Pokey_01) = { .id = NPC_Pokey_01, - .settings = &N(NpcSettings_Pokey), .pos = { -190.0f, 0.0f, -130.0f }, .yaw = 90, - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, - .drops = POKEY_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -21,17 +18,17 @@ StaticNpc N(NpcData_Pokey_01) = { .detectSize = { 1000 }, } }, + .settings = &N(NpcSettings_Pokey), + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .drops = POKEY_DROPS, .animations = POKEY_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, }; -StaticNpc N(NpcData_Pokey_02) = { +NpcData N(NpcData_Pokey_02) = { .id = NPC_Pokey_02, - .settings = &N(NpcSettings_Pokey), .pos = { -40.0f, 0.0f, -200.0f }, .yaw = 90, - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, - .drops = POKEY_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -44,17 +41,17 @@ StaticNpc N(NpcData_Pokey_02) = { .detectSize = { 1000 }, } }, + .settings = &N(NpcSettings_Pokey), + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .drops = POKEY_DROPS, .animations = POKEY_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, }; -StaticNpc N(NpcData_Pokey_03) = { +NpcData N(NpcData_Pokey_03) = { .id = NPC_Pokey_03, - .settings = &N(NpcSettings_Pokey), .pos = { 195.0f, 0.0f, -255.0f }, .yaw = 270, - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, - .drops = POKEY_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -67,6 +64,9 @@ StaticNpc N(NpcData_Pokey_03) = { .detectSize = { 1000 }, } }, + .settings = &N(NpcSettings_Pokey), + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .drops = POKEY_DROPS, .animations = POKEY_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, }; diff --git a/src/world/area_sbk/sbk_13/sbk_13_2_npc.c b/src/world/area_sbk/sbk_13/sbk_13_2_npc.c index 1f3e00629c..3c70183ac7 100644 --- a/src/world/area_sbk/sbk_13/sbk_13_2_npc.c +++ b/src/world/area_sbk/sbk_13/sbk_13_2_npc.c @@ -1,15 +1,12 @@ #include "sbk_13.h" -#include "world/common/enemy/complete/Bandit.inc.c" -#include "world/common/enemy/complete/Pokey.inc.c" +#include "world/common/enemy/Bandit.inc.c" +#include "world/common/enemy/Pokey.inc.c" -StaticNpc N(NpcData_Pokey_01) = { +NpcData N(NpcData_Pokey_01) = { .id = NPC_Pokey_01, - .settings = &N(NpcSettings_Pokey), .pos = { -70.0f, 0.0f, -60.0f }, .yaw = 270, - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, - .drops = POKEY_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -22,17 +19,17 @@ StaticNpc N(NpcData_Pokey_01) = { .detectSize = { 1000 }, } }, + .settings = &N(NpcSettings_Pokey), + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .drops = POKEY_DROPS, .animations = POKEY_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, }; -StaticNpc N(NpcData_Pokey_02) = { +NpcData N(NpcData_Pokey_02) = { .id = NPC_Pokey_02, - .settings = &N(NpcSettings_Pokey), .pos = { 120.0f, 0.0f, -50.0f }, .yaw = 270, - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, - .drops = POKEY_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -45,17 +42,17 @@ StaticNpc N(NpcData_Pokey_02) = { .detectSize = { 1000 }, } }, + .settings = &N(NpcSettings_Pokey), + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .drops = POKEY_DROPS, .animations = POKEY_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, }; -StaticNpc N(NpcData_Bandit) = { +NpcData N(NpcData_Bandit) = { .id = NPC_Bandit, - .settings = &N(NpcSettings_Bandit), .pos = { -200.0f, 0.0f, 230.0f }, .yaw = 90, - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, - .drops = BANDIT_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -68,6 +65,9 @@ StaticNpc N(NpcData_Bandit) = { .detectSize = { 1000 }, } }, + .settings = &N(NpcSettings_Bandit), + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .drops = BANDIT_DROPS, .animations = BANDIT_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, }; diff --git a/src/world/area_sbk/sbk_15/sbk_15_2_npc.c b/src/world/area_sbk/sbk_15/sbk_15_2_npc.c index 701f8443a6..c77e2142f0 100644 --- a/src/world/area_sbk/sbk_15/sbk_15_2_npc.c +++ b/src/world/area_sbk/sbk_15/sbk_15_2_npc.c @@ -1,14 +1,11 @@ #include "sbk_15.h" -#include "world/common/enemy/complete/Pokey.inc.c" +#include "world/common/enemy/Pokey.inc.c" -StaticNpc N(NpcData_Pokey_01) = { +NpcData N(NpcData_Pokey_01) = { .id = NPC_Pokey_01, - .settings = &N(NpcSettings_Pokey), .pos = { -230.0f, 0.0f, 100.0f }, .yaw = 90, - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, - .drops = POKEY_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -21,17 +18,17 @@ StaticNpc N(NpcData_Pokey_01) = { .detectSize = { 1000 }, } }, + .settings = &N(NpcSettings_Pokey), + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .drops = POKEY_DROPS, .animations = POKEY_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, }; -StaticNpc N(NpcData_Pokey_02) = { +NpcData N(NpcData_Pokey_02) = { .id = NPC_Pokey_02, - .settings = &N(NpcSettings_Pokey), .pos = { 20.0f, 0.0f, 260.0f }, .yaw = 90, - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, - .drops = POKEY_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -44,6 +41,9 @@ StaticNpc N(NpcData_Pokey_02) = { .detectSize = { 1000 }, } }, + .settings = &N(NpcSettings_Pokey), + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .drops = POKEY_DROPS, .animations = POKEY_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, }; diff --git a/src/world/area_sbk/sbk_20/sbk_20_2_npc.c b/src/world/area_sbk/sbk_20/sbk_20_2_npc.c index 9c84dbbe44..9ac6b4b7f4 100644 --- a/src/world/area_sbk/sbk_20/sbk_20_2_npc.c +++ b/src/world/area_sbk/sbk_20/sbk_20_2_npc.c @@ -1,14 +1,11 @@ #include "sbk_20.h" -#include "world/common/enemy/complete/Bandit.inc.c" +#include "world/common/enemy/Bandit.inc.c" -StaticNpc N(NpcData_Bandit_01) = { +NpcData N(NpcData_Bandit_01) = { .id = NPC_Bandit_01, - .settings = &N(NpcSettings_Bandit), .pos = { -100.0f, 0.0f, 80.0f }, .yaw = 90, - .flags = ENEMY_FLAG_800, - .drops = BANDIT_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -21,17 +18,17 @@ StaticNpc N(NpcData_Bandit_01) = { .detectSize = { 1000 }, } }, + .settings = &N(NpcSettings_Bandit), + .flags = ENEMY_FLAG_800, + .drops = BANDIT_DROPS, .animations = BANDIT_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, }; -StaticNpc N(NpcData_Bandit_02) = { +NpcData N(NpcData_Bandit_02) = { .id = NPC_Bandit_02, - .settings = &N(NpcSettings_Bandit), .pos = { 120.0f, 0.0f, 30.0f }, .yaw = 270, - .flags = ENEMY_FLAG_800, - .drops = BANDIT_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -44,6 +41,9 @@ StaticNpc N(NpcData_Bandit_02) = { .detectSize = { 1000 }, } }, + .settings = &N(NpcSettings_Bandit), + .flags = ENEMY_FLAG_800, + .drops = BANDIT_DROPS, .animations = BANDIT_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, }; diff --git a/src/world/area_sbk/sbk_22/sbk_22_2_npc.c b/src/world/area_sbk/sbk_22/sbk_22_2_npc.c index d9ea849b73..8ba5957c01 100644 --- a/src/world/area_sbk/sbk_22/sbk_22_2_npc.c +++ b/src/world/area_sbk/sbk_22/sbk_22_2_npc.c @@ -1,15 +1,12 @@ #include "sbk_22.h" -#include "world/common/enemy/complete/Bandit.inc.c" -#include "world/common/enemy/complete/Pokey.inc.c" +#include "world/common/enemy/Bandit.inc.c" +#include "world/common/enemy/Pokey.inc.c" -StaticNpc N(NpcData_Pokey) = { +NpcData N(NpcData_Pokey) = { .id = NPC_Pokey, - .settings = &N(NpcSettings_Pokey), .pos = { -140.0f, 0.0f, -230.0f }, .yaw = 90, - .flags = ENEMY_FLAG_800 | ENEMY_FLAG_2000, - .drops = POKEY_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -22,17 +19,17 @@ StaticNpc N(NpcData_Pokey) = { .detectSize = { 1000 }, } }, + .settings = &N(NpcSettings_Pokey), + .flags = ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .drops = POKEY_DROPS, .animations = POKEY_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, }; -StaticNpc N(NpcData_Bandit) = { +NpcData N(NpcData_Bandit) = { .id = NPC_Bandit, - .settings = &N(NpcSettings_Bandit), .pos = { 40.0f, 0.0f, 90.0f }, .yaw = 270, - .flags = ENEMY_FLAG_800 | ENEMY_FLAG_2000, - .drops = BANDIT_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -45,6 +42,9 @@ StaticNpc N(NpcData_Bandit) = { .detectSize = { 1000 }, } }, + .settings = &N(NpcSettings_Bandit), + .flags = ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .drops = BANDIT_DROPS, .animations = BANDIT_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, }; diff --git a/src/world/area_sbk/sbk_24/sbk_24_2_npc.c b/src/world/area_sbk/sbk_24/sbk_24_2_npc.c index a3e21f3896..6c75b23596 100644 --- a/src/world/area_sbk/sbk_24/sbk_24_2_npc.c +++ b/src/world/area_sbk/sbk_24/sbk_24_2_npc.c @@ -1,3 +1,3 @@ #include "sbk_24.h" -#include "world/common/enemy/complete/Bandit.inc.c" +#include "world/common/enemy/Bandit.inc.c" diff --git a/src/world/area_sbk/sbk_25/sbk_25_2_npc.c b/src/world/area_sbk/sbk_25/sbk_25_2_npc.c index 3f64e4c093..16715ab855 100644 --- a/src/world/area_sbk/sbk_25/sbk_25_2_npc.c +++ b/src/world/area_sbk/sbk_25/sbk_25_2_npc.c @@ -1,14 +1,11 @@ #include "sbk_25.h" -#include "world/common/enemy/complete/Bandit.inc.c" +#include "world/common/enemy/Bandit.inc.c" -StaticNpc N(NpcData_Bandit_01) = { +NpcData N(NpcData_Bandit_01) = { .id = NPC_Bandit_01, - .settings = &N(NpcSettings_Bandit), .pos = { -80.0f, 0.0f, -20.0f }, .yaw = 90, - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, - .drops = BANDIT_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -21,17 +18,17 @@ StaticNpc N(NpcData_Bandit_01) = { .detectSize = { 1000 }, } }, + .settings = &N(NpcSettings_Bandit), + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .drops = BANDIT_DROPS, .animations = BANDIT_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, }; -StaticNpc N(NpcData_Bandit_02) = { +NpcData N(NpcData_Bandit_02) = { .id = NPC_Bandit_02, - .settings = &N(NpcSettings_Bandit), .pos = { 120.0f, 0.0f, 20.0f }, .yaw = 270, - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, - .drops = BANDIT_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -44,6 +41,9 @@ StaticNpc N(NpcData_Bandit_02) = { .detectSize = { 1000 }, } }, + .settings = &N(NpcSettings_Bandit), + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .drops = BANDIT_DROPS, .animations = BANDIT_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, }; diff --git a/src/world/area_sbk/sbk_26/sbk_26_2_npc.c b/src/world/area_sbk/sbk_26/sbk_26_2_npc.c index e3913d2982..6fdf8be248 100644 --- a/src/world/area_sbk/sbk_26/sbk_26_2_npc.c +++ b/src/world/area_sbk/sbk_26/sbk_26_2_npc.c @@ -1,15 +1,12 @@ #include "sbk_26.h" -#include "world/common/enemy/complete/Bandit.inc.c" -#include "world/common/enemy/complete/Pokey.inc.c" +#include "world/common/enemy/Bandit.inc.c" +#include "world/common/enemy/Pokey.inc.c" -StaticNpc N(NpcData_Bandit) = { +NpcData N(NpcData_Bandit) = { .id = NPC_Bandit, - .settings = &N(NpcSettings_Bandit), .pos = { -223.0f, 0.0f, 101.0f }, .yaw = 180, - .flags = ENEMY_FLAG_800, - .drops = BANDIT_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -22,17 +19,17 @@ StaticNpc N(NpcData_Bandit) = { .detectSize = { 1000 }, } }, + .settings = &N(NpcSettings_Bandit), + .flags = ENEMY_FLAG_800, + .drops = BANDIT_DROPS, .animations = BANDIT_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, }; -StaticNpc N(NpcData_Pokey) = { +NpcData N(NpcData_Pokey) = { .id = NPC_Pokey, - .settings = &N(NpcSettings_Pokey), .pos = { -140.0f, 0.0f, -230.0f }, .yaw = 90, - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, - .drops = POKEY_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -45,6 +42,9 @@ StaticNpc N(NpcData_Pokey) = { .detectSize = { 1000 }, } }, + .settings = &N(NpcSettings_Pokey), + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .drops = POKEY_DROPS, .animations = POKEY_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, }; 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 6f3497307a..c3a8c4f20e 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 @@ -293,26 +293,22 @@ EvtScript N(EVS_NpcInit_Archeologist_02) = { EVT_END }; -StaticNpc N(NpcData_Archeologist_02)[] = { +NpcData N(NpcData_Archeologist_02)[] = { { .id = NPC_Kolorado, - .settings = &N(NpcSettings_Kolorado), .pos = { 200.0f, 0.0f, -100.0f }, .yaw = 90, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_Kolorado), - .drops = NPC_NO_DROPS, + .settings = &N(NpcSettings_Kolorado), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .drops = NO_DROPS, .animations = KOLORADO_ANIMS, .tattle = MSG_NpcTattle_SBK_Kolorado, }, { .id = NPC_Archeologist_01, - .settings = &N(NpcSettings_Archeologist_01), .pos = { 238.0f, 0.0f, -112.0f }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, - .init = &N(EVS_NpcInit_Archeologist_01), - .drops = NPC_NO_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -325,17 +321,17 @@ StaticNpc N(NpcData_Archeologist_02)[] = { .detectSize = { 0 }, } }, + .init = &N(EVS_NpcInit_Archeologist_01), + .settings = &N(NpcSettings_Archeologist_01), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .drops = NO_DROPS, .animations = ARCHEOLOGIST_ANIMS, .tattle = MSG_NpcTattle_SBK_ExcavatorA, }, { .id = NPC_Archeologist_02, - .settings = &N(NpcSettings_Archeologist_01), .pos = { 170.0f, 0.0f, -190.0f }, .yaw = 90, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, - .init = &N(EVS_NpcInit_Archeologist_02), - .drops = NPC_NO_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -348,6 +344,10 @@ StaticNpc N(NpcData_Archeologist_02)[] = { .detectSize = { 0 }, } }, + .init = &N(EVS_NpcInit_Archeologist_02), + .settings = &N(NpcSettings_Archeologist_01), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .drops = NO_DROPS, .animations = ARCHEOLOGIST_ANIMS, .tattle = MSG_NpcTattle_SBK_ExcavatorB, }, diff --git a/src/world/area_sbk/sbk_31/sbk_31_2_npc.c b/src/world/area_sbk/sbk_31/sbk_31_2_npc.c index f0045bea37..b85db5625c 100644 --- a/src/world/area_sbk/sbk_31/sbk_31_2_npc.c +++ b/src/world/area_sbk/sbk_31/sbk_31_2_npc.c @@ -1,14 +1,11 @@ #include "sbk_31.h" -#include "world/common/enemy/complete/Bandit.inc.c" +#include "world/common/enemy/Bandit.inc.c" -StaticNpc N(NpcData_Bandit) = { +NpcData N(NpcData_Bandit) = { .id = NPC_Bandit, - .settings = &N(NpcSettings_Bandit), .pos = { 23.0f, 0.0f, -260.0f }, .yaw = 270, - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, - .drops = BANDIT_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -21,6 +18,9 @@ StaticNpc N(NpcData_Bandit) = { .detectSize = { 1000 }, } }, + .settings = &N(NpcSettings_Bandit), + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .drops = BANDIT_DROPS, .animations = BANDIT_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, }; diff --git a/src/world/area_sbk/sbk_32/sbk_32_2_npc.c b/src/world/area_sbk/sbk_32/sbk_32_2_npc.c index dbd58f651b..640fc457c4 100644 --- a/src/world/area_sbk/sbk_32/sbk_32_2_npc.c +++ b/src/world/area_sbk/sbk_32/sbk_32_2_npc.c @@ -1,15 +1,12 @@ #include "sbk_32.h" -#include "world/common/enemy/complete/Bandit.inc.c" -#include "world/common/enemy/complete/Pokey.inc.c" +#include "world/common/enemy/Bandit.inc.c" +#include "world/common/enemy/Pokey.inc.c" -StaticNpc N(NpcData_Pokey_01) = { +NpcData N(NpcData_Pokey_01) = { .id = NPC_Pokey_01, - .settings = &N(NpcSettings_Pokey), .pos = { -140.0f, 0.0f, -270.0f }, .yaw = 270, - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, - .drops = POKEY_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -22,17 +19,17 @@ StaticNpc N(NpcData_Pokey_01) = { .detectSize = { 1000 }, } }, + .settings = &N(NpcSettings_Pokey), + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .drops = POKEY_DROPS, .animations = POKEY_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, }; -StaticNpc N(NpcData_Pokey_02) = { +NpcData N(NpcData_Pokey_02) = { .id = NPC_Pokey_02, - .settings = &N(NpcSettings_Pokey), .pos = { -120.0f, 0.0f, 110.0f }, .yaw = 90, - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, - .drops = POKEY_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -45,17 +42,17 @@ StaticNpc N(NpcData_Pokey_02) = { .detectSize = { 1000 }, } }, + .settings = &N(NpcSettings_Pokey), + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .drops = POKEY_DROPS, .animations = POKEY_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, }; -StaticNpc N(NpcData_Bandit) = { +NpcData N(NpcData_Bandit) = { .id = NPC_Bandit, - .settings = &N(NpcSettings_Bandit), .pos = { 23.0f, 0.0f, -260.0f }, .yaw = 270, - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, - .drops = BANDIT_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -68,6 +65,9 @@ StaticNpc N(NpcData_Bandit) = { .detectSize = { 1000 }, } }, + .settings = &N(NpcSettings_Bandit), + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .drops = BANDIT_DROPS, .animations = BANDIT_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, }; diff --git a/src/world/area_sbk/sbk_34/sbk_34_2_npc.c b/src/world/area_sbk/sbk_34/sbk_34_2_npc.c index ccc40674eb..7a3a77562a 100644 --- a/src/world/area_sbk/sbk_34/sbk_34_2_npc.c +++ b/src/world/area_sbk/sbk_34/sbk_34_2_npc.c @@ -77,19 +77,15 @@ EvtScript N(EVS_NpcInit_Sack) = { EVT_END }; -StaticNpc N(NpcData_Nomadimouse)[] = { +NpcData N(NpcData_Nomadimouse)[] = { { .id = NPC_Nomadimouse, - .settings = &N(NpcSettings_Nomadimouse), .pos = { 114.0f, 0.0f, -50.0f }, .yaw = 90, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_Nomadimouse), - .drops = { - .dropFlags = NPC_DROP_FLAG_80, - .heartDrops = NO_DROPS, - .flowerDrops = NO_DROPS, - }, + .settings = &N(NpcSettings_Nomadimouse), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, + .drops = NO_DROPS, .animations = { .idle = ANIM_Nomadimouse_Idle, .walk = ANIM_Nomadimouse_Idle, @@ -112,16 +108,12 @@ StaticNpc N(NpcData_Nomadimouse)[] = { }, { .id = NPC_Sack, - .settings = &N(NpcSettings_Nomadimouse), .pos = { 134.0f, 0.0f, -50.0f }, .yaw = 90, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_Sack), - .drops = { - .dropFlags = NPC_DROP_FLAG_80, - .heartDrops = NO_DROPS, - .flowerDrops = NO_DROPS, - }, + .settings = &N(NpcSettings_Nomadimouse), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, + .drops = NO_DROPS, .animations = { .idle = ANIM_Nomadimouse_Idle, .walk = ANIM_Nomadimouse_Idle, diff --git a/src/world/area_sbk/sbk_35/sbk_35_2_npc.c b/src/world/area_sbk/sbk_35/sbk_35_2_npc.c index 09323b1ba9..3a84c55e51 100644 --- a/src/world/area_sbk/sbk_35/sbk_35_2_npc.c +++ b/src/world/area_sbk/sbk_35/sbk_35_2_npc.c @@ -1,14 +1,11 @@ #include "sbk_35.h" -#include "world/common/enemy/complete/Bandit.inc.c" +#include "world/common/enemy/Bandit.inc.c" -StaticNpc N(NpcData_Bandit) = { +NpcData N(NpcData_Bandit) = { .id = NPC_Bandit, - .settings = &N(NpcSettings_Bandit), .pos = { -40.0f, 0.0f, 155.0f }, .yaw = 270, - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, - .drops = BANDIT_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -21,6 +18,9 @@ StaticNpc N(NpcData_Bandit) = { .detectSize = { 1000 }, } }, + .settings = &N(NpcSettings_Bandit), + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .drops = BANDIT_DROPS, .animations = BANDIT_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, }; diff --git a/src/world/area_sbk/sbk_40/sbk_40_2_npc.c b/src/world/area_sbk/sbk_40/sbk_40_2_npc.c index fac02f48a8..5181609f17 100644 --- a/src/world/area_sbk/sbk_40/sbk_40_2_npc.c +++ b/src/world/area_sbk/sbk_40/sbk_40_2_npc.c @@ -1,14 +1,11 @@ #include "sbk_40.h" -#include "world/common/enemy/complete/Bandit.inc.c" +#include "world/common/enemy/Bandit.inc.c" -StaticNpc N(NpcData_Bandit_01) = { +NpcData N(NpcData_Bandit_01) = { .id = NPC_Bandit_01, - .settings = &N(NpcSettings_Bandit), .pos = { -300.0f, 0.0f, 85.0f }, .yaw = 90, - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, - .drops = BANDIT_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -21,17 +18,17 @@ StaticNpc N(NpcData_Bandit_01) = { .detectSize = { 1000 }, } }, + .settings = &N(NpcSettings_Bandit), + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .drops = BANDIT_DROPS, .animations = BANDIT_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, }; -StaticNpc N(NpcData_Bandit_02) = { +NpcData N(NpcData_Bandit_02) = { .id = NPC_Bandit_02, - .settings = &N(NpcSettings_Bandit), .pos = { -80.0f, 0.0f, 190.0f }, .yaw = 90, - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, - .drops = BANDIT_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -44,6 +41,9 @@ StaticNpc N(NpcData_Bandit_02) = { .detectSize = { 1000 }, } }, + .settings = &N(NpcSettings_Bandit), + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .drops = BANDIT_DROPS, .animations = BANDIT_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, }; diff --git a/src/world/area_sbk/sbk_42/sbk_42_2_npc.c b/src/world/area_sbk/sbk_42/sbk_42_2_npc.c index 09a4107826..597ed55c5e 100644 --- a/src/world/area_sbk/sbk_42/sbk_42_2_npc.c +++ b/src/world/area_sbk/sbk_42/sbk_42_2_npc.c @@ -1,14 +1,11 @@ #include "sbk_42.h" -#include "world/common/enemy/complete/Bandit.inc.c" +#include "world/common/enemy/Bandit.inc.c" -StaticNpc N(NpcData_Bandit_01) = { +NpcData N(NpcData_Bandit_01) = { .id = NPC_Bandit_01, - .settings = &N(NpcSettings_Bandit), .pos = { -40.0f, 0.0f, 0.0f }, .yaw = 90, - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, - .drops = BANDIT_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -21,17 +18,17 @@ StaticNpc N(NpcData_Bandit_01) = { .detectSize = { 1000 }, } }, + .settings = &N(NpcSettings_Bandit), + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .drops = BANDIT_DROPS, .animations = BANDIT_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, }; -StaticNpc N(NpcData_Bandit_02) = { +NpcData N(NpcData_Bandit_02) = { .id = NPC_Bandit_02, - .settings = &N(NpcSettings_Bandit), .pos = { 60.0f, 0.0f, 30.0f }, .yaw = 270, - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, - .drops = BANDIT_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -44,6 +41,9 @@ StaticNpc N(NpcData_Bandit_02) = { .detectSize = { 1000 }, } }, + .settings = &N(NpcSettings_Bandit), + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .drops = BANDIT_DROPS, .animations = BANDIT_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, }; diff --git a/src/world/area_sbk/sbk_44/sbk_44_2_npc.c b/src/world/area_sbk/sbk_44/sbk_44_2_npc.c index 649eed9cfe..6e6c4b6f74 100644 --- a/src/world/area_sbk/sbk_44/sbk_44_2_npc.c +++ b/src/world/area_sbk/sbk_44/sbk_44_2_npc.c @@ -1,15 +1,12 @@ #include "sbk_44.h" -#include "world/common/enemy/complete/Bandit.inc.c" -#include "world/common/enemy/complete/Pokey.inc.c" +#include "world/common/enemy/Bandit.inc.c" +#include "world/common/enemy/Pokey.inc.c" -StaticNpc N(NpcData_Pokey_01) = { +NpcData N(NpcData_Pokey_01) = { .id = NPC_Pokey_01, - .settings = &N(NpcSettings_Pokey), .pos = { -100.0f, 0.0f, -55.0f }, .yaw = 90, - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, - .drops = POKEY_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -22,17 +19,17 @@ StaticNpc N(NpcData_Pokey_01) = { .detectSize = { 1000 }, } }, + .settings = &N(NpcSettings_Pokey), + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .drops = POKEY_DROPS, .animations = POKEY_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, }; -StaticNpc N(NpcData_Pokey_02) = { +NpcData N(NpcData_Pokey_02) = { .id = NPC_Pokey_02, - .settings = &N(NpcSettings_Pokey), .pos = { -22.0f, 0.0f, -5.0f }, .yaw = 90, - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, - .drops = POKEY_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -45,17 +42,17 @@ StaticNpc N(NpcData_Pokey_02) = { .detectSize = { 1000 }, } }, + .settings = &N(NpcSettings_Pokey), + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .drops = POKEY_DROPS, .animations = POKEY_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, }; -StaticNpc N(NpcData_Bandit) = { +NpcData N(NpcData_Bandit) = { .id = NPC_Bandit, - .settings = &N(NpcSettings_Bandit), .pos = { 150.0f, 0.0f, 80.0f }, .yaw = 90, - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, - .drops = BANDIT_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -68,6 +65,9 @@ StaticNpc N(NpcData_Bandit) = { .detectSize = { 1000 }, } }, + .settings = &N(NpcSettings_Bandit), + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .drops = BANDIT_DROPS, .animations = BANDIT_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, }; diff --git a/src/world/area_sbk/sbk_46/sbk_46_2_npc.c b/src/world/area_sbk/sbk_46/sbk_46_2_npc.c index 7c57f1ea34..a1c4e8bda6 100644 --- a/src/world/area_sbk/sbk_46/sbk_46_2_npc.c +++ b/src/world/area_sbk/sbk_46/sbk_46_2_npc.c @@ -1,15 +1,12 @@ #include "sbk_46.h" -#include "world/common/enemy/complete/Bandit.inc.c" -#include "world/common/enemy/complete/Pokey.inc.c" +#include "world/common/enemy/Bandit.inc.c" +#include "world/common/enemy/Pokey.inc.c" -StaticNpc N(NpcData_Pokey) = { +NpcData N(NpcData_Pokey) = { .id = NPC_Pokey, - .settings = &N(NpcSettings_Pokey), .pos = { 310.0f, 0.0f, -100.0f }, .yaw = 270, - .flags = ENEMY_FLAG_800, - .drops = POKEY_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -22,17 +19,17 @@ StaticNpc N(NpcData_Pokey) = { .detectSize = { 1000 }, } }, + .settings = &N(NpcSettings_Pokey), + .flags = ENEMY_FLAG_800, + .drops = POKEY_DROPS, .animations = POKEY_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, }; -StaticNpc N(NpcData_Bandit_01) = { +NpcData N(NpcData_Bandit_01) = { .id = NPC_Bandit_01, - .settings = &N(NpcSettings_Bandit), .pos = { -190.0f, 0.0f, -318.0f }, .yaw = 90, - .flags = ENEMY_FLAG_800, - .drops = BANDIT_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -45,17 +42,17 @@ StaticNpc N(NpcData_Bandit_01) = { .detectSize = { 1000 }, } }, + .settings = &N(NpcSettings_Bandit), + .flags = ENEMY_FLAG_800, + .drops = BANDIT_DROPS, .animations = BANDIT_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, }; -StaticNpc N(NpcData_Bandit_02) = { +NpcData N(NpcData_Bandit_02) = { .id = NPC_Bandit_02, - .settings = &N(NpcSettings_Bandit), .pos = { -200.0f, 0.0f, 115.0f }, .yaw = 300, - .flags = ENEMY_FLAG_800, - .drops = BANDIT_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -68,6 +65,9 @@ StaticNpc N(NpcData_Bandit_02) = { .detectSize = { 1000 }, } }, + .settings = &N(NpcSettings_Bandit), + .flags = ENEMY_FLAG_800, + .drops = BANDIT_DROPS, .animations = BANDIT_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, }; diff --git a/src/world/area_sbk/sbk_51/sbk_51_2_npc.c b/src/world/area_sbk/sbk_51/sbk_51_2_npc.c index b6fceb5103..059e74a30d 100644 --- a/src/world/area_sbk/sbk_51/sbk_51_2_npc.c +++ b/src/world/area_sbk/sbk_51/sbk_51_2_npc.c @@ -1,15 +1,12 @@ #include "sbk_51.h" -#include "world/common/enemy/complete/Bandit.inc.c" -#include "world/common/enemy/complete/Pokey.inc.c" +#include "world/common/enemy/Bandit.inc.c" +#include "world/common/enemy/Pokey.inc.c" -StaticNpc N(NpcData_Pokey) = { +NpcData N(NpcData_Pokey) = { .id = NPC_Pokey, - .settings = &N(NpcSettings_Pokey), .pos = { 180.0f, 0.0f, 120.0f }, .yaw = 0, - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, - .drops = POKEY_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -22,17 +19,17 @@ StaticNpc N(NpcData_Pokey) = { .detectSize = { 1000 }, } }, + .settings = &N(NpcSettings_Pokey), + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .drops = POKEY_DROPS, .animations = POKEY_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, }; -StaticNpc N(NpcData_Bandit) = { +NpcData N(NpcData_Bandit) = { .id = NPC_Bandit, - .settings = &N(NpcSettings_Bandit), .pos = { -60.0f, 0.0f, -88.0f }, .yaw = 0, - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, - .drops = BANDIT_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -45,6 +42,9 @@ StaticNpc N(NpcData_Bandit) = { .detectSize = { 1000 }, } }, + .settings = &N(NpcSettings_Bandit), + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .drops = BANDIT_DROPS, .animations = BANDIT_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, }; diff --git a/src/world/area_sbk/sbk_53/sbk_53_2_npc.c b/src/world/area_sbk/sbk_53/sbk_53_2_npc.c index b391170903..bf31cb21d9 100644 --- a/src/world/area_sbk/sbk_53/sbk_53_2_npc.c +++ b/src/world/area_sbk/sbk_53/sbk_53_2_npc.c @@ -1,14 +1,11 @@ #include "sbk_53.h" -#include "world/common/enemy/complete/Pokey.inc.c" +#include "world/common/enemy/Pokey.inc.c" -StaticNpc N(NpcData_Pokey_01) = { +NpcData N(NpcData_Pokey_01) = { .id = NPC_Pokey_01, - .settings = &N(NpcSettings_Pokey), .pos = { -176.0f, 0.0f, -196.0f }, .yaw = 0, - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, - .drops = POKEY_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -21,17 +18,17 @@ StaticNpc N(NpcData_Pokey_01) = { .detectSize = { 1000 }, } }, + .settings = &N(NpcSettings_Pokey), + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .drops = POKEY_DROPS, .animations = POKEY_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, }; -StaticNpc N(NpcData_Pokey_02) = { +NpcData N(NpcData_Pokey_02) = { .id = NPC_Pokey_02, - .settings = &N(NpcSettings_Pokey), .pos = { -110.0f, 0.0f, -270.0f }, .yaw = 270, - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, - .drops = POKEY_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -44,17 +41,17 @@ StaticNpc N(NpcData_Pokey_02) = { .detectSize = { 1000 }, } }, + .settings = &N(NpcSettings_Pokey), + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .drops = POKEY_DROPS, .animations = POKEY_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, }; -StaticNpc N(NpcData_Pokey_03) = { +NpcData N(NpcData_Pokey_03) = { .id = NPC_Pokey_03, - .settings = &N(NpcSettings_Pokey), .pos = { 252.0f, 0.0f, -233.0f }, .yaw = 270, - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, - .drops = POKEY_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -67,6 +64,9 @@ StaticNpc N(NpcData_Pokey_03) = { .detectSize = { 1000 }, } }, + .settings = &N(NpcSettings_Pokey), + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .drops = POKEY_DROPS, .animations = POKEY_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, }; diff --git a/src/world/area_sbk/sbk_55/sbk_55_2_npc.c b/src/world/area_sbk/sbk_55/sbk_55_2_npc.c index d014122401..e53954566d 100644 --- a/src/world/area_sbk/sbk_55/sbk_55_2_npc.c +++ b/src/world/area_sbk/sbk_55/sbk_55_2_npc.c @@ -1,14 +1,11 @@ #include "sbk_55.h" -#include "world/common/enemy/complete/Pokey.inc.c" +#include "world/common/enemy/Pokey.inc.c" -StaticNpc N(NpcData_Pokey_01) = { +NpcData N(NpcData_Pokey_01) = { .id = NPC_Pokey_01, - .settings = &N(NpcSettings_Pokey), .pos = { 43.0f, 0.0f, -120.0f }, .yaw = 270, - .flags = ENEMY_FLAG_800 | ENEMY_FLAG_2000, - .drops = POKEY_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -21,17 +18,17 @@ StaticNpc N(NpcData_Pokey_01) = { .detectSize = { 1000 }, } }, + .settings = &N(NpcSettings_Pokey), + .flags = ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .drops = POKEY_DROPS, .animations = POKEY_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, }; -StaticNpc N(NpcData_Pokey_02) = { +NpcData N(NpcData_Pokey_02) = { .id = NPC_Pokey_02, - .settings = &N(NpcSettings_Pokey), .pos = { -100.0f, 0.0f, -120.0f }, .yaw = 270, - .flags = ENEMY_FLAG_800 | ENEMY_FLAG_2000, - .drops = POKEY_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -44,6 +41,9 @@ StaticNpc N(NpcData_Pokey_02) = { .detectSize = { 1000 }, } }, + .settings = &N(NpcSettings_Pokey), + .flags = ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .drops = POKEY_DROPS, .animations = POKEY_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, }; diff --git a/src/world/area_sbk/sbk_60/sbk_60_2_npc.c b/src/world/area_sbk/sbk_60/sbk_60_2_npc.c index 312a45acb7..fc7aa73e89 100644 --- a/src/world/area_sbk/sbk_60/sbk_60_2_npc.c +++ b/src/world/area_sbk/sbk_60/sbk_60_2_npc.c @@ -1,14 +1,11 @@ #include "sbk_60.h" -#include "world/common/enemy/complete/Pokey.inc.c" +#include "world/common/enemy/Pokey.inc.c" -StaticNpc N(NpcData_Pokey) = { +NpcData N(NpcData_Pokey) = { .id = NPC_Pokey, - .settings = &N(NpcSettings_Pokey), .pos = { 160.0f, 0.0f, -120.0f }, .yaw = 90, - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, - .drops = POKEY_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -21,6 +18,9 @@ StaticNpc N(NpcData_Pokey) = { .detectSize = { 1000 }, } }, + .settings = &N(NpcSettings_Pokey), + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .drops = POKEY_DROPS, .animations = POKEY_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, }; diff --git a/src/world/area_sbk/sbk_62/sbk_62_2_npc.c b/src/world/area_sbk/sbk_62/sbk_62_2_npc.c index 7312a0e1bb..9cd3299780 100644 --- a/src/world/area_sbk/sbk_62/sbk_62_2_npc.c +++ b/src/world/area_sbk/sbk_62/sbk_62_2_npc.c @@ -1,14 +1,11 @@ #include "sbk_62.h" -#include "world/common/enemy/complete/Pokey.inc.c" +#include "world/common/enemy/Pokey.inc.c" -StaticNpc N(NpcData_Pokey_01) = { +NpcData N(NpcData_Pokey_01) = { .id = NPC_Pokey_01, - .settings = &N(NpcSettings_Pokey), .pos = { -180.0f, 0.0f, -100.0f }, .yaw = 90, - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, - .drops = POKEY_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -21,17 +18,17 @@ StaticNpc N(NpcData_Pokey_01) = { .detectSize = { 1000 }, } }, + .settings = &N(NpcSettings_Pokey), + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .drops = POKEY_DROPS, .animations = POKEY_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, }; -StaticNpc N(NpcData_Pokey_02) = { +NpcData N(NpcData_Pokey_02) = { .id = NPC_Pokey_02, - .settings = &N(NpcSettings_Pokey), .pos = { 120.0f, 0.0f, 110.0f }, .yaw = 270, - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, - .drops = POKEY_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -44,17 +41,17 @@ StaticNpc N(NpcData_Pokey_02) = { .detectSize = { 1000 }, } }, + .settings = &N(NpcSettings_Pokey), + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .drops = POKEY_DROPS, .animations = POKEY_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, }; -StaticNpc N(NpcData_Pokey_03) = { +NpcData N(NpcData_Pokey_03) = { .id = NPC_Pokey_03, - .settings = &N(NpcSettings_Pokey), .pos = { 245.0f, 0.0f, 285.0f }, .yaw = 90, - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, - .drops = POKEY_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -67,6 +64,9 @@ StaticNpc N(NpcData_Pokey_03) = { .detectSize = { 1000 }, } }, + .settings = &N(NpcSettings_Pokey), + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .drops = POKEY_DROPS, .animations = POKEY_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, }; diff --git a/src/world/area_sbk/sbk_63/sbk_63_2_npc.c b/src/world/area_sbk/sbk_63/sbk_63_2_npc.c index 4fef8f2afe..c145c1a3da 100644 --- a/src/world/area_sbk/sbk_63/sbk_63_2_npc.c +++ b/src/world/area_sbk/sbk_63/sbk_63_2_npc.c @@ -1,14 +1,11 @@ #include "sbk_63.h" -#include "world/common/enemy/complete/Pokey.inc.c" +#include "world/common/enemy/Pokey.inc.c" -StaticNpc N(NpcData_Pokey_01) = { +NpcData N(NpcData_Pokey_01) = { .id = NPC_Pokey_01, - .settings = &N(NpcSettings_Pokey), .pos = { -180.0f, 0.0f, -120.0f }, .yaw = 90, - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, - .drops = POKEY_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -21,17 +18,17 @@ StaticNpc N(NpcData_Pokey_01) = { .detectSize = { 1000 }, } }, + .settings = &N(NpcSettings_Pokey), + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .drops = POKEY_DROPS, .animations = POKEY_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, }; -StaticNpc N(NpcData_Pokey_02) = { +NpcData N(NpcData_Pokey_02) = { .id = NPC_Pokey_02, - .settings = &N(NpcSettings_Pokey), .pos = { 120.0f, 0.0f, -105.0f }, .yaw = 90, - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, - .drops = POKEY_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -44,6 +41,9 @@ StaticNpc N(NpcData_Pokey_02) = { .detectSize = { 1000 }, } }, + .settings = &N(NpcSettings_Pokey), + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .drops = POKEY_DROPS, .animations = POKEY_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, }; diff --git a/src/world/area_sbk/sbk_66/sbk_66_2_npc.c b/src/world/area_sbk/sbk_66/sbk_66_2_npc.c index 309ee46083..0220730ff9 100644 --- a/src/world/area_sbk/sbk_66/sbk_66_2_npc.c +++ b/src/world/area_sbk/sbk_66/sbk_66_2_npc.c @@ -1,14 +1,11 @@ #include "sbk_66.h" -#include "world/common/enemy/complete/Bandit.inc.c" +#include "world/common/enemy/Bandit.inc.c" -StaticNpc N(NpcData_Bandit_01) = { +NpcData N(NpcData_Bandit_01) = { .id = NPC_Bandit_01, - .settings = &N(NpcSettings_Bandit), .pos = { -120.0f, 0.0f, 45.0f }, .yaw = 90, - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, - .drops = BANDIT_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -21,17 +18,17 @@ StaticNpc N(NpcData_Bandit_01) = { .detectSize = { 1000 }, } }, + .settings = &N(NpcSettings_Bandit), + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .drops = BANDIT_DROPS, .animations = BANDIT_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, }; -StaticNpc N(NpcData_Bandit_02) = { +NpcData N(NpcData_Bandit_02) = { .id = NPC_Bandit_02, - .settings = &N(NpcSettings_Bandit), .pos = { -76.0f, 0.0f, -20.0f }, .yaw = 90, - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, - .drops = BANDIT_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -44,17 +41,17 @@ StaticNpc N(NpcData_Bandit_02) = { .detectSize = { 1000 }, } }, + .settings = &N(NpcSettings_Bandit), + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .drops = BANDIT_DROPS, .animations = BANDIT_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, }; -StaticNpc N(NpcData_Bandit_03) = { +NpcData N(NpcData_Bandit_03) = { .id = NPC_Bandit_03, - .settings = &N(NpcSettings_Bandit), .pos = { -78.0f, 0.0f, 80.0f }, .yaw = 270, - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, - .drops = BANDIT_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -67,17 +64,17 @@ StaticNpc N(NpcData_Bandit_03) = { .detectSize = { 1000 }, } }, + .settings = &N(NpcSettings_Bandit), + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .drops = BANDIT_DROPS, .animations = BANDIT_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, }; -StaticNpc N(NpcData_Bandit_04) = { +NpcData N(NpcData_Bandit_04) = { .id = NPC_Bandit_04, - .settings = &N(NpcSettings_Bandit), .pos = { -20.0f, 0.0f, 40.0f }, .yaw = 270, - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, - .drops = BANDIT_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -90,17 +87,17 @@ StaticNpc N(NpcData_Bandit_04) = { .detectSize = { 1000 }, } }, + .settings = &N(NpcSettings_Bandit), + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .drops = BANDIT_DROPS, .animations = BANDIT_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, }; -StaticNpc N(NpcData_Bandit_05) = { +NpcData N(NpcData_Bandit_05) = { .id = NPC_Bandit_05, - .settings = &N(NpcSettings_Bandit), .pos = { 45.0f, 0.0f, -30.0f }, .yaw = 270, - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, - .drops = BANDIT_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -113,17 +110,17 @@ StaticNpc N(NpcData_Bandit_05) = { .detectSize = { 1000 }, } }, + .settings = &N(NpcSettings_Bandit), + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .drops = BANDIT_DROPS, .animations = BANDIT_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, }; -StaticNpc N(NpcData_Bandit_06) = { +NpcData N(NpcData_Bandit_06) = { .id = NPC_Bandit_06, - .settings = &N(NpcSettings_Bandit), .pos = { 40.0f, 0.0f, 150.0f }, .yaw = 270, - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, - .drops = BANDIT_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -136,6 +133,9 @@ StaticNpc N(NpcData_Bandit_06) = { .detectSize = { 1000 }, } }, + .settings = &N(NpcSettings_Bandit), + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .drops = BANDIT_DROPS, .animations = BANDIT_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, }; diff --git a/src/world/area_tik/tik.h b/src/world/area_tik/tik.h index 19134b86cd..d6dabfa79b 100644 --- a/src/world/area_tik/tik.h +++ b/src/world/area_tik/tik.h @@ -2,22 +2,22 @@ #define _WORLD_AREA_TIK_TIK_H_ enum { - AB_TIK_0 = AreaByte(0), - AB_TIK_1 = AreaByte(1), - AB_TIK_2 = AreaByte(2), - AB_TIK_3 = AreaByte(3), - AB_TIK_4 = AreaByte(4), - AB_TIK_5 = AreaByte(5), - AB_TIK_6 = AreaByte(6), - AB_TIK_7 = AreaByte(7), - AB_TIK_8 = AreaByte(8), - AB_TIK_9 = AreaByte(9), - AB_TIK_A = AreaByte(10), - AB_TIK_B = AreaByte(11), - AB_TIK_C = AreaByte(12), - AB_TIK_D = AreaByte(13), - AB_TIK_E = AreaByte(14), - AB_TIK_F = AreaByte(15), + AB_TIK_Unused_0 = AreaByte(0), + AB_TIK_Unused_1 = AreaByte(1), + AB_TIK_Unused_2 = AreaByte(2), + AB_TIK_Unused_3 = AreaByte(3), + AB_TIK_Unused_4 = AreaByte(4), + AB_TIK_Unused_5 = AreaByte(5), + AB_TIK_Unused_6 = AreaByte(6), + AB_TIK_Unused_7 = AreaByte(7), + AB_TIK_Unused_8 = AreaByte(8), + AB_TIK_Unused_9 = AreaByte(9), + AB_TIK_Unused_A = AreaByte(10), + AB_TIK_Unused_B = AreaByte(11), + AB_TIK_Unused_C = AreaByte(12), + AB_TIK_Unused_D = AreaByte(13), + AB_TIK_Unused_E = AreaByte(14), + AB_TIK_Unused_F = AreaByte(15), }; enum { diff --git a/src/world/area_tik/tik_01/tik_01_2_main.c b/src/world/area_tik/tik_01/tik_01_2_main.c index addfdaf01c..d2db764d2b 100644 --- a/src/world/area_tik/tik_01/tik_01_2_main.c +++ b/src/world/area_tik/tik_01/tik_01_2_main.c @@ -1,7 +1,6 @@ #include "tik_01.h" #include "world/common/atomic/TexturePan.inc.c" -#include "world/common/atomic/TexturePan.data.inc.c" #include "world/common/entity/Pipe.inc.c" diff --git a/src/world/area_tik/tik_01/tik_01_5_npc.c b/src/world/area_tik/tik_01/tik_01_5_npc.c index 8718553a31..22731faaca 100644 --- a/src/world/area_tik/tik_01/tik_01_5_npc.c +++ b/src/world/area_tik/tik_01/tik_01_5_npc.c @@ -1,6 +1,6 @@ #include "tik_01.h" -#include "world/common/enemy/complete/Blooper.inc.c" +#include "world/common/enemy/Blooper.inc.c" EvtScript N(EVS_NpcIdle_Blooper) = { EVT_LOOP(0) @@ -87,14 +87,14 @@ EvtScript N(EVS_NpcInit_Blooper) = { EVT_END }; -StaticNpc N(NpcData_Blooper) = { +NpcData N(NpcData_Blooper) = { .id = NPC_Blooper, - .settings = &N(NpcSettings_Blooper), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 90, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_NO_DROPS, .init = &N(EVS_NpcInit_Blooper), - .drops = BLOOPER_NO_DROPS, + .settings = &N(NpcSettings_Blooper), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_NO_DROPS, + .drops = NO_DROPS, .animations = BLOOPER_ANIMS, }; diff --git a/src/world/area_tik/tik_02/tik_02_2_main.c b/src/world/area_tik/tik_02/tik_02_2_main.c index 68dbc90012..45e740d739 100644 --- a/src/world/area_tik/tik_02/tik_02_2_main.c +++ b/src/world/area_tik/tik_02/tik_02_2_main.c @@ -1,7 +1,6 @@ #include "tik_02.h" #include "world/common/atomic/TexturePan.inc.c" -#include "world/common/atomic/TexturePan.data.inc.c" EvtScript N(EVS_ExitWalk_tik_18_1) = EVT_EXIT_WALK(60, tik_02_ENTRY_0, "tik_18", tik_18_ENTRY_1); diff --git a/src/world/area_tik/tik_02/tik_02_5_npc.c b/src/world/area_tik/tik_02/tik_02_5_npc.c index 98a933d997..dadc81ee53 100644 --- a/src/world/area_tik/tik_02/tik_02_5_npc.c +++ b/src/world/area_tik/tik_02/tik_02_5_npc.c @@ -1,6 +1,6 @@ #include "tik_02.h" -#include "world/common/enemy/complete/Blooper.inc.c" +#include "world/common/enemy/Blooper.inc.c" EvtScript N(EVS_NpcIdle_Blooper) = { EVT_LOOP(0) @@ -105,14 +105,14 @@ EvtScript N(EVS_NpcInit_Blooper) = { EVT_END }; -StaticNpc N(NpcData_Blooper) = { +NpcData N(NpcData_Blooper) = { .id = NPC_Blooper, - .settings = &N(NpcSettings_Blooper), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 90, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_NO_DROPS, .init = &N(EVS_NpcInit_Blooper), - .drops = BLOOPER_NO_DROPS, + .settings = &N(NpcSettings_Blooper), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_NO_DROPS, + .drops = NO_DROPS, .animations = BLOOPER_ANIMS, }; diff --git a/src/world/area_tik/tik_03/tik_03_2_main.c b/src/world/area_tik/tik_03/tik_03_2_main.c index 87c53b9bc6..a18d34b206 100644 --- a/src/world/area_tik/tik_03/tik_03_2_main.c +++ b/src/world/area_tik/tik_03/tik_03_2_main.c @@ -3,7 +3,6 @@ #include "world/common/entity/Pipe.inc.c" #include "world/common/atomic/TexturePan.inc.c" -#include "world/common/atomic/TexturePan.data.inc.c" EvtScript N(EVS_ExitWalk_tik_01_1) = EVT_EXIT_WALK(60, tik_03_ENTRY_0, "tik_01", tik_01_ENTRY_1); @@ -76,7 +75,7 @@ EvtScript N(EVS_Main) = { EVT_END_THREAD EVT_EXEC(N(EVS_SetupPlatforms)) EVT_CALL(GetDemoState, LVar0) - EVT_IF_NE(LVar0, 0) + EVT_IF_NE(LVar0, DEMO_STATE_NONE) EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitPipe_tik_04_2)), TRIGGER_WALL_PUSH, COLLIDER_o46, 1, 0) EVT_EXEC_WAIT(N(EVS_PlayDemoScene)) EVT_RETURN diff --git a/src/world/area_tik/tik_03/tik_03_6_demo.c b/src/world/area_tik/tik_03/tik_03_6_demo.c index 972a1b1e9b..3d942d665f 100644 --- a/src/world/area_tik/tik_03/tik_03_6_demo.c +++ b/src/world/area_tik/tik_03/tik_03_6_demo.c @@ -33,7 +33,7 @@ EvtScript N(EVS_MonitorDemoState) = { EVT_WAIT(10) EVT_LOOP(0) EVT_CALL(GetDemoState, LVar0) - EVT_IF_EQ(LVar0, 2) + EVT_IF_EQ(LVar0, DEMO_STATE_CHANGE_MAP) EVT_BREAK_LOOP EVT_END_IF EVT_WAIT(1) diff --git a/src/world/area_tik/tik_04/tik_04_2_main.c b/src/world/area_tik/tik_04/tik_04_2_main.c index 92709dedc2..064cd5fc56 100644 --- a/src/world/area_tik/tik_04/tik_04_2_main.c +++ b/src/world/area_tik/tik_04/tik_04_2_main.c @@ -1,7 +1,6 @@ #include "tik_04.h" #include "world/common/atomic/TexturePan.inc.c" -#include "world/common/atomic/TexturePan.data.inc.c" #include "world/common/entity/Pipe.inc.c" diff --git a/src/world/area_tik/tik_04/tik_04_5_npc.c b/src/world/area_tik/tik_04/tik_04_5_npc.c index a9e08b6769..34e6aa68e2 100644 --- a/src/world/area_tik/tik_04/tik_04_5_npc.c +++ b/src/world/area_tik/tik_04/tik_04_5_npc.c @@ -1,6 +1,6 @@ #include "tik_04.h" -#include "world/common/enemy/complete/SpikedGloomba_Wander.inc.c" +#include "world/common/enemy/SpikedGloomba_Wander.inc.c" EvtScript N(EVS_NpcIdle_SpikedGloomba) = { EVT_CALL(GetEntryID, LVar0) @@ -44,14 +44,10 @@ EvtScript N(EVS_NpcInit_SpikedGloomba) = { EVT_END }; -StaticNpc N(NpcData_SpikedGloomba_01) = { +NpcData N(NpcData_SpikedGloomba_01) = { .id = NPC_SpikedGoomba_01, - .settings = &N(NpcSettings_SpikedGloomba_Wander), .pos = { 40.0f, -135.0f, 10.0f }, .yaw = 270, - .flags = ENEMY_FLAG_400, - .init = &N(EVS_NpcInit_SpikedGloomba), - .drops = SPIKED_GLOOMBA_DROPS, .territory = { .wander = { .isFlying = FALSE, @@ -64,17 +60,17 @@ StaticNpc N(NpcData_SpikedGloomba_01) = { .detectSize = { 200 }, } }, + .init = &N(EVS_NpcInit_SpikedGloomba), + .settings = &N(NpcSettings_SpikedGloomba_Wander), + .flags = ENEMY_FLAG_400, + .drops = SPIKED_GLOOMBA_DROPS, .animations = SPIKED_GLOOMBA_ANIMS, }; -StaticNpc N(NpcData_SpikedGloomba_02) = { +NpcData N(NpcData_SpikedGloomba_02) = { .id = NPC_SpikedGoomba_02, - .settings = &N(NpcSettings_SpikedGloomba_Wander), .pos = { 141.0f, -135.0f, 85.0f }, .yaw = 270, - .flags = ENEMY_FLAG_400, - .init = &N(EVS_NpcInit_SpikedGloomba), - .drops = SPIKED_GLOOMBA_DROPS, .territory = { .wander = { .isFlying = FALSE, @@ -87,6 +83,10 @@ StaticNpc N(NpcData_SpikedGloomba_02) = { .detectSize = { 200 }, } }, + .init = &N(EVS_NpcInit_SpikedGloomba), + .settings = &N(NpcSettings_SpikedGloomba_Wander), + .flags = ENEMY_FLAG_400, + .drops = SPIKED_GLOOMBA_DROPS, .animations = SPIKED_GLOOMBA_ANIMS, }; diff --git a/src/world/area_tik/tik_05/tik_05_2_main.c b/src/world/area_tik/tik_05/tik_05_2_main.c index f3c2f51f6c..a59d129b90 100644 --- a/src/world/area_tik/tik_05/tik_05_2_main.c +++ b/src/world/area_tik/tik_05/tik_05_2_main.c @@ -1,7 +1,6 @@ #include "tik_05.h" #include "world/common/atomic/TexturePan.inc.c" -#include "world/common/atomic/TexturePan.data.inc.c" EvtScript N(EVS_ExitWalk_tik_04_0) = EVT_EXIT_WALK(60, tik_05_ENTRY_0, "tik_04", tik_04_ENTRY_0); diff --git a/src/world/area_tik/tik_05/tik_05_5_npc.c b/src/world/area_tik/tik_05/tik_05_5_npc.c index 775b5fd3a2..75edeceb2e 100644 --- a/src/world/area_tik/tik_05/tik_05_5_npc.c +++ b/src/world/area_tik/tik_05/tik_05_5_npc.c @@ -1,14 +1,11 @@ #include "tik_05.h" -#include "world/common/enemy/complete/SpikedGloomba_Wander.inc.c" +#include "world/common/enemy/SpikedGloomba_Wander.inc.c" -StaticNpc N(NpcData_SpikedGloomba_01) = { +NpcData N(NpcData_SpikedGloomba_01) = { .id = NPC_SpikedGoomba_01, - .settings = &N(NpcSettings_SpikedGloomba_Wander), .pos = { 220.0f, -10.0f, -80.0f }, .yaw = 270, - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, - .drops = SPIKED_GLOOMBA_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -21,16 +18,16 @@ StaticNpc N(NpcData_SpikedGloomba_01) = { .detectSize = { 180, 100 }, } }, + .settings = &N(NpcSettings_SpikedGloomba_Wander), + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .drops = SPIKED_GLOOMBA_DROPS, .animations = SPIKED_GLOOMBA_ANIMS, }; -StaticNpc N(NpcData_SpikedGloomba_02) = { +NpcData N(NpcData_SpikedGloomba_02) = { .id = NPC_SpikedGoomba_02, - .settings = &N(NpcSettings_SpikedGloomba_Wander), .pos = { 130.0f, -10.0f, 45.0f }, .yaw = 90, - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, - .drops = SPIKED_GLOOMBA_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -43,6 +40,9 @@ StaticNpc N(NpcData_SpikedGloomba_02) = { .detectSize = { 180, 100 }, } }, + .settings = &N(NpcSettings_SpikedGloomba_Wander), + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .drops = SPIKED_GLOOMBA_DROPS, .animations = SPIKED_GLOOMBA_ANIMS, }; diff --git a/src/world/area_tik/tik_06/tik_06_2_main.c b/src/world/area_tik/tik_06/tik_06_2_main.c index 31b4e97724..eb473545c8 100644 --- a/src/world/area_tik/tik_06/tik_06_2_main.c +++ b/src/world/area_tik/tik_06/tik_06_2_main.c @@ -3,7 +3,6 @@ #include "world/common/entity/Pipe.inc.c" #include "world/common/atomic/TexturePan.inc.c" -#include "world/common/atomic/TexturePan.data.inc.c" EvtScript N(EVS_ExitWalk_tik_01_0) = EVT_EXIT_WALK(60, tik_06_ENTRY_0, "tik_01", tik_01_ENTRY_0); EvtScript N(EVS_ExitWalk_tik_18_0) = EVT_EXIT_WALK(60, tik_06_ENTRY_1, "tik_18", tik_18_ENTRY_0); diff --git a/src/world/area_tik/tik_07/tik_07_6_npc.c b/src/world/area_tik/tik_07/tik_07_6_npc.c index dd0130a1d2..d81a97acc7 100644 --- a/src/world/area_tik/tik_07/tik_07_6_npc.c +++ b/src/world/area_tik/tik_07/tik_07_6_npc.c @@ -1,14 +1,11 @@ #include "tik_07.h" -#include "world/common/enemy/complete/Paragloomba_Wander.inc.c" +#include "world/common/enemy/Paragloomba_Wander.inc.c" -StaticNpc N(NpcData_Paragloomba_01) = { +NpcData N(NpcData_Paragloomba_01) = { .id = NPC_Paragoomba_01, - .settings = &N(NpcSettings_Paragloomba_Wander), .pos = { 230.0f, 50.0f, 50.0f }, .yaw = 90, - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, - .drops = PARAGLOOMBA_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -21,16 +18,16 @@ StaticNpc N(NpcData_Paragloomba_01) = { .detectSize = { 150 }, } }, + .settings = &N(NpcSettings_Paragloomba_Wander), + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = PARAGLOOMBA_DROPS, .animations = PARAGLOOMBA_ANIMS, }; -StaticNpc N(NpcData_Paragloomba_02) = { +NpcData N(NpcData_Paragloomba_02) = { .id = NPC_Paragoomba_02, - .settings = &N(NpcSettings_Paragloomba_Wander), .pos = { 535.0f, 50.0f, 20.0f }, .yaw = 90, - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, - .drops = PARAGLOOMBA_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -43,6 +40,9 @@ StaticNpc N(NpcData_Paragloomba_02) = { .detectSize = { 150 }, } }, + .settings = &N(NpcSettings_Paragloomba_Wander), + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = PARAGLOOMBA_DROPS, .animations = PARAGLOOMBA_ANIMS, }; diff --git a/src/world/area_tik/tik_08/tik_08_2_main.c b/src/world/area_tik/tik_08/tik_08_2_main.c index c67a7ff998..c9b63d4f85 100644 --- a/src/world/area_tik/tik_08/tik_08_2_main.c +++ b/src/world/area_tik/tik_08/tik_08_2_main.c @@ -3,7 +3,6 @@ #include "world/common/entity/Pipe.inc.c" #include "world/common/atomic/TexturePan.inc.c" -#include "world/common/atomic/TexturePan.data.inc.c" EvtScript N(EVS_ExitWalk_tik_09_1) = EVT_EXIT_WALK(60, tik_08_ENTRY_0, "tik_09", tik_09_ENTRY_1); EvtScript N(EVS_ExitWalk_tik_20_0) = EVT_EXIT_WALK(60, tik_08_ENTRY_1, "tik_20", tik_20_ENTRY_0); diff --git a/src/world/area_tik/tik_08/tik_08_5_npc.c b/src/world/area_tik/tik_08/tik_08_5_npc.c index 109732bd9b..9c3e72de7f 100644 --- a/src/world/area_tik/tik_08/tik_08_5_npc.c +++ b/src/world/area_tik/tik_08/tik_08_5_npc.c @@ -2,7 +2,7 @@ #include "world/common/todo/GetFloorCollider.inc.c" -#include "world/common/enemy/complete/Blooper.inc.c" +#include "world/common/enemy/Blooper.inc.c" EvtScript N(EVS_NpcIdle_Blooper) = { EVT_LOOP(0) @@ -104,14 +104,14 @@ EvtScript N(EVS_NpcInit_Blooper) = { EVT_END }; -StaticNpc N(NpcData_Blooper) = { +NpcData N(NpcData_Blooper) = { .id = NPC_Blooper, - .settings = &N(NpcSettings_Blooper), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 90, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_NO_DROPS, .init = &N(EVS_NpcInit_Blooper), - .drops = BLOOPER_NO_DROPS, + .settings = &N(NpcSettings_Blooper), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_NO_DROPS, + .drops = NO_DROPS, .animations = BLOOPER_ANIMS, }; diff --git a/src/world/area_tik/tik_09/tik_09_2_main.c b/src/world/area_tik/tik_09/tik_09_2_main.c index 4554e3e6d8..fe11dc0596 100644 --- a/src/world/area_tik/tik_09/tik_09_2_main.c +++ b/src/world/area_tik/tik_09/tik_09_2_main.c @@ -3,7 +3,6 @@ #include "world/common/entity/Pipe.inc.c" #include "world/common/atomic/TexturePan.inc.c" -#include "world/common/atomic/TexturePan.data.inc.c" EvtScript N(EVS_CloseGates) = { EVT_CALL(DisablePlayerInput, TRUE) diff --git a/src/world/area_tik/tik_09/tik_09_5_npc.c b/src/world/area_tik/tik_09/tik_09_5_npc.c index 427698474f..da9b379b3d 100644 --- a/src/world/area_tik/tik_09/tik_09_5_npc.c +++ b/src/world/area_tik/tik_09/tik_09_5_npc.c @@ -1,6 +1,6 @@ #include "tik_09.h" -#include "world/common/enemy/complete/DarkTroopa_Wander.inc.c" +#include "world/common/enemy/DarkTroopa_Wander.inc.c" #include "world/common/util/GetDefeatedEnemyCount.inc.c" @@ -49,14 +49,10 @@ EvtScript N(EVS_NpcInit_DarkTroopa) = { EVT_END }; -StaticNpc N(NpcData_KoopaTroopa_01) = { +NpcData N(NpcData_KoopaTroopa_01) = { .id = NPC_KoopaTroopa_01, - .settings = &N(NpcSettings_DarkTroopa_Wander), .pos = { -80.0f, -10.0f, 0.0f }, .yaw = 90, - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000, - .init = &N(EVS_NpcInit_DarkTroopa), - .drops = DARK_TROOPA_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -69,18 +65,18 @@ StaticNpc N(NpcData_KoopaTroopa_01) = { .detectSize = { 200 }, } }, + .init = &N(EVS_NpcInit_DarkTroopa), + .settings = &N(NpcSettings_DarkTroopa_Wander), + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000, + .drops = DARK_TROOPA_DROPS, .animations = DARK_TROOPA_ANIMS, .aiDetectFlags = AI_DETECT_SENSITIVE_MOTION, }; -StaticNpc N(NpcData_KoopaTroopa_02) = { +NpcData N(NpcData_KoopaTroopa_02) = { .id = NPC_KoopaTroopa_02, - .settings = &N(NpcSettings_DarkTroopa_Wander), .pos = { 60.0f, -10.0f, 0.0f }, .yaw = 90, - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000, - .init = &N(EVS_NpcInit_DarkTroopa), - .drops = DARK_TROOPA_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -93,18 +89,18 @@ StaticNpc N(NpcData_KoopaTroopa_02) = { .detectSize = { 200 }, } }, + .init = &N(EVS_NpcInit_DarkTroopa), + .settings = &N(NpcSettings_DarkTroopa_Wander), + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000, + .drops = DARK_TROOPA_DROPS, .animations = DARK_TROOPA_ANIMS, .aiDetectFlags = AI_DETECT_SENSITIVE_MOTION, }; -StaticNpc N(NpcData_KoopaTroopa_03) = { +NpcData N(NpcData_KoopaTroopa_03) = { .id = NPC_KoopaTroopa_03, - .settings = &N(NpcSettings_DarkTroopa_Wander), .pos = { 180.0f, -10.0f, 0.0f }, .yaw = 270, - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000, - .init = &N(EVS_NpcInit_DarkTroopa), - .drops = DARK_TROOPA_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -117,6 +113,10 @@ StaticNpc N(NpcData_KoopaTroopa_03) = { .detectSize = { 200 }, } }, + .init = &N(EVS_NpcInit_DarkTroopa), + .settings = &N(NpcSettings_DarkTroopa_Wander), + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000, + .drops = DARK_TROOPA_DROPS, .animations = DARK_TROOPA_ANIMS, .aiDetectFlags = AI_DETECT_SENSITIVE_MOTION, }; diff --git a/src/world/area_tik/tik_10/tik_10_2_main.c b/src/world/area_tik/tik_10/tik_10_2_main.c index f095063bbb..dd0fbc5a69 100644 --- a/src/world/area_tik/tik_10/tik_10_2_main.c +++ b/src/world/area_tik/tik_10/tik_10_2_main.c @@ -1,7 +1,6 @@ #include "tik_10.h" #include "world/common/atomic/TexturePan.inc.c" -#include "world/common/atomic/TexturePan.data.inc.c" EvtScript N(EVS_ExitWalk_tik_09_0) = EVT_EXIT_WALK(60, tik_10_ENTRY_0, "tik_09", tik_09_ENTRY_0); diff --git a/src/world/area_tik/tik_12/tik_12_2_main.c b/src/world/area_tik/tik_12/tik_12_2_main.c index 08b6ea8fed..e2f0ca291d 100644 --- a/src/world/area_tik/tik_12/tik_12_2_main.c +++ b/src/world/area_tik/tik_12/tik_12_2_main.c @@ -3,7 +3,6 @@ #include "world/common/entity/Pipe.inc.c" #include "world/common/atomic/TexturePan.inc.c" -#include "world/common/atomic/TexturePan.data.inc.c" EvtScript N(EVS_GotoMap_tik_04_3) = { EVT_CALL(GotoMap, EVT_PTR("tik_04"), tik_04_ENTRY_3) diff --git a/src/world/area_tik/tik_12/tik_12_5_npc.c b/src/world/area_tik/tik_12/tik_12_5_npc.c index 6ef48cf6e7..dc95e7e4fd 100644 --- a/src/world/area_tik/tik_12/tik_12_5_npc.c +++ b/src/world/area_tik/tik_12/tik_12_5_npc.c @@ -1,14 +1,11 @@ #include "tik_12.h" -#include "world/common/enemy/complete/SpikeTop.inc.c" +#include "world/common/enemy/SpikeTop.inc.c" -StaticNpc N(NpcData_BuzzyBeetle) = { +NpcData N(NpcData_BuzzyBeetle) = { .id = NPC_BuzzyBeetle, - .settings = &N(NpcSettings_BuzzyBeetle), .pos = { -6.0f, -135.0f, 75.0f }, .yaw = 90, - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, - .drops = TIK_BUZZY_BEETLE_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -21,6 +18,9 @@ StaticNpc N(NpcData_BuzzyBeetle) = { .detectSize = { 150 }, } }, + .settings = &N(NpcSettings_BuzzyBeetle), + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .drops = TIK_BUZZY_BEETLE_DROPS, .animations = BUZZY_BEETLE_ANIMS, .aiDetectFlags = AI_DETECT_SENSITIVE_MOTION, }; diff --git a/src/world/area_tik/tik_14/tik_14_2_main.c b/src/world/area_tik/tik_14/tik_14_2_main.c index b58437249f..0680595ea1 100644 --- a/src/world/area_tik/tik_14/tik_14_2_main.c +++ b/src/world/area_tik/tik_14/tik_14_2_main.c @@ -3,7 +3,6 @@ #include "world/common/entity/Pipe.inc.c" #include "world/common/atomic/TexturePan.inc.c" -#include "world/common/atomic/TexturePan.data.inc.c" EvtScript N(EVS_ExitWalk_tik_15_0) = EVT_EXIT_WALK(60, tik_14_ENTRY_1, "tik_15", tik_15_ENTRY_0); diff --git a/src/world/area_tik/tik_15/tik_15_2_main.c b/src/world/area_tik/tik_15/tik_15_2_main.c index f38933d3eb..696f36f78d 100644 --- a/src/world/area_tik/tik_15/tik_15_2_main.c +++ b/src/world/area_tik/tik_15/tik_15_2_main.c @@ -3,7 +3,6 @@ #include "world/common/entity/Pipe.inc.c" #include "world/common/atomic/TexturePan.inc.c" -#include "world/common/atomic/TexturePan.data.inc.c" EvtScript N(EVS_ExitWalk_tik_14_1) = EVT_EXIT_WALK(60, tik_15_ENTRY_0, "tik_14", tik_14_ENTRY_1); diff --git a/src/world/area_tik/tik_15/tik_15_5_npc.c b/src/world/area_tik/tik_15/tik_15_5_npc.c index ee04b5a1d1..4a99912be3 100644 --- a/src/world/area_tik/tik_15/tik_15_5_npc.c +++ b/src/world/area_tik/tik_15/tik_15_5_npc.c @@ -126,18 +126,14 @@ EvtScript N(EVS_NpcInit_RipCheato) = { EVT_END }; -StaticNpc N(NpcData_RipCheato) = { +NpcData N(NpcData_RipCheato) = { .id = NPC_RipCheato, - .settings = &N(NpcSettings_RipCheato), .pos = { -80.0f, -10.0f, 0.0f }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_RipCheato), - .drops = { - .dropFlags = NPC_DROP_FLAG_80, - .heartDrops = NO_DROPS, - .flowerDrops = NO_DROPS, - }, + .settings = &N(NpcSettings_RipCheato), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = NO_DROPS, .animations = { .idle = ANIM_RipCheato_Idle, .walk = ANIM_RipCheato_Idle, diff --git a/src/world/area_tik/tik_17/tik_17_3_main.c b/src/world/area_tik/tik_17/tik_17_3_main.c index e74bfcf6ee..7340130de3 100644 --- a/src/world/area_tik/tik_17/tik_17_3_main.c +++ b/src/world/area_tik/tik_17/tik_17_3_main.c @@ -3,7 +3,6 @@ #include "world/common/entity/Pipe.inc.c" #include "world/common/atomic/TexturePan.inc.c" -#include "world/common/atomic/TexturePan.data.inc.c" EvtScript N(EVS_GotoMap_sam_02_2) = { EVT_IF_EQ(GF_StartedChapter7, FALSE) diff --git a/src/world/area_tik/tik_18/tik_18_2_main.c b/src/world/area_tik/tik_18/tik_18_2_main.c index 31230c2cb9..ef99e6968c 100644 --- a/src/world/area_tik/tik_18/tik_18_2_main.c +++ b/src/world/area_tik/tik_18/tik_18_2_main.c @@ -1,7 +1,6 @@ #include "tik_18.h" #include "world/common/atomic/TexturePan.inc.c" -#include "world/common/atomic/TexturePan.data.inc.c" EvtScript N(EVS_ExitWalk_tik_06_1) = EVT_EXIT_WALK(60, tik_18_ENTRY_0, "tik_06", tik_06_ENTRY_1); EvtScript N(EVS_ExitWalk_tik_02_0) = EVT_EXIT_WALK(60, tik_18_ENTRY_1, "tik_02", tik_02_ENTRY_0); diff --git a/src/world/area_tik/tik_18/tik_18_4_npc.c b/src/world/area_tik/tik_18/tik_18_4_npc.c index c221ce5f82..31b36bacb4 100644 --- a/src/world/area_tik/tik_18/tik_18_4_npc.c +++ b/src/world/area_tik/tik_18/tik_18_4_npc.c @@ -1,7 +1,7 @@ #include "tik_18.h" -#include "world/common/enemy/complete/Gloomba_Wander.inc.c" -#include "world/common/enemy/complete/SpikedGloomba_Wander.inc.c" +#include "world/common/enemy/Gloomba_Wander.inc.c" +#include "world/common/enemy/SpikedGloomba_Wander.inc.c" EvtScript N(EVS_NpcIdle_SpikedGloomba) = { // wait for activation from block breaking @@ -51,13 +51,10 @@ EvtScript N(EVS_NpcInit_SpikedGloomba) = { EVT_END }; -StaticNpc N(NpcData_Gloomba) = { +NpcData N(NpcData_Gloomba) = { .id = NPC_Gloomba, - .settings = &N(NpcSettings_Gloomba_Wander), .pos = { -60.0f, -10.0f, -30.0f }, .yaw = 90, - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, - .drops = GLOOMBA_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -70,17 +67,16 @@ StaticNpc N(NpcData_Gloomba) = { .detectSize = { 200 }, } }, + .settings = &N(NpcSettings_Gloomba_Wander), + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .drops = GLOOMBA_DROPS, .animations = GLOOMBA_ANIMS, }; -StaticNpc N(NpcData_SpikedGloomba) = { +NpcData N(NpcData_SpikedGloomba) = { .id = NPC_SpikedGloomba, - .settings = &N(NpcSettings_SpikedGloomba_Wander), .pos = { 30.0f, -10.0f, -20.0f }, .yaw = 270, - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, - .init = &N(EVS_NpcInit_SpikedGloomba), - .drops = SPIKED_GLOOMBA_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -93,6 +89,10 @@ StaticNpc N(NpcData_SpikedGloomba) = { .detectSize = { 200 }, } }, + .init = &N(EVS_NpcInit_SpikedGloomba), + .settings = &N(NpcSettings_SpikedGloomba_Wander), + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .drops = SPIKED_GLOOMBA_DROPS, .animations = SPIKED_GLOOMBA_ANIMS, }; diff --git a/src/world/area_tik/tik_19/tik_19_2_main.c b/src/world/area_tik/tik_19/tik_19_2_main.c index 5ebaec2ccb..78ee979ca7 100644 --- a/src/world/area_tik/tik_19/tik_19_2_main.c +++ b/src/world/area_tik/tik_19/tik_19_2_main.c @@ -3,7 +3,6 @@ #include "world/common/entity/Pipe.inc.c" #include "world/common/atomic/TexturePan.inc.c" -#include "world/common/atomic/TexturePan.data.inc.c" EvtScript N(EVS_GotoMap_mac_00_3) = { EVT_CALL(GotoMap, EVT_PTR("mac_00"), mac_00_ENTRY_3) diff --git a/src/world/area_tik/tik_20/tik_20_2_main.c b/src/world/area_tik/tik_20/tik_20_2_main.c index 91d141b4aa..c18a7c4807 100644 --- a/src/world/area_tik/tik_20/tik_20_2_main.c +++ b/src/world/area_tik/tik_20/tik_20_2_main.c @@ -1,7 +1,6 @@ #include "tik_20.h" #include "world/common/atomic/TexturePan.inc.c" -#include "world/common/atomic/TexturePan.data.inc.c" #include "world/common/entity/Pipe.inc.c" diff --git a/src/world/area_tik/tik_20/tik_20_3_npc.c b/src/world/area_tik/tik_20/tik_20_3_npc.c index 83ebd20dd2..bcf02627a1 100644 --- a/src/world/area_tik/tik_20/tik_20_3_npc.c +++ b/src/world/area_tik/tik_20/tik_20_3_npc.c @@ -1,14 +1,11 @@ #include "tik_20.h" -#include "world/common/enemy/complete/DarkTroopa_Wander.inc.c" +#include "world/common/enemy/DarkTroopa_Wander.inc.c" -StaticNpc N(NpcData_DarkTroopa_01) = { +NpcData N(NpcData_DarkTroopa_01) = { .id = NPC_DarkTroopa_01, - .settings = &N(NpcSettings_DarkTroopa_Wander), .pos = { -50.0f, -20.0f, 100.0f }, .yaw = 90, - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, - .drops = DARK_TROOPA_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -21,17 +18,17 @@ StaticNpc N(NpcData_DarkTroopa_01) = { .detectSize = { 250 }, } }, + .settings = &N(NpcSettings_DarkTroopa_Wander), + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = DARK_TROOPA_DROPS, .animations = DARK_TROOPA_ANIMS, .aiDetectFlags = AI_DETECT_SENSITIVE_MOTION, }; -StaticNpc N(NpcData_DarkTroopa_02) = { +NpcData N(NpcData_DarkTroopa_02) = { .id = NPC_DarkTroopa_02, - .settings = &N(NpcSettings_DarkTroopa_Wander), .pos = { 250.0f, -20.0f, 100.0f }, .yaw = 90, - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, - .drops = DARK_TROOPA_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -44,6 +41,9 @@ StaticNpc N(NpcData_DarkTroopa_02) = { .detectSize = { 250 }, } }, + .settings = &N(NpcSettings_DarkTroopa_Wander), + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = DARK_TROOPA_DROPS, .animations = DARK_TROOPA_ANIMS, .aiDetectFlags = AI_DETECT_SENSITIVE_MOTION, }; diff --git a/src/world/area_tik/tik_21/tik_21_2_main.c b/src/world/area_tik/tik_21/tik_21_2_main.c index 092e19df67..9925e1b352 100644 --- a/src/world/area_tik/tik_21/tik_21_2_main.c +++ b/src/world/area_tik/tik_21/tik_21_2_main.c @@ -1,7 +1,6 @@ #include "tik_21.h" #include "world/common/atomic/TexturePan.inc.c" -#include "world/common/atomic/TexturePan.data.inc.c" #include "world/common/entity/Pipe.inc.c" diff --git a/src/world/area_tik/tik_22/tik_22_2_main.c b/src/world/area_tik/tik_22/tik_22_2_main.c index cb571644e4..a8cf2c3e68 100644 --- a/src/world/area_tik/tik_22/tik_22_2_main.c +++ b/src/world/area_tik/tik_22/tik_22_2_main.c @@ -1,7 +1,6 @@ #include "tik_22.h" #include "world/common/atomic/TexturePan.inc.c" -#include "world/common/atomic/TexturePan.data.inc.c" #include "world/common/entity/Pipe.inc.c" diff --git a/src/world/area_tik/tik_23/tik_23_2_main.c b/src/world/area_tik/tik_23/tik_23_2_main.c index 4dc45323be..17b5781118 100644 --- a/src/world/area_tik/tik_23/tik_23_2_main.c +++ b/src/world/area_tik/tik_23/tik_23_2_main.c @@ -3,7 +3,6 @@ #include "world/common/entity/Pipe.inc.c" #include "world/common/atomic/TexturePan.inc.c" -#include "world/common/atomic/TexturePan.data.inc.c" EvtScript N(EVS_ExitWalk_tik_24_1) = EVT_EXIT_WALK(60, tik_23_ENTRY_0, "tik_24", tik_24_ENTRY_1); diff --git a/src/world/area_tik/tik_23/tik_23_4_npc.c b/src/world/area_tik/tik_23/tik_23_4_npc.c index 5d92fc6eb6..c5c89feb12 100644 --- a/src/world/area_tik/tik_23/tik_23_4_npc.c +++ b/src/world/area_tik/tik_23/tik_23_4_npc.c @@ -1,14 +1,11 @@ #include "tik_23.h" -#include "world/common/enemy/complete/Spiny.inc.c" +#include "world/common/enemy/Spiny.inc.c" -StaticNpc N(NpcData_Spiny_01) = { +NpcData N(NpcData_Spiny_01) = { .id = NPC_Spiny_01, - .settings = &N(NpcSettings_Spiny), .pos = { 25.0f, -20.0f, 0.0f }, .yaw = 270, - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, - .drops = SPINY_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -21,17 +18,17 @@ StaticNpc N(NpcData_Spiny_01) = { .detectSize = { 200 }, } }, + .settings = &N(NpcSettings_Spiny), + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = SPINY_DROPS, .animations = SPINY_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT | AI_DETECT_SENSITIVE_MOTION, }; -StaticNpc N(NpcData_Spiny_02) = { +NpcData N(NpcData_Spiny_02) = { .id = NPC_Spiny_02, - .settings = &N(NpcSettings_Spiny), .pos = { 275.0f, -20.0f, 120.0f }, .yaw = 90, - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, - .drops = SPINY_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -44,17 +41,17 @@ StaticNpc N(NpcData_Spiny_02) = { .detectSize = { 200 }, } }, + .settings = &N(NpcSettings_Spiny), + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = SPINY_DROPS, .animations = SPINY_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT | AI_DETECT_SENSITIVE_MOTION, }; -StaticNpc N(NpcData_Spiny_03) = { +NpcData N(NpcData_Spiny_03) = { .id = NPC_Spiny_03, - .settings = &N(NpcSettings_Spiny), .pos = { -150.0f, -20.0f, 120.0f }, .yaw = 90, - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, - .drops = SPINY_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -67,6 +64,9 @@ StaticNpc N(NpcData_Spiny_03) = { .detectSize = { 200 }, } }, + .settings = &N(NpcSettings_Spiny), + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = SPINY_DROPS, .animations = SPINY_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT | AI_DETECT_SENSITIVE_MOTION, }; diff --git a/src/world/area_tik/tik_24/tik_24_2_main.c b/src/world/area_tik/tik_24/tik_24_2_main.c index 616c36cf8f..479ef3af68 100644 --- a/src/world/area_tik/tik_24/tik_24_2_main.c +++ b/src/world/area_tik/tik_24/tik_24_2_main.c @@ -4,7 +4,6 @@ extern char STR_TIK_25[]; extern char STR_TIK_23[]; #include "world/common/atomic/TexturePan.inc.c" -#include "world/common/atomic/TexturePan.data.inc.c" EvtScript N(EVS_ExitWalk_tik_25_0) = EVT_EXIT_WALK(60, tik_24_ENTRY_0, STR_TIK_25, tik_25_ENTRY_0); EvtScript N(EVS_ExitWalk_tik_23_0) = EVT_EXIT_WALK(60, tik_24_ENTRY_1, STR_TIK_23, tik_23_ENTRY_0); diff --git a/src/world/area_tik/tik_24/tik_24_5_npc.c b/src/world/area_tik/tik_24/tik_24_5_npc.c index 7ee432a8ca..0df22c2888 100644 --- a/src/world/area_tik/tik_24/tik_24_5_npc.c +++ b/src/world/area_tik/tik_24/tik_24_5_npc.c @@ -1,14 +1,11 @@ #include "tik_24.h" -#include "world/common/enemy/complete/DarkTroopa_Wander.inc.c" +#include "world/common/enemy/DarkTroopa_Wander.inc.c" -StaticNpc N(NpcData_DarkTroopa_01) = { +NpcData N(NpcData_DarkTroopa_01) = { .id = NPC_DarkTroopa_01, - .settings = &N(NpcSettings_DarkTroopa_Wander), .pos = { -75.0f, -10.0f, 50.0f }, .yaw = 90, - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, - .drops = DARK_TROOPA_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -21,17 +18,17 @@ StaticNpc N(NpcData_DarkTroopa_01) = { .detectSize = { 250 }, } }, + .settings = &N(NpcSettings_DarkTroopa_Wander), + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = DARK_TROOPA_DROPS, .animations = DARK_TROOPA_ANIMS, .aiDetectFlags = AI_DETECT_SENSITIVE_MOTION, }; -StaticNpc N(NpcData_DarkTroopa_02) = { +NpcData N(NpcData_DarkTroopa_02) = { .id = NPC_DarkTroopa_02, - .settings = &N(NpcSettings_DarkTroopa_Wander), .pos = { 175.0f, -10.0f, -50.0f }, .yaw = 270, - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, - .drops = DARK_TROOPA_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -44,6 +41,9 @@ StaticNpc N(NpcData_DarkTroopa_02) = { .detectSize = { 250 }, } }, + .settings = &N(NpcSettings_DarkTroopa_Wander), + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = DARK_TROOPA_DROPS, .animations = DARK_TROOPA_ANIMS, .aiDetectFlags = AI_DETECT_SENSITIVE_MOTION, }; diff --git a/src/world/area_tik/tik_25/tik_25_2_main.c b/src/world/area_tik/tik_25/tik_25_2_main.c index cade7c7c4c..0ab5b2ba84 100644 --- a/src/world/area_tik/tik_25/tik_25_2_main.c +++ b/src/world/area_tik/tik_25/tik_25_2_main.c @@ -1,7 +1,6 @@ #include "tik_25.h" #include "world/common/atomic/TexturePan.inc.c" -#include "world/common/atomic/TexturePan.data.inc.c" EvtScript N(EVS_ExitWalk_tik_24_0) = EVT_EXIT_WALK(60, tik_25_ENTRY_0, "tik_24", tik_24_ENTRY_0); diff --git a/src/world/area_trd/trd.h b/src/world/area_trd/trd.h index c4fcb9cdc6..0e3e0b9eab 100644 --- a/src/world/area_trd/trd.h +++ b/src/world/area_trd/trd.h @@ -2,22 +2,22 @@ #define _WORLD_AREA_TRD_TRD_H_ enum { - AB_TRD_0 = AreaByte(0), - AB_TRD_1 = AreaByte(1), - AB_TRD_2 = AreaByte(2), - AB_TRD_3 = AreaByte(3), - AB_TRD_4 = AreaByte(4), - AB_TRD_5 = AreaByte(5), - AB_TRD_6 = AreaByte(6), - AB_TRD_7 = AreaByte(7), - AB_TRD_8 = AreaByte(8), - AB_TRD_9 = AreaByte(9), - AB_TRD_A = AreaByte(10), - AB_TRD_B = AreaByte(11), - AB_TRD_C = AreaByte(12), - AB_TRD_D = AreaByte(13), - AB_TRD_E = AreaByte(14), - AB_TRD_F = AreaByte(15), + AB_TRD_Unused_0 = AreaByte(0), + AB_TRD_Unused_1 = AreaByte(1), + AB_TRD_Unused_2 = AreaByte(2), + AB_TRD_Unused_3 = AreaByte(3), + AB_TRD_Unused_4 = AreaByte(4), + AB_TRD_Unused_5 = AreaByte(5), + AB_TRD_Unused_6 = AreaByte(6), + AB_TRD_Unused_7 = AreaByte(7), + AB_TRD_Unused_8 = AreaByte(8), + AB_TRD_Unused_9 = AreaByte(9), + AB_TRD_Unused_A = AreaByte(10), + AB_TRD_Unused_B = AreaByte(11), + AB_TRD_Unused_C = AreaByte(12), + AB_TRD_Unused_D = AreaByte(13), + AB_TRD_Unused_E = AreaByte(14), + AB_TRD_Unused_F = AreaByte(15), }; enum { diff --git a/src/world/area_trd/trd_00/trd_00_1_main.c b/src/world/area_trd/trd_00/trd_00_1_main.c index e16c89796c..a269116b32 100644 --- a/src/world/area_trd/trd_00/trd_00_1_main.c +++ b/src/world/area_trd/trd_00/trd_00_1_main.c @@ -6,7 +6,6 @@ extern EvtScript N(EVS_MakeEntities); extern NpcGroupList N(DefaultNPCs); #include "world/common/atomic/TexturePan.inc.c" -#include "world/common/atomic/TexturePan.data.inc.c" EvtScript N(EVS_ExitWalk_nok_15_1) = EVT_EXIT_WALK(60, trd_00_ENTRY_0, "nok_15", nok_15_ENTRY_1); EvtScript N(EVS_ExitDoors_trd_01_0) = EVT_EXIT_DOUBLE_DOOR(trd_00_ENTRY_1, "trd_01", trd_01_ENTRY_0, COLLIDER_tt2, MODEL_o62, MODEL_doa); diff --git a/src/world/area_trd/trd_00/trd_00_3_npc.c b/src/world/area_trd/trd_00/trd_00_3_npc.c index 4be84091f7..bb3cc18c1b 100644 --- a/src/world/area_trd/trd_00/trd_00_3_npc.c +++ b/src/world/area_trd/trd_00/trd_00_3_npc.c @@ -304,18 +304,14 @@ EvtScript N(EVS_NpcInit_Eldstar) = { EVT_END }; -StaticNpc N(NpcData_KoopaBros) = { +NpcData N(NpcData_KoopaBros) = { .id = NPC_KoopaBros, - .settings = &N(NpcSettings_KoopaBros), .pos = { -469.0f, 0.0f, 101.0f }, .yaw = 0, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_KoopaBros), - .drops = { - .dropFlags = NPC_DROP_FLAG_80, - .heartDrops = NO_DROPS, - .flowerDrops = NO_DROPS, - }, + .settings = &N(NpcSettings_KoopaBros), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_800, + .drops = NO_DROPS, .animations = { .idle = ANIM_KoopaBros_Green_Anim04, .walk = ANIM_KoopaBros_Green_Anim02, @@ -336,14 +332,10 @@ StaticNpc N(NpcData_KoopaBros) = { }, }; -StaticNpc N(NpcData_Eldstar) = { +NpcData N(NpcData_Eldstar) = { .id = NPC_Eldstar, - .settings = &N(NpcSettings_StarSpirit), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_800, - .init = &N(EVS_NpcInit_Eldstar), - .drops = ELDSTAR_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -356,6 +348,10 @@ StaticNpc N(NpcData_Eldstar) = { .detectSize = { 500 }, } }, + .init = &N(EVS_NpcInit_Eldstar), + .settings = &N(NpcSettings_StarSpirit), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_800, + .drops = NO_DROPS, .animations = ELDSTAR_ANIMS, }; diff --git a/src/world/area_trd/trd_01/trd_01_1_main.c b/src/world/area_trd/trd_01/trd_01_1_main.c index df836a1603..75992c7ea3 100644 --- a/src/world/area_trd/trd_01/trd_01_1_main.c +++ b/src/world/area_trd/trd_01/trd_01_1_main.c @@ -8,7 +8,6 @@ extern EvtScript N(EVS_MakeEntities); extern NpcGroupList N(DefaultNPCs); #include "world/common/atomic/TexturePan.inc.c" -#include "world/common/atomic/TexturePan.data.inc.c" EvtScript N(EVS_EnterMap) = { EVT_SET_GROUP(EVT_GROUP_00) 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 cd9d472951..8703b4b788 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 @@ -4,8 +4,8 @@ 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_Guard.inc.c" +#include "world/common/enemy/KoopaTroopa_Wander.inc.c" +#include "world/common/enemy/Bobomb_Guard.inc.c" API_CALLABLE(N(SetNewWanderCenterPos)) { Enemy* owner1 = script->owner1.enemy; @@ -144,18 +144,10 @@ EvtScript N(EVS_NpcInit_KoopaTroopa_01) = { EVT_END }; -StaticNpc N(NpcData_KoopaTroopa_01) = { +NpcData N(NpcData_KoopaTroopa_01) = { .id = NPC_KoopaTroopa_01, - .settings = &N(NpcSettings_KoopaTroopa_Wander), .pos = { 260.0f, 0.0f, 30.0f }, .yaw = 0, - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_NO_DROPS, - .init = &N(EVS_NpcInit_KoopaTroopa_01), - .drops = { - .dropFlags = NPC_DROP_FLAG_80, - .heartDrops = NO_DROPS, - .flowerDrops = NO_DROPS, - }, .territory = { .wander = { .isFlying = TRUE, @@ -168,18 +160,18 @@ StaticNpc N(NpcData_KoopaTroopa_01) = { .detectSize = { 200 }, } }, + .init = &N(EVS_NpcInit_KoopaTroopa_01), + .settings = &N(NpcSettings_KoopaTroopa_Wander), + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_NO_DROPS, + .drops = NO_DROPS, .animations = KOOPA_TROOPA_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, }; -StaticNpc N(NpcData_KoopaTroopa_02) = { +NpcData N(NpcData_KoopaTroopa_02) = { .id = NPC_KoopaTroopa_02, - .settings = &N(NpcSettings_KoopaTroopa_Wander), .pos = { 0.0f, 0.0f, 0.0f }, .yaw = 270, - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, - .init = &N(EVS_NpcInit_KoopaTroopa_02), - .drops = KOOPA_TROOPA_TRD_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -192,18 +184,18 @@ StaticNpc N(NpcData_KoopaTroopa_02) = { .detectSize = { 200 }, } }, + .init = &N(EVS_NpcInit_KoopaTroopa_02), + .settings = &N(NpcSettings_KoopaTroopa_Wander), + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .drops = KOOPA_TROOPA_TRD_DROPS, .animations = KOOPA_TROOPA_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, }; -StaticNpc N(NpcData_KoopaTroopa_03) = { +NpcData N(NpcData_KoopaTroopa_03) = { .id = NPC_KoopaTroopa_03, - .settings = &N(NpcSettings_KoopaTroopa_Wander), .pos = { 0.0f, 0.0f, 0.0f }, .yaw = 90, - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_2000, - .init = &N(EVS_NpcInit_KoopaTroopa_02), - .drops = KOOPA_TROOPA_TRD_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -216,17 +208,18 @@ StaticNpc N(NpcData_KoopaTroopa_03) = { .detectSize = { 200 }, } }, + .init = &N(EVS_NpcInit_KoopaTroopa_02), + .settings = &N(NpcSettings_KoopaTroopa_Wander), + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_2000, + .drops = KOOPA_TROOPA_TRD_DROPS, .animations = KOOPA_TROOPA_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, }; -StaticNpc N(NpcData_Bobomb) = { +NpcData N(NpcData_Bobomb) = { .id = NPC_Bobomb, - .settings = &N(NpcSettings_Bobomb_Guard), .pos = { -255.0f, 640.0f, 35.0f }, .yaw = 180, - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, - .drops = BOBOMB_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -239,6 +232,9 @@ StaticNpc N(NpcData_Bobomb) = { .detectSize = { 100 }, } }, + .settings = &N(NpcSettings_Bobomb_Guard), + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .drops = BOBOMB_DROPS, .animations = BOBOMB_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, }; diff --git a/src/world/area_trd/trd_02/trd_02_3_npc.c b/src/world/area_trd/trd_02/trd_02_3_npc.c index e498bd2776..0387054d68 100644 --- a/src/world/area_trd/trd_02/trd_02_3_npc.c +++ b/src/world/area_trd/trd_02/trd_02_3_npc.c @@ -1,16 +1,13 @@ #include "trd_02.h" -#include "world/common/enemy/complete/Bobomb_Wander.inc.c" -#include "world/common/enemy/complete/KoopaTroopa_Wander.inc.c" -#include "world/common/enemy/complete/KoopaTroopa_Patrol.inc.c" +#include "world/common/enemy/Bobomb_Wander.inc.c" +#include "world/common/enemy/KoopaTroopa_Wander.inc.c" +#include "world/common/enemy/KoopaTroopa_Patrol.inc.c" -StaticNpc N(NpcData_Bobomb_01) = { +NpcData N(NpcData_Bobomb_01) = { .id = NPC_Bobomb_01, - .settings = &N(NpcSettings_Bobomb_Wander), .pos = { -70.0f, 0.0f, 80.0f }, .yaw = 90, - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, - .drops = BOBOMB_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -23,17 +20,17 @@ StaticNpc N(NpcData_Bobomb_01) = { .detectSize = { 250, 175 }, } }, + .settings = &N(NpcSettings_Bobomb_Wander), + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = BOBOMB_DROPS, .animations = BOBOMB_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, }; -StaticNpc N(NpcData_Bobomb_02) = { +NpcData N(NpcData_Bobomb_02) = { .id = NPC_Bobomb_02, - .settings = &N(NpcSettings_Bobomb_Wander), .pos = { 140.0f, 0.0f, 80.0f }, .yaw = 270, - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, - .drops = BOBOMB_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -46,17 +43,17 @@ StaticNpc N(NpcData_Bobomb_02) = { .detectSize = { 250, 175 }, } }, + .settings = &N(NpcSettings_Bobomb_Wander), + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = BOBOMB_DROPS, .animations = BOBOMB_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, }; -StaticNpc N(NpcData_KoopaTroopa) = { +NpcData N(NpcData_KoopaTroopa) = { .id = NPC_KoopaTroopa, - .settings = &N(NpcSettings_KoopaTroopa_Patrol), .pos = { 50.0f, 187.0f, 183.0f }, .yaw = 0, - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, - .drops = KOOPA_TROOPA_TRD_DROPS, .territory = { .patrol = { .isFlying = TRUE, @@ -71,6 +68,9 @@ StaticNpc N(NpcData_KoopaTroopa) = { .detectSize = { 150, 80 }, } }, + .settings = &N(NpcSettings_KoopaTroopa_Patrol), + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = KOOPA_TROOPA_TRD_DROPS, .animations = KOOPA_TROOPA_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, }; diff --git a/src/world/area_trd/trd_03/trd_03_3_npc.c b/src/world/area_trd/trd_03/trd_03_3_npc.c index 48b64ac295..8665116552 100644 --- a/src/world/area_trd/trd_03/trd_03_3_npc.c +++ b/src/world/area_trd/trd_03/trd_03_3_npc.c @@ -4,7 +4,7 @@ extern EvtScript N(EVS_StartKoopaBrosTheme); extern EvtScript N(EVS_EndKoopaBrosTheme); extern EvtScript N(EVS_EnterMap); -#include "world/common/enemy/complete/KoopaTroopa_Wander.inc.c" +#include "world/common/enemy/KoopaTroopa_Wander.inc.c" NpcSettings N(NpcSettings_KoopaBros) = { .height = 34, @@ -14,7 +14,7 @@ NpcSettings N(NpcSettings_KoopaBros) = { .onDefeat = &EnemyNpcDefeat, }; -#include "world/common/enemy/complete/Bobomb_Wander.inc.c" +#include "world/common/enemy/Bobomb_Wander.inc.c" EvtScript N(EVS_Scene_GreenKoopaBros) = { EVT_CALL(DisablePlayerInput, TRUE) @@ -180,18 +180,14 @@ EvtScript N(EVS_NpcInit_KoopaTroopa_02) = { EVT_END }; -StaticNpc N(NpcData_KoopaBros) = { +NpcData N(NpcData_KoopaBros) = { .id = NPC_KoopaBros, - .settings = &N(NpcSettings_KoopaBros), .pos = { -569.0f, 0.0f, -57.0f }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_KoopaBros), - .drops = { - .dropFlags = NPC_DROP_FLAG_80, - .heartDrops = NO_DROPS, - .flowerDrops = NO_DROPS, - }, + .settings = &N(NpcSettings_KoopaBros), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = NO_DROPS, .animations = { .idle = ANIM_KoopaBros_Green_Anim04, .walk = ANIM_KoopaBros_Green_Anim02, @@ -212,14 +208,10 @@ StaticNpc N(NpcData_KoopaBros) = { }, }; -StaticNpc N(NpcData_KoopaTroopa_01) = { +NpcData N(NpcData_KoopaTroopa_01) = { .id = NPC_KoopaTroopa_01, - .settings = &N(NpcSettings_KoopaTroopa_Wander), .pos = { -520.0f, 0.0f, 15.0f }, .yaw = 90, - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, - .init = &N(EVS_NpcInit_KoopaTroopa_01), - .drops = KOOPA_TROOPA_TRD_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -232,18 +224,18 @@ StaticNpc N(NpcData_KoopaTroopa_01) = { .detectSize = { 350 }, } }, + .init = &N(EVS_NpcInit_KoopaTroopa_01), + .settings = &N(NpcSettings_KoopaTroopa_Wander), + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = KOOPA_TROOPA_TRD_DROPS, .animations = KOOPA_TROOPA_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, }; -StaticNpc N(NpcData_KoopaTroopa_02) = { +NpcData N(NpcData_KoopaTroopa_02) = { .id = NPC_KoopaTroopa_02, - .settings = &N(NpcSettings_KoopaTroopa_Wander), .pos = { -52.0f, 0.0f, -21.0f }, .yaw = 90, - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, - .init = &N(EVS_NpcInit_KoopaTroopa_02), - .drops = KOOPA_TROOPA_TRD_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -256,17 +248,18 @@ StaticNpc N(NpcData_KoopaTroopa_02) = { .detectSize = { 350 }, } }, + .init = &N(EVS_NpcInit_KoopaTroopa_02), + .settings = &N(NpcSettings_KoopaTroopa_Wander), + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = KOOPA_TROOPA_TRD_DROPS, .animations = KOOPA_TROOPA_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, }; -StaticNpc N(NpcData_KoopaTroopa_03) = { +NpcData N(NpcData_KoopaTroopa_03) = { .id = NPC_KoopaTroopa_03, - .settings = &N(NpcSettings_KoopaTroopa_Wander), .pos = { 375.0f, 0.0f, 15.0f }, .yaw = 270, - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, - .drops = KOOPA_TROOPA_TRD_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -279,6 +272,9 @@ StaticNpc N(NpcData_KoopaTroopa_03) = { .detectSize = { 350 }, } }, + .settings = &N(NpcSettings_KoopaTroopa_Wander), + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = KOOPA_TROOPA_TRD_DROPS, .animations = KOOPA_TROOPA_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, }; diff --git a/src/world/area_trd/trd_04/trd_04_1_main.c b/src/world/area_trd/trd_04/trd_04_1_main.c index 67b8ed7a94..74e67e7526 100644 --- a/src/world/area_trd/trd_04/trd_04_1_main.c +++ b/src/world/area_trd/trd_04/trd_04_1_main.c @@ -10,7 +10,6 @@ extern NpcGroupList N(NpcGroupBefore); extern NpcGroupList N(NpcGroupAfter); #include "world/common/atomic/TexturePan.inc.c" -#include "world/common/atomic/TexturePan.data.inc.c" EvtScript N(EVS_ExitDoors_trd_03_1) = EVT_EXIT_DOUBLE_DOOR(trd_04_ENTRY_0, "trd_03", trd_03_ENTRY_1, COLLIDER_ttw2, MODEL_o6, MODEL_o7); diff --git a/src/world/area_trd/trd_04/trd_04_3_npc.c b/src/world/area_trd/trd_04/trd_04_3_npc.c index 02ffafc2be..8d3621ce2d 100644 --- a/src/world/area_trd/trd_04/trd_04_3_npc.c +++ b/src/world/area_trd/trd_04/trd_04_3_npc.c @@ -2,9 +2,9 @@ extern EvtScript N(EVS_80245198); -#include "world/common/enemy/complete/KoopaTroopa_Wander.inc.c" -#include "world/common/enemy/complete/KoopaTroopa_Patrol.inc.c" -#include "world/common/enemy/complete/Paratroopa.inc.c" +#include "world/common/enemy/KoopaTroopa_Wander.inc.c" +#include "world/common/enemy/KoopaTroopa_Patrol.inc.c" +#include "world/common/enemy/Paratroopa.inc.c" EvtScript N(EVS_NpcDefeat_KoopaTroopa) = { EVT_CALL(GetBattleOutcome, LVar0) @@ -30,13 +30,10 @@ EvtScript N(EVS_NpcInit_KoopaTroopa) = { EVT_END }; -StaticNpc N(NpcData_KoopaTroopa_Wander) = { +NpcData N(NpcData_KoopaTroopa_Wander) = { .id = NPC_KoopaTroopa, - .settings = &N(NpcSettings_KoopaTroopa_Wander), .pos = { 0.0f, 0.0f, 125.0f }, .yaw = 90, - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, - .drops = KOOPA_TROOPA_TRD_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -49,22 +46,17 @@ StaticNpc N(NpcData_KoopaTroopa_Wander) = { .detectSize = { 200 }, } }, + .settings = &N(NpcSettings_KoopaTroopa_Wander), + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .drops = KOOPA_TROOPA_TRD_DROPS, .animations = KOOPA_TROOPA_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, }; -StaticNpc N(NpcData_KoopaTroopa_Patrol) = { +NpcData N(NpcData_KoopaTroopa_Patrol) = { .id = NPC_KoopaTroopa, - .settings = &N(NpcSettings_KoopaTroopa_Patrol), .pos = { 220.0f, 0.0f, 30.0f }, .yaw = 90, - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_NO_DROPS, - .init = &N(EVS_NpcInit_KoopaTroopa), - .drops = { - .dropFlags = NPC_DROP_FLAG_80, - .heartDrops = NO_DROPS, - .flowerDrops = NO_DROPS, - }, .territory = { .patrol = { .isFlying = TRUE, @@ -79,17 +71,18 @@ StaticNpc N(NpcData_KoopaTroopa_Patrol) = { .detectSize = { 200 }, } }, + .init = &N(EVS_NpcInit_KoopaTroopa), + .settings = &N(NpcSettings_KoopaTroopa_Patrol), + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_NO_DROPS, + .drops = NO_DROPS, .animations = KOOPA_TROOPA_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, }; -StaticNpc N(NpcData_ParaTroopa) = { +NpcData N(NpcData_ParaTroopa) = { .id = NPC_ParaTroopa, - .settings = &N(NpcSettings_ParaTroopa), .pos = { -5.0f, 237.0f, 157.0f }, .yaw = 270, - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, - .drops = PARATROOPA_DROPS, .territory = { .wander = { .isFlying = FALSE, @@ -102,6 +95,9 @@ StaticNpc N(NpcData_ParaTroopa) = { .detectSize = { 200 }, } }, + .settings = &N(NpcSettings_ParaTroopa), + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = PARATROOPA_DROPS, .animations = PARATROOPA_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, }; diff --git a/src/world/area_trd/trd_05/trd_05_4_npc.c b/src/world/area_trd/trd_05/trd_05_4_npc.c index 7511287a81..adde977767 100644 --- a/src/world/area_trd/trd_05/trd_05_4_npc.c +++ b/src/world/area_trd/trd_05/trd_05_4_npc.c @@ -201,19 +201,15 @@ EvtScript N(EVS_NpcInit_KoopaBros) = { EVT_END }; -StaticNpc N(NpcData_KoopaBros)[] = { +NpcData N(NpcData_KoopaBros)[] = { { .id = NPC_KoopaBros_01, - .settings = &N(NpcSettings_KoopaBros), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_KoopaBros), - .drops = { - .dropFlags = NPC_DROP_FLAG_80, - .heartDrops = NO_DROPS, - .flowerDrops = NO_DROPS, - }, + .settings = &N(NpcSettings_KoopaBros), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = NO_DROPS, .animations = { .idle = ANIM_KoopaBros_Yellow_Anim04, .walk = ANIM_KoopaBros_Yellow_Anim02, @@ -235,16 +231,12 @@ StaticNpc N(NpcData_KoopaBros)[] = { }, { .id = NPC_KoopaBros_02, - .settings = &N(NpcSettings_KoopaBros), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_KoopaBros), - .drops = { - .dropFlags = NPC_DROP_FLAG_80, - .heartDrops = NO_DROPS, - .flowerDrops = NO_DROPS, - }, + .settings = &N(NpcSettings_KoopaBros), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = NO_DROPS, .animations = { .idle = ANIM_KoopaBros_Yellow_Anim04, .walk = ANIM_KoopaBros_Yellow_Anim02, diff --git a/src/world/area_trd/trd_06/trd_06_1_main.c b/src/world/area_trd/trd_06/trd_06_1_main.c index ac08bac35a..870a9b493b 100644 --- a/src/world/area_trd/trd_06/trd_06_1_main.c +++ b/src/world/area_trd/trd_06/trd_06_1_main.c @@ -10,7 +10,6 @@ extern EvtScript N(EVS_Scene_FallIntoCell); extern EvtScript N(EVS_Scene_ImprisonedKoopaBros); #include "world/common/atomic/TexturePan.inc.c" -#include "world/common/atomic/TexturePan.data.inc.c" EvtScript N(EVS_ExitDoors_trd_04_5) = EVT_EXIT_DOUBLE_DOOR(trd_06_ENTRY_1, "trd_04", trd_04_ENTRY_5, COLLIDER_ttw, MODEL_o93, MODEL_o94); diff --git a/src/world/area_trd/trd_06/trd_06_3_npc_prisoners.c b/src/world/area_trd/trd_06/trd_06_3_npc_prisoners.c index ce6676c324..4b878cf884 100644 --- a/src/world/area_trd/trd_06/trd_06_3_npc_prisoners.c +++ b/src/world/area_trd/trd_06/trd_06_3_npc_prisoners.c @@ -338,18 +338,14 @@ EvtScript N(EVS_NpcInit_Bobomb_04) = { EVT_END }; -StaticNpc N(NpcData_Bombette) = { +NpcData N(NpcData_Bombette) = { .id = NPC_Bombette, - .settings = &N(NpcSettings_Bobomb), .pos = { 0.0f, 0.0f, 0.0f }, .yaw = 0, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_Bombette), - .drops = { - .dropFlags = NPC_DROP_FLAG_80, - .heartDrops = NO_DROPS, - .flowerDrops = NO_DROPS, - }, + .settings = &N(NpcSettings_Bobomb), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = NO_DROPS, .animations = { .idle = ANIM_WorldBombette_Idle, .walk = ANIM_WorldBombette_Walk, @@ -371,14 +367,14 @@ StaticNpc N(NpcData_Bombette) = { .tattle = MSG_NpcTattle_TRD_Bombette, }; -StaticNpc N(NpcData_Jailers)[] = { +NpcData N(NpcData_Jailers)[] = { { .id = NPC_Jailer_KoopaTroopa, - .settings = &N(NpcSettings_KoopaTroopa), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_800 | ENEMY_FLAG_40000, .init = &N(EVS_NpcInit_KoopaTroopa), + .settings = &N(NpcSettings_KoopaTroopa), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_800 | ENEMY_FLAG_40000, .drops = { .dropFlags = NPC_DROP_FLAG_80, .itemDropChance = 5, @@ -410,16 +406,12 @@ StaticNpc N(NpcData_Jailers)[] = { }, { .id = NPC_Jailer_Bobomb_01, - .settings = &N(NpcSettings_Bobomb), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_800 | ENEMY_FLAG_40000, .init = &N(EVS_NpcInit_Bobomb_Jailer), - .drops = { - .dropFlags = NPC_DROP_FLAG_80, - .heartDrops = NO_DROPS, - .flowerDrops = NO_DROPS, - }, + .settings = &N(NpcSettings_Bobomb), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_800 | ENEMY_FLAG_40000, + .drops = NO_DROPS, .animations = { .idle = ANIM_Bobomb_Anim02, .walk = ANIM_Bobomb_Anim04, @@ -441,16 +433,12 @@ StaticNpc N(NpcData_Jailers)[] = { }, { .id = NPC_Jailer_Bobomb_02, - .settings = &N(NpcSettings_Bobomb), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_800 | ENEMY_FLAG_40000, .init = &N(EVS_NpcInit_Bobomb_Jailer), - .drops = { - .dropFlags = NPC_DROP_FLAG_80, - .heartDrops = NO_DROPS, - .flowerDrops = NO_DROPS, - }, + .settings = &N(NpcSettings_Bobomb), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_800 | ENEMY_FLAG_40000, + .drops = NO_DROPS, .animations = { .idle = ANIM_Bobomb_Anim02, .walk = ANIM_Bobomb_Anim04, @@ -472,14 +460,14 @@ StaticNpc N(NpcData_Jailers)[] = { }, }; -StaticNpc N(NpcData_Inmates)[] = { +NpcData N(NpcData_Inmates)[] = { { .id = NPC_Bobomb_01, - .settings = &N(NpcSettings_Bobomb), .pos = { 25.0f, 0.0f, 127.0f }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_Bobomb_01), + .settings = &N(NpcSettings_Bobomb), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_800, .drops = { .dropFlags = NPC_DROP_FLAG_80, .itemDropChance = 5, @@ -514,11 +502,11 @@ StaticNpc N(NpcData_Inmates)[] = { }, { .id = NPC_Bobomb_02, - .settings = &N(NpcSettings_Bobomb), .pos = { -30.0f, 0.0f, 130.0f }, .yaw = 90, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_Bobomb_02), + .settings = &N(NpcSettings_Bobomb), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_800, .drops = { .dropFlags = NPC_DROP_FLAG_80, .itemDropChance = 5, @@ -553,11 +541,11 @@ StaticNpc N(NpcData_Inmates)[] = { }, { .id = NPC_Bobomb_03, - .settings = &N(NpcSettings_Bobomb), .pos = { -140.0f, 0.0f, -90.0f }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_Bobomb_03), + .settings = &N(NpcSettings_Bobomb), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_800, .drops = { .dropFlags = NPC_DROP_FLAG_80, .itemDropChance = 5, @@ -592,11 +580,11 @@ StaticNpc N(NpcData_Inmates)[] = { }, { .id = NPC_Bobomb_04, - .settings = &N(NpcSettings_Bobomb), .pos = { -75.0f, 0.0f, -80.0f }, .yaw = 90, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_Bobomb_04), + .settings = &N(NpcSettings_Bobomb), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_800, .drops = { .dropFlags = NPC_DROP_FLAG_80, .itemDropChance = 5, diff --git a/src/world/area_trd/trd_06/trd_06_4_npc_koopa_bros.c b/src/world/area_trd/trd_06/trd_06_4_npc_koopa_bros.c index e852735e21..8c7c92c15b 100644 --- a/src/world/area_trd/trd_06/trd_06_4_npc_koopa_bros.c +++ b/src/world/area_trd/trd_06/trd_06_4_npc_koopa_bros.c @@ -46,14 +46,11 @@ EvtScript N(EVS_Scene_ImprisonedKoopaBros) = { EVT_END }; -StaticNpc N(NpcData_KoopaBros)[] = { +NpcData N(NpcData_KoopaBros)[] = { { .id = NPC_KoopaBros_Red, - .settings = &N(NpcSettings_KoopaBros), .pos = { 60.0f, 0.0f, -60.0f }, .yaw = 0, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, - .drops = KOOPA_BROS_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -66,15 +63,15 @@ StaticNpc N(NpcData_KoopaBros)[] = { .detectSize = { 0 }, } }, + .settings = &N(NpcSettings_KoopaBros), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = NO_DROPS, .animations = RED_KOOPA_BROS_ANIMS, }, { .id = NPC_KoopaBros_Black, - .settings = &N(NpcSettings_KoopaBros), .pos = { 60.0f, 0.0f, 0.0f }, .yaw = 0, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, - .drops = KOOPA_BROS_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -87,15 +84,15 @@ StaticNpc N(NpcData_KoopaBros)[] = { .detectSize = { 0 }, } }, + .settings = &N(NpcSettings_KoopaBros), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = NO_DROPS, .animations = BLACK_KOOPA_BROS_ANIMS, }, { .id = NPC_KoopaBros_Yellow, - .settings = &N(NpcSettings_KoopaBros), .pos = { -10.0f, 0.0f, -60.0f }, .yaw = 0, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, - .drops = KOOPA_BROS_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -108,15 +105,15 @@ StaticNpc N(NpcData_KoopaBros)[] = { .detectSize = { 0 }, } }, + .settings = &N(NpcSettings_KoopaBros), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = NO_DROPS, .animations = YELLOW_KOOPA_BROS_ANIMS, }, { .id = NPC_KoopaBros_Green, - .settings = &N(NpcSettings_KoopaBros), .pos = { 0.0f, 0.0f, 0.0f }, .yaw = 0, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, - .drops = KOOPA_BROS_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -129,6 +126,9 @@ StaticNpc N(NpcData_KoopaBros)[] = { .detectSize = { 0 }, } }, + .settings = &N(NpcSettings_KoopaBros), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = NO_DROPS, .animations = GREEN_KOOPA_BROS_ANIMS, }, }; diff --git a/src/world/area_trd/trd_07/trd_07_1_main.c b/src/world/area_trd/trd_07/trd_07_1_main.c index 88aabb25cf..5ded0d0a60 100644 --- a/src/world/area_trd/trd_07/trd_07_1_main.c +++ b/src/world/area_trd/trd_07/trd_07_1_main.c @@ -5,7 +5,6 @@ extern EvtScript N(EVS_SetupMusic); extern NpcGroupList N(DefaultNPCs); #include "world/common/atomic/TexturePan.inc.c" -#include "world/common/atomic/TexturePan.data.inc.c" EvtScript N(EVS_ExitWalk_trd_08_0) = EVT_EXIT_WALK(60, trd_07_ENTRY_1, "trd_08", trd_08_ENTRY_0); EvtScript N(EVS_ExitWalk_trd_04_4) = EVT_EXIT_WALK(60, trd_07_ENTRY_0, "trd_04", trd_04_ENTRY_4); diff --git a/src/world/area_trd/trd_07/trd_07_2_npc.c b/src/world/area_trd/trd_07/trd_07_2_npc.c index 7de42995b3..2958689b97 100644 --- a/src/world/area_trd/trd_07/trd_07_2_npc.c +++ b/src/world/area_trd/trd_07/trd_07_2_npc.c @@ -2,8 +2,8 @@ extern EvtScript N(EVS_RestoreMagicDoors); -#include "world/common/enemy/complete/KoopaTroopa_Wander.inc.c" -#include "world/common/enemy/complete/Paratroopa.inc.c" +#include "world/common/enemy/KoopaTroopa_Wander.inc.c" +#include "world/common/enemy/Paratroopa.inc.c" #include "world/common/util/GetDefeatedEnemyCount.inc.c" @@ -37,14 +37,10 @@ EvtScript N(EVS_NpcInit_KoopaTroopa) = { EVT_END }; -StaticNpc N(NpcData_KoopaTroopa) = { +NpcData N(NpcData_KoopaTroopa) = { .id = NPC_KoopaTroopa, - .settings = &N(NpcSettings_KoopaTroopa_Wander), .pos = { -75.0f, 0.0f, -30.0f }, .yaw = 90, - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000, - .init = &N(EVS_NpcInit_KoopaTroopa), - .drops = KOOPA_TROOPA_TRD_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -57,17 +53,17 @@ StaticNpc N(NpcData_KoopaTroopa) = { .detectSize = { 1000 }, } }, + .init = &N(EVS_NpcInit_KoopaTroopa), + .settings = &N(NpcSettings_KoopaTroopa_Wander), + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000, + .drops = KOOPA_TROOPA_TRD_DROPS, .animations = KOOPA_TROOPA_ANIMS, }; -StaticNpc N(NpcData_ParaTroopa_01) = { +NpcData N(NpcData_ParaTroopa_01) = { .id = NPC_ParaTroopa_01, - .settings = &N(NpcSettings_ParaTroopa), .pos = { 0.0f, 50.0f, 30.0f }, .yaw = 270, - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000, - .init = &N(EVS_NpcInit_KoopaTroopa), - .drops = PARATROOPA_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -80,17 +76,17 @@ StaticNpc N(NpcData_ParaTroopa_01) = { .detectSize = { 200 }, } }, + .init = &N(EVS_NpcInit_KoopaTroopa), + .settings = &N(NpcSettings_ParaTroopa), + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000, + .drops = PARATROOPA_DROPS, .animations = PARATROOPA_ANIMS, }; -StaticNpc N(NpcData_ParaTroopa_02) = { +NpcData N(NpcData_ParaTroopa_02) = { .id = NPC_ParaTroopa_02, - .settings = &N(NpcSettings_ParaTroopa), .pos = { 75.0f, 50.0f, -30.0f }, .yaw = 270, - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000, - .init = &N(EVS_NpcInit_KoopaTroopa), - .drops = PARATROOPA_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -103,6 +99,10 @@ StaticNpc N(NpcData_ParaTroopa_02) = { .detectSize = { 200 }, } }, + .init = &N(EVS_NpcInit_KoopaTroopa), + .settings = &N(NpcSettings_ParaTroopa), + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000, + .drops = PARATROOPA_DROPS, .animations = PARATROOPA_ANIMS, }; diff --git a/src/world/area_trd/trd_08/trd_08_1_main.c b/src/world/area_trd/trd_08/trd_08_1_main.c index 80d1c6974c..ad2341c8ec 100644 --- a/src/world/area_trd/trd_08/trd_08_1_main.c +++ b/src/world/area_trd/trd_08/trd_08_1_main.c @@ -5,7 +5,6 @@ extern EvtScript N(EVS_MakeEntities); extern NpcGroupList N(DefaultNPCs); #include "world/common/atomic/TexturePan.inc.c" -#include "world/common/atomic/TexturePan.data.inc.c" EvtScript N(EVS_ExitWalk_trd_07_1) = EVT_EXIT_WALK(60, trd_08_ENTRY_0, "trd_07", trd_07_ENTRY_1); diff --git a/src/world/area_trd/trd_08/trd_08_3_npc.c b/src/world/area_trd/trd_08/trd_08_3_npc.c index 0727414d68..36b636fc13 100644 --- a/src/world/area_trd/trd_08/trd_08_3_npc.c +++ b/src/world/area_trd/trd_08/trd_08_3_npc.c @@ -130,87 +130,87 @@ NpcSettings N(NpcSettings_FireBar_Extra) = { .flags = ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, }; -StaticNpc N(NpcData_00)[] = { +NpcData N(NpcData_00)[] = { { .id = NPC_FireBar_1A, - .settings = &N(NpcSettings_FireBar_01), .pos = { 0.0f, 0.0f, 0.0f }, .yaw = 0, - .flags = ENEMY_FLAG_PASSIVE, .init = (void*) 0x00004003, + .settings = &N(NpcSettings_FireBar_01), + .flags = ENEMY_FLAG_PASSIVE, .animations = { }, }, { .id = NPC_FireBar_1B, - .settings = &N(NpcSettings_FireBar_Extra), .pos = { 0.0f, 0.0f, 0.0f }, .yaw = 0, - .flags = ENEMY_FLAG_PASSIVE, .init = (void*) 0x00004003, + .settings = &N(NpcSettings_FireBar_Extra), + .flags = ENEMY_FLAG_PASSIVE, .animations = { }, }, { .id = NPC_FireBar_1C, - .settings = &N(NpcSettings_FireBar_Extra), .pos = { 0.0f, 0.0f, 0.0f }, .yaw = 0, - .flags = ENEMY_FLAG_PASSIVE, .init = (void*) 0x00004003, + .settings = &N(NpcSettings_FireBar_Extra), + .flags = ENEMY_FLAG_PASSIVE, .animations = { }, }, { .id = NPC_FireBar_1D, - .settings = &N(NpcSettings_FireBar_Extra), .pos = { 0.0f, 0.0f, 0.0f }, .yaw = 0, - .flags = ENEMY_FLAG_PASSIVE, .init = (void*) 0x00004003, + .settings = &N(NpcSettings_FireBar_Extra), + .flags = ENEMY_FLAG_PASSIVE, .animations = { }, }, }; -StaticNpc N(NpcData_05)[] = { +NpcData N(NpcData_05)[] = { { .id = NPC_FireBar_2A, - .settings = &N(NpcSettings_FireBar_02), .pos = { 0.0f, 0.0f, 0.0f }, .yaw = 0, - .flags = ENEMY_FLAG_PASSIVE, .init = (void*) 0x00004003, + .settings = &N(NpcSettings_FireBar_02), + .flags = ENEMY_FLAG_PASSIVE, .animations = { }, }, { .id = NPC_FireBar_2B, - .settings = &N(NpcSettings_FireBar_Extra), .pos = { 0.0f, 0.0f, 0.0f }, .yaw = 0, - .flags = ENEMY_FLAG_PASSIVE, .init = (void*) 0x00004003, + .settings = &N(NpcSettings_FireBar_Extra), + .flags = ENEMY_FLAG_PASSIVE, .animations = { }, }, { .id = NPC_FireBar_2C, - .settings = &N(NpcSettings_FireBar_Extra), .pos = { 0.0f, 0.0f, 0.0f }, .yaw = 0, - .flags = ENEMY_FLAG_PASSIVE, .init = (void*) 0x00004003, + .settings = &N(NpcSettings_FireBar_Extra), + .flags = ENEMY_FLAG_PASSIVE, .animations = { }, }, { .id = NPC_FireBar_2D, - .settings = &N(NpcSettings_FireBar_Extra), .pos = { 0.0f, 0.0f, 0.0f }, .yaw = 0, - .flags = ENEMY_FLAG_PASSIVE, .init = (void*) 0x00004003, + .settings = &N(NpcSettings_FireBar_Extra), + .flags = ENEMY_FLAG_PASSIVE, .animations = { }, }, diff --git a/src/world/area_trd/trd_09/trd_09_1_main.c b/src/world/area_trd/trd_09/trd_09_1_main.c index ef0bb70ff4..bbbdb11364 100644 --- a/src/world/area_trd/trd_09/trd_09_1_main.c +++ b/src/world/area_trd/trd_09/trd_09_1_main.c @@ -49,7 +49,7 @@ EvtScript N(EVS_Main) = { EVT_CALL(SetSpriteShading, SHADING_NONE) EVT_SETUP_CAMERA_DEFAULT() EVT_CALL(GetDemoState, LVar0) - EVT_IF_NE(LVar0, 0) + EVT_IF_NE(LVar0, DEMO_STATE_NONE) EVT_CALL(MakeNpcs, TRUE, EVT_PTR(N(DemoNPCs))) EVT_EXEC_WAIT(N(EVS_MakeEntities)) EVT_EXEC_WAIT(N(EVS_PlayDemoScene)) diff --git a/src/world/area_trd/trd_09/trd_09_3_npc.c b/src/world/area_trd/trd_09/trd_09_3_npc.c index f8a9eb4fef..3de26596d9 100644 --- a/src/world/area_trd/trd_09/trd_09_3_npc.c +++ b/src/world/area_trd/trd_09/trd_09_3_npc.c @@ -1,7 +1,7 @@ #include "trd_09.h" #include "effects.h" -#include "world/common/enemy/complete/BulletBill.h" +#include "world/common/enemy/BulletBill.h" API_CALLABLE(N(func_80240000_9BD660)) { Bytecode* args = script->ptrReadPos; @@ -542,15 +542,11 @@ EvtScript N(EVS_NpcInit_BillBlaster) = { EVT_END }; -StaticNpc N(NpcData_BillBlasters)[] = { +NpcData N(NpcData_BillBlasters)[] = { { .id = NPC_BillBlaster_01, - .settings = &N(NpcSettings_BillBlaster), .pos = { 1260.0f, 0.0f, -40.0f }, .yaw = 270, - .flags = ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_40000 | ENEMY_FLAG_200000, - .init = &N(EVS_NpcInit_BillBlaster), - .drops = BILL_BLASTER_NO_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -563,15 +559,16 @@ StaticNpc N(NpcData_BillBlasters)[] = { .detectSize = { 0 }, } }, + .init = &N(EVS_NpcInit_BillBlaster), + .settings = &N(NpcSettings_BillBlaster), + .flags = ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_40000 | ENEMY_FLAG_200000, + .drops = NO_DROPS, .animations = BILL_BLASTER_ANIMS, }, { .id = NPC_BillBlaster_03, - .settings = &N(NpcSettings_BillBlaster), .pos = { 1275.0f, 0.0f, 5.0f }, .yaw = 270, - .flags = ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_40000 | ENEMY_FLAG_200000, - .drops = BILL_BLASTER_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -584,15 +581,15 @@ StaticNpc N(NpcData_BillBlasters)[] = { .detectSize = { 0 }, } }, + .settings = &N(NpcSettings_BillBlaster), + .flags = ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_40000 | ENEMY_FLAG_200000, + .drops = BILL_BLASTER_DROPS, .animations = BILL_BLASTER_ANIMS, }, { .id = NPC_BillBlaster_02, - .settings = &N(NpcSettings_BillBlaster), .pos = { 1290.0f, 0.0f, 50.0f }, .yaw = 270, - .flags = ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_40000 | ENEMY_FLAG_200000, - .drops = BILL_BLASTER_NO_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -605,57 +602,60 @@ StaticNpc N(NpcData_BillBlasters)[] = { .detectSize = { 0 }, } }, + .settings = &N(NpcSettings_BillBlaster), + .flags = ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_40000 | ENEMY_FLAG_200000, + .drops = NO_DROPS, .animations = BILL_BLASTER_ANIMS, }, }; -StaticNpc N(NpcData_BulletBill_01) = BULLET_BILL_NPC(NPC_BulletBill_01); -StaticNpc N(NpcData_BulletBill_02) = BULLET_BILL_NPC(NPC_BulletBill_02); -StaticNpc N(NpcData_BulletBill_03) = BULLET_BILL_NPC(NPC_BulletBill_03); -StaticNpc N(NpcData_BulletBill_04) = BULLET_BILL_NPC(NPC_BulletBill_04); -StaticNpc N(NpcData_BulletBill_05) = BULLET_BILL_NPC(NPC_BulletBill_05); -StaticNpc N(NpcData_BulletBill_06) = BULLET_BILL_NPC(NPC_BulletBill_06); -StaticNpc N(NpcData_BulletBill_07) = BULLET_BILL_NPC(NPC_BulletBill_07); -StaticNpc N(NpcData_BulletBill_08) = BULLET_BILL_NPC(NPC_BulletBill_08); -StaticNpc N(NpcData_BulletBill_09) = BULLET_BILL_NPC(NPC_BulletBill_09); -StaticNpc N(NpcData_BulletBill_10) = BULLET_BILL_NPC(NPC_BulletBill_10); +NpcData N(NpcData_BulletBill_01) = BULLET_BILL_NPC(NPC_BulletBill_01); +NpcData N(NpcData_BulletBill_02) = BULLET_BILL_NPC(NPC_BulletBill_02); +NpcData N(NpcData_BulletBill_03) = BULLET_BILL_NPC(NPC_BulletBill_03); +NpcData N(NpcData_BulletBill_04) = BULLET_BILL_NPC(NPC_BulletBill_04); +NpcData N(NpcData_BulletBill_05) = BULLET_BILL_NPC(NPC_BulletBill_05); +NpcData N(NpcData_BulletBill_06) = BULLET_BILL_NPC(NPC_BulletBill_06); +NpcData N(NpcData_BulletBill_07) = BULLET_BILL_NPC(NPC_BulletBill_07); +NpcData N(NpcData_BulletBill_08) = BULLET_BILL_NPC(NPC_BulletBill_08); +NpcData N(NpcData_BulletBill_09) = BULLET_BILL_NPC(NPC_BulletBill_09); +NpcData N(NpcData_BulletBill_10) = BULLET_BILL_NPC(NPC_BulletBill_10); -StaticNpc N(NpcData_KoopaBros)[] = { +NpcData N(NpcData_KoopaBros)[] = { { .id = NPC_KoopaBros_Red, - .settings = &N(NpcSettings_KoopaBros_Red), .pos = { 1590.0f, 60.0f, 0.0f }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE, .initVarCount = 1, .initVar = { .value = 0 }, + .settings = &N(NpcSettings_KoopaBros_Red), + .flags = ENEMY_FLAG_PASSIVE, }, { .id = NPC_KoopaBros_Green, - .settings = &N(NpcSettings_KoopaBros_Green), .pos = { 1590.0f, 60.0f, -10.0f }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE, .initVarCount = 1, .initVar = { .value = 0 }, + .settings = &N(NpcSettings_KoopaBros_Green), + .flags = ENEMY_FLAG_PASSIVE, }, { .id = NPC_KoopaBros_Yellow, - .settings = &N(NpcSettings_KoopaBros_Yellow), .pos = { 1605.0f, 60.0f, 5.0f }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE, .initVarCount = 1, .initVar = { .value = 0 }, + .settings = &N(NpcSettings_KoopaBros_Yellow), + .flags = ENEMY_FLAG_PASSIVE, }, { .id = NPC_KoopaBros_Black, - .settings = &N(NpcSettings_KoopaBros_Black), .pos = { 1620.0f, 60.0f, 20.0f }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE, .initVarCount = 1, .initVar = { .value = 0 }, + .settings = &N(NpcSettings_KoopaBros_Black), + .flags = ENEMY_FLAG_PASSIVE, }, }; @@ -690,24 +690,10 @@ EvtScript N(EVS_NpcInit_BulletBill_Demo) = { EVT_END }; -StaticNpc N(NpcData_BulletBill_Demo1) = { +NpcData N(NpcData_BulletBill_Demo1) = { .id = NPC_BulletBill_Demo1, - .settings = &N(NpcSettings_BulletBill), .pos = { -100.0f, 11.0f, 50.0f }, .yaw = 270, - .flags = ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_80000, - .init = &N(EVS_NpcInit_BulletBill_Demo), - .initVarCount = 1, - .initVar = { .value = 0 }, - .drops = { - .dropFlags = NPC_DROP_FLAG_80, - .itemDropChance = 3, - .itemDrops = { - { ITEM_MUSHROOM, 10, 0 }, - }, - .heartDrops = STANDARD_HEART_DROPS(2), - .flowerDrops = STANDARD_FLOWER_DROPS(2), - }, .territory = { .wander = { .isFlying = TRUE, @@ -720,6 +706,20 @@ StaticNpc N(NpcData_BulletBill_Demo1) = { .detectSize = { 0 }, } }, + .init = &N(EVS_NpcInit_BulletBill_Demo), + .initVarCount = 1, + .initVar = { .value = 0 }, + .settings = &N(NpcSettings_BulletBill), + .flags = ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_80000, + .drops = { + .dropFlags = NPC_DROP_FLAG_80, + .itemDropChance = 3, + .itemDrops = { + { ITEM_MUSHROOM, 10, 0 }, + }, + .heartDrops = STANDARD_HEART_DROPS(2), + .flowerDrops = STANDARD_FLOWER_DROPS(2), + }, .animations = { .idle = ANIM_BulletBill_Anim01, .walk = ANIM_BulletBill_Anim02, @@ -740,24 +740,10 @@ StaticNpc N(NpcData_BulletBill_Demo1) = { }, }; -StaticNpc N(NpcData_BulletBill_Demo2) = { +NpcData N(NpcData_BulletBill_Demo2) = { .id = NPC_BulletBill_Demo2, - .settings = &N(NpcSettings_BulletBill), .pos = { -150.0f, 11.0f, 5.0f }, .yaw = 270, - .flags = ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_80000, - .init = &N(EVS_NpcInit_BulletBill_Demo), - .initVarCount = 1, - .initVar = { .value = 0 }, - .drops = { - .dropFlags = NPC_DROP_FLAG_80, - .itemDropChance = 3, - .itemDrops = { - { ITEM_MUSHROOM, 10, 0 }, - }, - .heartDrops = STANDARD_HEART_DROPS(2), - .flowerDrops = STANDARD_FLOWER_DROPS(2), - }, .territory = { .wander = { .isFlying = TRUE, @@ -770,6 +756,20 @@ StaticNpc N(NpcData_BulletBill_Demo2) = { .detectSize = { 0 }, } }, + .init = &N(EVS_NpcInit_BulletBill_Demo), + .initVarCount = 1, + .initVar = { .value = 0 }, + .settings = &N(NpcSettings_BulletBill), + .flags = ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_80000, + .drops = { + .dropFlags = NPC_DROP_FLAG_80, + .itemDropChance = 3, + .itemDrops = { + { ITEM_MUSHROOM, 10, 0 }, + }, + .heartDrops = STANDARD_HEART_DROPS(2), + .flowerDrops = STANDARD_FLOWER_DROPS(2), + }, .animations = { .idle = ANIM_BulletBill_Anim01, .walk = ANIM_BulletBill_Anim02, @@ -790,24 +790,10 @@ StaticNpc N(NpcData_BulletBill_Demo2) = { }, }; -StaticNpc N(NpcData_BulletBill_Demo3) = { +NpcData N(NpcData_BulletBill_Demo3) = { .id = NPC_BulletBill_Demo3, - .settings = &N(NpcSettings_BulletBill), .pos = { 120.0f, 11.0f, 50.0f }, .yaw = 270, - .flags = ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_80000, - .init = &N(EVS_NpcInit_BulletBill_Demo), - .initVarCount = 1, - .initVar = { .value = 0 }, - .drops = { - .dropFlags = NPC_DROP_FLAG_80, - .itemDropChance = 3, - .itemDrops = { - { ITEM_MUSHROOM, 10, 0 }, - }, - .heartDrops = STANDARD_HEART_DROPS(2), - .flowerDrops = STANDARD_FLOWER_DROPS(2), - }, .territory = { .wander = { .isFlying = TRUE, @@ -820,6 +806,20 @@ StaticNpc N(NpcData_BulletBill_Demo3) = { .detectSize = { 0 }, } }, + .init = &N(EVS_NpcInit_BulletBill_Demo), + .initVarCount = 1, + .initVar = { .value = 0 }, + .settings = &N(NpcSettings_BulletBill), + .flags = ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_80000, + .drops = { + .dropFlags = NPC_DROP_FLAG_80, + .itemDropChance = 3, + .itemDrops = { + { ITEM_MUSHROOM, 10, 0 }, + }, + .heartDrops = STANDARD_HEART_DROPS(2), + .flowerDrops = STANDARD_FLOWER_DROPS(2), + }, .animations = { .idle = ANIM_BulletBill_Anim01, .walk = ANIM_BulletBill_Anim02, @@ -840,24 +840,10 @@ StaticNpc N(NpcData_BulletBill_Demo3) = { }, }; -StaticNpc N(NpcData_BulletBill_Demo4) = { +NpcData N(NpcData_BulletBill_Demo4) = { .id = NPC_BulletBill_Demo4, - .settings = &N(NpcSettings_BulletBill), .pos = { 330.0f, 11.0f, 5.0f }, .yaw = 270, - .flags = ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_80000, - .init = &N(EVS_NpcInit_BulletBill_Demo), - .initVarCount = 1, - .initVar = { .value = 0 }, - .drops = { - .dropFlags = NPC_DROP_FLAG_80, - .itemDropChance = 3, - .itemDrops = { - { ITEM_MUSHROOM, 10, 0 }, - }, - .heartDrops = STANDARD_HEART_DROPS(2), - .flowerDrops = STANDARD_FLOWER_DROPS(2), - }, .territory = { .wander = { .isFlying = TRUE, @@ -870,6 +856,20 @@ StaticNpc N(NpcData_BulletBill_Demo4) = { .detectSize = { 0 }, } }, + .init = &N(EVS_NpcInit_BulletBill_Demo), + .initVarCount = 1, + .initVar = { .value = 0 }, + .settings = &N(NpcSettings_BulletBill), + .flags = ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_80000, + .drops = { + .dropFlags = NPC_DROP_FLAG_80, + .itemDropChance = 3, + .itemDrops = { + { ITEM_MUSHROOM, 10, 0 }, + }, + .heartDrops = STANDARD_HEART_DROPS(2), + .flowerDrops = STANDARD_FLOWER_DROPS(2), + }, .animations = { .idle = ANIM_BulletBill_Anim01, .walk = ANIM_BulletBill_Anim02, @@ -890,24 +890,10 @@ StaticNpc N(NpcData_BulletBill_Demo4) = { }, }; -StaticNpc N(NpcData_BulletBill_Demo5) = { +NpcData N(NpcData_BulletBill_Demo5) = { .id = NPC_BulletBill_Demo5, - .settings = &N(NpcSettings_BulletBill), .pos = { 380.0f, 11.0f, -40.0f }, .yaw = 270, - .flags = ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_80000, - .init = &N(EVS_NpcInit_BulletBill_Demo), - .initVarCount = 1, - .initVar = { .value = 0 }, - .drops = { - .dropFlags = NPC_DROP_FLAG_80, - .itemDropChance = 3, - .itemDrops = { - { ITEM_MUSHROOM, 10, 0 }, - }, - .heartDrops = STANDARD_HEART_DROPS(2), - .flowerDrops = STANDARD_FLOWER_DROPS(2), - }, .territory = { .wander = { .isFlying = TRUE, @@ -920,6 +906,20 @@ StaticNpc N(NpcData_BulletBill_Demo5) = { .detectSize = { 0 }, } }, + .init = &N(EVS_NpcInit_BulletBill_Demo), + .initVarCount = 1, + .initVar = { .value = 0 }, + .settings = &N(NpcSettings_BulletBill), + .flags = ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_80000, + .drops = { + .dropFlags = NPC_DROP_FLAG_80, + .itemDropChance = 3, + .itemDrops = { + { ITEM_MUSHROOM, 10, 0 }, + }, + .heartDrops = STANDARD_HEART_DROPS(2), + .flowerDrops = STANDARD_FLOWER_DROPS(2), + }, .animations = { .idle = ANIM_BulletBill_Anim01, .walk = ANIM_BulletBill_Anim02, diff --git a/src/world/area_trd/trd_10/trd_10.h b/src/world/area_trd/trd_10/trd_10.h index ef6cdf8376..92791ea9fb 100644 --- a/src/world/area_trd/trd_10/trd_10.h +++ b/src/world/area_trd/trd_10/trd_10.h @@ -18,4 +18,8 @@ enum { NPC_KoopaBros_04 = 3, }; +enum { + MV_Unk_01 = MapVar(1), +}; + #define NAMESPACE trd_10 diff --git a/src/world/area_trd/trd_10/trd_10_1_main.c b/src/world/area_trd/trd_10/trd_10_1_main.c index 5d215ce9e3..9ce76968bf 100644 --- a/src/world/area_trd/trd_10/trd_10_1_main.c +++ b/src/world/area_trd/trd_10/trd_10_1_main.c @@ -5,6 +5,7 @@ extern EvtScript N(EVS_InitFakeBowser); extern EvtScript N(EVS_SetupFakeBowser); extern NpcGroupList N(DefaultNPCs); +#define STAR_SPIRIT_DATA_VAR MV_Unk_01 #include "world/common/todo/StarSpiritEffectFunc.inc.c" API_CALLABLE(N(SetMapChangeFadeRate)) { diff --git a/src/world/area_trd/trd_10/trd_10_2_npc.c b/src/world/area_trd/trd_10/trd_10_2_npc.c index 079c783a24..3bc4095e0a 100644 --- a/src/world/area_trd/trd_10/trd_10_2_npc.c +++ b/src/world/area_trd/trd_10/trd_10_2_npc.c @@ -335,18 +335,14 @@ NpcSettings N(NpcSettings_KoopaBros_04) = { .flags = ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, }; -StaticNpc N(NpcData_KoopaBros_01)[] = { +NpcData N(NpcData_KoopaBros_01)[] = { { .id = NPC_KoopaBros_01, - .settings = &N(NpcSettings_KoopaBros_01), .pos = { 0.0f, 0.0f, 0.0f }, .yaw = 270, + .settings = &N(NpcSettings_KoopaBros_01), .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_NO_DROPS, - .drops = { - .dropFlags = NPC_DROP_FLAG_80, - .heartDrops = NO_DROPS, - .flowerDrops = NO_DROPS, - }, + .drops = NO_DROPS, .animations = { .idle = ANIM_KoopaBros_Black_Anim04, .walk = ANIM_KoopaBros_Black_Anim02, @@ -368,15 +364,11 @@ StaticNpc N(NpcData_KoopaBros_01)[] = { }, { .id = NPC_KoopaBros_02, - .settings = &N(NpcSettings_KoopaBros_02), .pos = { 0.0f, 0.0f, 0.0f }, .yaw = 270, + .settings = &N(NpcSettings_KoopaBros_02), .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_NO_DROPS, - .drops = { - .dropFlags = NPC_DROP_FLAG_80, - .heartDrops = NO_DROPS, - .flowerDrops = NO_DROPS, - }, + .drops = NO_DROPS, .animations = { .idle = ANIM_KoopaBros_Red_Anim04, .walk = ANIM_KoopaBros_Red_Anim02, @@ -398,15 +390,11 @@ StaticNpc N(NpcData_KoopaBros_01)[] = { }, { .id = NPC_KoopaBros_03, - .settings = &N(NpcSettings_KoopaBros_03), .pos = { 0.0f, 0.0f, 0.0f }, .yaw = 270, + .settings = &N(NpcSettings_KoopaBros_03), .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_NO_DROPS, - .drops = { - .dropFlags = NPC_DROP_FLAG_80, - .heartDrops = NO_DROPS, - .flowerDrops = NO_DROPS, - }, + .drops = NO_DROPS, .animations = { .idle = ANIM_KoopaBros_Yellow_Anim04, .walk = ANIM_KoopaBros_Yellow_Anim02, @@ -428,15 +416,11 @@ StaticNpc N(NpcData_KoopaBros_01)[] = { }, { .id = NPC_KoopaBros_04, - .settings = &N(NpcSettings_KoopaBros_04), .pos = { 0.0f, 0.0f, 0.0f }, .yaw = 270, + .settings = &N(NpcSettings_KoopaBros_04), .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_NO_DROPS, - .drops = { - .dropFlags = NPC_DROP_FLAG_80, - .heartDrops = NO_DROPS, - .flowerDrops = NO_DROPS, - }, + .drops = NO_DROPS, .animations = { .idle = ANIM_KoopaBros_Green_Anim04, .walk = ANIM_KoopaBros_Green_Anim02, diff --git a/src/world/area_tst/tst.h b/src/world/area_tst/tst.h index 5097bfe9b4..b2a8050875 100644 --- a/src/world/area_tst/tst.h +++ b/src/world/area_tst/tst.h @@ -2,22 +2,22 @@ #define _WORLD_AREA_TST_TST_H_ enum { - AB_TST_0 = AreaByte(0), - AB_TST_1 = AreaByte(1), - AB_TST_2 = AreaByte(2), - AB_TST_3 = AreaByte(3), - AB_TST_4 = AreaByte(4), - AB_TST_5 = AreaByte(5), - AB_TST_6 = AreaByte(6), - AB_TST_7 = AreaByte(7), - AB_TST_8 = AreaByte(8), - AB_TST_9 = AreaByte(9), - AB_TST_A = AreaByte(10), - AB_TST_B = AreaByte(11), - AB_TST_C = AreaByte(12), - AB_TST_D = AreaByte(13), - AB_TST_E = AreaByte(14), - AB_TST_F = AreaByte(15), + AB_TST_Unused_0 = AreaByte(0), + AB_TST_Unused_1 = AreaByte(1), + AB_TST_Unused_2 = AreaByte(2), + AB_TST_Unused_3 = AreaByte(3), + AB_TST_Unused_4 = AreaByte(4), + AB_TST_Unused_5 = AreaByte(5), + AB_TST_Unused_6 = AreaByte(6), + AB_TST_Unused_7 = AreaByte(7), + AB_TST_Unused_8 = AreaByte(8), + AB_TST_Unused_9 = AreaByte(9), + AB_TST_Unused_A = AreaByte(10), + AB_TST_Unused_B = AreaByte(11), + AB_TST_Unused_C = AreaByte(12), + AB_TST_Unused_D = AreaByte(13), + AB_TST_Unused_E = AreaByte(14), + AB_TST_Unused_F = AreaByte(15), }; enum { diff --git a/src/world/area_tst/tst_04/tst_04_4_npc.c b/src/world/area_tst/tst_04/tst_04_4_npc.c index edab02989b..bc408b039e 100644 --- a/src/world/area_tst/tst_04/tst_04_4_npc.c +++ b/src/world/area_tst/tst_04/tst_04_4_npc.c @@ -51,11 +51,11 @@ NpcSettings N(NpcSettings_Goompa) = { .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4, }; -StaticNpc N(NpcData_GoombaFamily) = { +NpcData N(NpcData_GoombaFamily) = { .id = NPC_Goompa, - .settings = &N(NpcSettings_Goompa), .pos = { 80.0f, 40.0f, -84.0f }, .yaw = 0, + .settings = &N(NpcSettings_Goompa), .flags = ENEMY_FLAG_GRAVITY, }; diff --git a/src/world/area_tst/tst_13/tst_13_1_main.c b/src/world/area_tst/tst_13/tst_13_1_main.c index 3bb28a2f5a..0a8eeed4e5 100644 --- a/src/world/area_tst/tst_13/tst_13_1_main.c +++ b/src/world/area_tst/tst_13/tst_13_1_main.c @@ -174,93 +174,93 @@ NpcSettings N(NpcSettings_09) = { .flags = ENEMY_FLAG_PASSIVE, }; -StaticNpc N(NpcData_Testing)[] = { +NpcData N(NpcData_Testing)[] = { { .id = NPC_00, - .settings = &N(NpcSettings_00), .pos = { 0.0f, 0.0f, 0.0f }, .yaw = 0, + .settings = &N(NpcSettings_00), .flags = COMMON_PASSIVE_FLAGS, .animations = { }, }, { .id = NPC_01, - .settings = &N(NpcSettings_01), .pos = { 20.0f, 0.0f, 20.0f }, .yaw = 0, + .settings = &N(NpcSettings_01), .flags = COMMON_PASSIVE_FLAGS, .animations = { }, }, { .id = NPC_02, - .settings = &N(NpcSettings_02), .pos = { 40.0f, 0.0f, 40.0f }, .yaw = 0, + .settings = &N(NpcSettings_02), .flags = COMMON_PASSIVE_FLAGS, .animations = { }, }, { .id = NPC_03, - .settings = &N(NpcSettings_03), .pos = { 60.0f, 0.0f, 60.0f }, .yaw = 0, + .settings = &N(NpcSettings_03), .flags = COMMON_PASSIVE_FLAGS, .animations = { }, }, { .id = NPC_04, - .settings = &N(NpcSettings_04), .pos = { 80.0f, 0.0f, 80.0f }, .yaw = 0, + .settings = &N(NpcSettings_04), .flags = COMMON_PASSIVE_FLAGS, .animations = { }, }, { .id = NPC_05, - .settings = &N(NpcSettings_05), .pos = { 100.0f, 0.0f, 100.0f }, .yaw = 0, + .settings = &N(NpcSettings_05), .flags = COMMON_PASSIVE_FLAGS, .animations = { }, }, { .id = NPC_06, - .settings = &N(NpcSettings_06), .pos = { 120.0f, 0.0f, 120.0f }, .yaw = 0, + .settings = &N(NpcSettings_06), .flags = COMMON_PASSIVE_FLAGS, .animations = { }, }, { .id = NPC_07, - .settings = &N(NpcSettings_07), .pos = { 140.0f, 0.0f, 140.0f }, .yaw = 0, + .settings = &N(NpcSettings_07), .flags = COMMON_PASSIVE_FLAGS, .animations = { }, }, { .id = NPC_08, - .settings = &N(NpcSettings_08), .pos = { 160.0f, 0.0f, 160.0f }, .yaw = 0, + .settings = &N(NpcSettings_08), .flags = COMMON_PASSIVE_FLAGS, .animations = { }, }, { .id = NPC_09, - .settings = &N(NpcSettings_09), .pos = { 180.0f, 0.0f, 180.0f }, .yaw = 0, + .settings = &N(NpcSettings_09), .flags = COMMON_PASSIVE_FLAGS, .animations = { }, diff --git a/src/world/common/atomic/BetaFloorPanels.inc.c b/src/world/common/atomic/BetaFloorPanels.inc.c index a3fb67dcf5..971e0e717b 100644 --- a/src/world/common/atomic/BetaFloorPanels.inc.c +++ b/src/world/common/atomic/BetaFloorPanels.inc.c @@ -25,7 +25,7 @@ API_CALLABLE(N(CheckShouldBreakFloor)) { return ApiStatus_DONE2; } -ApiStatus N(CheckShouldFlipFloor)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(CheckShouldFlipFloor)) { PlayerStatus* playerStatus = &gPlayerStatus; f32 distance = dist2D( playerStatus->position.x, playerStatus->position.z, diff --git a/src/world/common/atomic/MakeConsumableChoice.inc.c b/src/world/common/atomic/MakeConsumableChoice.inc.c index 5535b79aac..4b222c3dc9 100644 --- a/src/world/common/atomic/MakeConsumableChoice.inc.c +++ b/src/world/common/atomic/MakeConsumableChoice.inc.c @@ -1,6 +1,6 @@ #include "common.h" -ApiStatus N(BuildItemChoiceList)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(BuildItemChoiceList)) { Bytecode* args = script->ptrReadPos; s32* allowedItemList = (s32*)evt_get_variable(script, *args++); s32 i; diff --git a/src/world/common/atomic/MakeKeyChoice.inc.c b/src/world/common/atomic/MakeKeyChoice.inc.c index 69ea486982..8bc10ada95 100644 --- a/src/world/common/atomic/MakeKeyChoice.inc.c +++ b/src/world/common/atomic/MakeKeyChoice.inc.c @@ -1,6 +1,6 @@ #include "common.h" -ApiStatus N(BuildKeyItemChoiceList)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(BuildKeyItemChoiceList)) { Bytecode* args = script->ptrReadPos; s32* allowedItemList = (s32*)evt_get_variable(script, *args++); s32 i; diff --git a/src/world/common/atomic/MonitorMusicProximityTrigger.inc.c b/src/world/common/atomic/MonitorMusicProximityTrigger.inc.c index 8c35bd8585..d11869b090 100644 --- a/src/world/common/atomic/MonitorMusicProximityTrigger.inc.c +++ b/src/world/common/atomic/MonitorMusicProximityTrigger.inc.c @@ -8,7 +8,7 @@ Setting an event flags overries the normal music with the modified music until the outer distance is exceeded. */ -ApiStatus N(MonitorMusicProximityTrigger)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(MonitorMusicProximityTrigger)) { Bytecode* args = script->ptrReadPos; MusicProximityTrigger* trigger; s32 cond = FALSE; diff --git a/src/world/common/atomic/TexturePan.data.inc.c b/src/world/common/atomic/TexturePan.h similarity index 58% rename from src/world/common/atomic/TexturePan.data.inc.c rename to src/world/common/atomic/TexturePan.h index 5ed856ad53..b511002b58 100644 --- a/src/world/common/atomic/TexturePan.data.inc.c +++ b/src/world/common/atomic/TexturePan.h @@ -1,8 +1,3 @@ -#include "common.h" - -//extern API_CALLABLE(N(UpdateTexturePanSmooth)); -//extern API_CALLABLE(N(UpdateTexturePanStepped)); - #define TEX_PAN_PARAMS_ID(panID) \ EVT_SET(LVar0, (panID)) @@ -24,19 +19,4 @@ EVT_SET(LVarB, (aux_init_u)) \ EVT_SET(LVarC, (aux_init_v)) \ -EvtScript N(EVS_UpdateTexturePan) = { - EVT_SET_GROUP(EVT_GROUP_00) - EVT_IF_EQ(LVar5, 1) - EVT_IF_EQ(LVar6, 1) - EVT_IF_EQ(LVar7, 1) - EVT_IF_EQ(LVar8, 1) - EVT_CALL(N(UpdateTexturePanSmooth)) - EVT_RETURN - EVT_END_IF - EVT_END_IF - EVT_END_IF - EVT_END_IF - EVT_CALL(N(UpdateTexturePanStepped)) - EVT_RETURN - EVT_END -}; +extern EvtScript N(EVS_UpdateTexturePan); diff --git a/src/world/common/atomic/TexturePan.inc.c b/src/world/common/atomic/TexturePan.inc.c index 1da9c65892..75dfce6170 100644 --- a/src/world/common/atomic/TexturePan.inc.c +++ b/src/world/common/atomic/TexturePan.inc.c @@ -1,7 +1,9 @@ #include "common.h" #include "npc.h" -ApiStatus N(UpdateTexturePanSmooth)(Evt* script, s32 isInitialCall) { +#include "TexturePan.h" + +API_CALLABLE(N(UpdateTexturePanSmooth)) { script->varTable[9] += script->varTable[1]; if (script->varTable[9] < 0) { script->varTable[9] += 0x20000; @@ -37,7 +39,7 @@ ApiStatus N(UpdateTexturePanSmooth)(Evt* script, s32 isInitialCall) { return ApiStatus_BLOCK; } -ApiStatus N(UpdateTexturePanStepped)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(UpdateTexturePanStepped)) { if (isInitialCall) { script->functionTemp[0] = 0; script->functionTemp[1] = 0; @@ -106,3 +108,21 @@ ApiStatus N(UpdateTexturePanStepped)(Evt* script, s32 isInitialCall) { return ApiStatus_BLOCK; } + +EvtScript N(EVS_UpdateTexturePan) = { + EVT_SET_GROUP(EVT_GROUP_00) + EVT_IF_EQ(LVar5, 1) + EVT_IF_EQ(LVar6, 1) + EVT_IF_EQ(LVar7, 1) + EVT_IF_EQ(LVar8, 1) + EVT_CALL(N(UpdateTexturePanSmooth)) + EVT_RETURN + EVT_END_IF + EVT_END_IF + EVT_END_IF + EVT_END_IF + EVT_CALL(N(UpdateTexturePanStepped)) + EVT_RETURN + EVT_END +}; + diff --git a/src/world/common/atomic/ToadHouse.data.inc.c b/src/world/common/atomic/ToadHouse.data.inc.c index df372c5f3e..3ebb6e1eab 100644 --- a/src/world/common/atomic/ToadHouse.data.inc.c +++ b/src/world/common/atomic/ToadHouse.data.inc.c @@ -6,7 +6,7 @@ extern EvtScript N(EVS_ToadHouse_SetDialogue); extern EvtScript N(EVS_ToadHouse_ReturnFromRest); extern EvtScript N(EVS_ToadHouse_GetInBed); -EvtScript N(8024AC14) = { +EvtScript N(EVS_ToadHouse_Unk1) = { EVT_CALL(EnableModel, LVar4, FALSE) EVT_CALL(EnableModel, LVar5, TRUE) EVT_CALL(RotateModel, LVar6, 0, 0, 0, 1) @@ -15,7 +15,7 @@ EvtScript N(8024AC14) = { EVT_END }; -EvtScript N(8024AC8C) = { +EvtScript N(EVS_ToadHouse_Unk2) = { EVT_SET(LVar9, LVar7) EVT_SET(LVar8, LVar6) EVT_SET(LVar7, LVar5) @@ -66,7 +66,7 @@ EvtScript N(EVS_NpcInteract_ToadHouseKeeper) = { EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_100, TRUE) EVT_CALL(N(ToadHouse_DisableStatusMenu)) EVT_IF_NE(LVar4, 0) - EVT_EXEC(N(8024AC8C)) + EVT_EXEC(N(EVS_ToadHouse_Unk2)) EVT_END_IF EVT_CALL(N(ToadHouse_PutPartnerAway), LVarA) EVT_WAIT(20) @@ -83,7 +83,7 @@ EvtScript N(EVS_NpcInteract_ToadHouseKeeper) = { EVT_CALL(FullyRestoreHPandFP) EVT_CALL(FullyRestoreSP) EVT_IF_NE(LVar4, 0) - EVT_EXEC(N(8024AC14)) + EVT_EXEC(N(EVS_ToadHouse_Unk1)) EVT_END_IF EVT_CALL(N(ToadHouse_GetPartnerBackOut), LVarA) EVT_WAIT(45) diff --git a/src/world/common/atomic/WhaleGeyser.inc.c b/src/world/common/atomic/WhaleGeyser.inc.c index 3c1066ec98..25d6efb8e1 100644 --- a/src/world/common/atomic/WhaleGeyser.inc.c +++ b/src/world/common/atomic/WhaleGeyser.inc.c @@ -18,7 +18,7 @@ ApiStatus N(CreateWhaleGeyser)(Evt* script, s32 isInitialStatus) { return ApiStatus_DONE2; } -ApiStatus N(SetWhaleGeyserPos)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(SetWhaleGeyserPos)) { Bytecode* args = script->ptrReadPos; EffectInstance* effect = (EffectInstance*) evt_get_variable(script, *args++); f32 x = evt_get_float_variable(script, *args++); diff --git a/src/world/common/complete/KeyItemChoice.inc.c b/src/world/common/complete/KeyItemChoice.inc.c index 34734d42fb..e1185c1b23 100644 --- a/src/world/common/complete/KeyItemChoice.inc.c +++ b/src/world/common/complete/KeyItemChoice.inc.c @@ -14,7 +14,7 @@ s32 N(ItemChoice_SelectedItemID) = 0; #include "world/common/todo/GetNpcCollisionHeight.inc.c" #include "world/common/todo/AddPlayerHandsOffset.inc.c" -ApiStatus N(ItemChoice_WaitForSelection)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(ItemChoice_WaitForSelection)) { Bytecode* args = script->ptrReadPos; if (isInitialCall) { @@ -30,7 +30,7 @@ ApiStatus N(ItemChoice_WaitForSelection)(Evt* script, s32 isInitialCall) { return ApiStatus_BLOCK; } -ApiStatus N(ItemChoice_SaveSelected)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(ItemChoice_SaveSelected)) { Bytecode* args = script->ptrReadPos; N(ItemChoice_SelectedItemID) = evt_get_variable(script, *args); diff --git a/src/world/common/complete/Quizmo.inc.c b/src/world/common/complete/Quizmo.inc.c index e26462c0fe..4ba51fb9a7 100644 --- a/src/world/common/complete/Quizmo.inc.c +++ b/src/world/common/complete/Quizmo.inc.c @@ -8,13 +8,6 @@ #error CHUCK_QUIZMO_NPC_ID must be defined for Quizmo.inc.c #endif -#define QUIZMO_DROPS \ -{ \ - .dropFlags = NPC_DROP_FLAG_80, \ - .heartDrops = NO_DROPS, \ - .flowerDrops = NO_DROPS, \ -} - #define QUIZMO_ANIMS \ { \ ANIM_ChuckQuizmo_Idle, \ diff --git a/src/world/common/enemy/complete/AlbinoDino.h b/src/world/common/enemy/AlbinoDino.h similarity index 100% rename from src/world/common/enemy/complete/AlbinoDino.h rename to src/world/common/enemy/AlbinoDino.h diff --git a/src/world/common/enemy/complete/AlbinoDino.inc.c b/src/world/common/enemy/AlbinoDino.inc.c similarity index 100% rename from src/world/common/enemy/complete/AlbinoDino.inc.c rename to src/world/common/enemy/AlbinoDino.inc.c diff --git a/src/world/common/enemy/complete/AmazyDayzee.h b/src/world/common/enemy/AmazyDayzee.h similarity index 100% rename from src/world/common/enemy/complete/AmazyDayzee.h rename to src/world/common/enemy/AmazyDayzee.h diff --git a/src/world/common/enemy/complete/AmazyDayzee.inc.c b/src/world/common/enemy/AmazyDayzee.inc.c similarity index 100% rename from src/world/common/enemy/complete/AmazyDayzee.inc.c rename to src/world/common/enemy/AmazyDayzee.inc.c diff --git a/src/world/common/enemy/complete/Bandit.h b/src/world/common/enemy/Bandit.h similarity index 100% rename from src/world/common/enemy/complete/Bandit.h rename to src/world/common/enemy/Bandit.h diff --git a/src/world/common/enemy/complete/Bandit.inc.c b/src/world/common/enemy/Bandit.inc.c similarity index 100% rename from src/world/common/enemy/complete/Bandit.inc.c rename to src/world/common/enemy/Bandit.inc.c diff --git a/src/world/common/enemy/complete/Blooper.h b/src/world/common/enemy/Blooper.h similarity index 83% rename from src/world/common/enemy/complete/Blooper.h rename to src/world/common/enemy/Blooper.h index 41c55f2a3d..b0cb8d1ea9 100644 --- a/src/world/common/enemy/complete/Blooper.h +++ b/src/world/common/enemy/Blooper.h @@ -1,13 +1,6 @@ #include "common.h" #include "sprite/npc/Blooper.h" -#define BLOOPER_NO_DROPS \ -{ \ - .dropFlags = NPC_DROP_FLAG_80, \ - .heartDrops = NO_DROPS, \ - .flowerDrops = NO_DROPS, \ -} - #define BLOOPER_ANIMS \ { \ .idle = ANIM_Blooper_Anim0C, \ diff --git a/src/world/common/enemy/complete/Blooper.inc.c b/src/world/common/enemy/Blooper.inc.c similarity index 100% rename from src/world/common/enemy/complete/Blooper.inc.c rename to src/world/common/enemy/Blooper.inc.c diff --git a/src/world/common/enemy/complete/Bobomb.h b/src/world/common/enemy/Bobomb.h similarity index 100% rename from src/world/common/enemy/complete/Bobomb.h rename to src/world/common/enemy/Bobomb.h diff --git a/src/world/common/enemy/complete/Bobomb_Guard.inc.c b/src/world/common/enemy/Bobomb_Guard.inc.c similarity index 100% rename from src/world/common/enemy/complete/Bobomb_Guard.inc.c rename to src/world/common/enemy/Bobomb_Guard.inc.c diff --git a/src/world/common/enemy/complete/Bobomb_Wander.inc.c b/src/world/common/enemy/Bobomb_Wander.inc.c similarity index 100% rename from src/world/common/enemy/complete/Bobomb_Wander.inc.c rename to src/world/common/enemy/Bobomb_Wander.inc.c diff --git a/src/world/common/enemy/complete/Bombette.h b/src/world/common/enemy/Bombette.h similarity index 100% rename from src/world/common/enemy/complete/Bombette.h rename to src/world/common/enemy/Bombette.h diff --git a/src/world/common/enemy/complete/Bombette.inc.c b/src/world/common/enemy/Bombette.inc.c similarity index 100% rename from src/world/common/enemy/complete/Bombette.inc.c rename to src/world/common/enemy/Bombette.inc.c diff --git a/src/world/common/enemy/complete/BombshellBill.h b/src/world/common/enemy/BombshellBill.h similarity index 95% rename from src/world/common/enemy/complete/BombshellBill.h rename to src/world/common/enemy/BombshellBill.h index 5cb0e2fb02..f47ed90bc0 100644 --- a/src/world/common/enemy/complete/BombshellBill.h +++ b/src/world/common/enemy/BombshellBill.h @@ -10,13 +10,6 @@ .maxCoinBonus = 3, \ } -#define BOMBSHELL_BLASTER_NO_DROPS \ -{ \ - .dropFlags = NPC_DROP_FLAG_80, \ - .heartDrops = NO_DROPS, \ - .flowerDrops = NO_DROPS, \ -} - #define BOMBSHELL_BLASTER_ANIMS \ { \ .idle = ANIM_BillBlaster_Gold_Anim01, \ diff --git a/src/world/common/enemy/complete/BulletBill.h b/src/world/common/enemy/BulletBill.h similarity index 95% rename from src/world/common/enemy/complete/BulletBill.h rename to src/world/common/enemy/BulletBill.h index ac02dc4ba0..66a99bb93c 100644 --- a/src/world/common/enemy/complete/BulletBill.h +++ b/src/world/common/enemy/BulletBill.h @@ -10,13 +10,6 @@ .maxCoinBonus = 1, \ } -#define BILL_BLASTER_NO_DROPS \ -{ \ - .dropFlags = NPC_DROP_FLAG_80, \ - .heartDrops = NO_DROPS, \ - .flowerDrops = NO_DROPS, \ -} - #define BILL_BLASTER_ANIMS \ { \ .idle = ANIM_BillBlaster_Anim01, \ diff --git a/src/world/common/enemy/complete/Bzzap.h b/src/world/common/enemy/Bzzap.h similarity index 88% rename from src/world/common/enemy/complete/Bzzap.h rename to src/world/common/enemy/Bzzap.h index a6b7afa044..31bb63403c 100644 --- a/src/world/common/enemy/complete/Bzzap.h +++ b/src/world/common/enemy/Bzzap.h @@ -1,13 +1,6 @@ #include "common.h" #include "sprite/npc/Bzzap.h" -#define BZZAP_NO_DROPS \ -{ \ - .dropFlags = NPC_DROP_FLAG_80, \ - .heartDrops = NO_DROPS, \ - .flowerDrops = NO_DROPS, \ -} - #define BZZAP_DROPS \ { \ .dropFlags = NPC_DROP_FLAG_80, \ diff --git a/src/world/common/enemy/complete/Bzzap.inc.c b/src/world/common/enemy/Bzzap.inc.c similarity index 100% rename from src/world/common/enemy/complete/Bzzap.inc.c rename to src/world/common/enemy/Bzzap.inc.c diff --git a/src/world/common/enemy/complete/Cleft.h b/src/world/common/enemy/Cleft.h similarity index 100% rename from src/world/common/enemy/complete/Cleft.h rename to src/world/common/enemy/Cleft.h diff --git a/src/world/common/enemy/complete/Cleft.inc.c b/src/world/common/enemy/Cleft.inc.c similarity index 100% rename from src/world/common/enemy/complete/Cleft.inc.c rename to src/world/common/enemy/Cleft.inc.c diff --git a/src/world/common/enemy/complete/Clubba.h b/src/world/common/enemy/Clubba.h similarity index 98% rename from src/world/common/enemy/complete/Clubba.h rename to src/world/common/enemy/Clubba.h index 31c5350d8b..fb78cdc04c 100644 --- a/src/world/common/enemy/complete/Clubba.h +++ b/src/world/common/enemy/Clubba.h @@ -62,7 +62,7 @@ .pos = { NPC_DISPOSE_LOCATION }, \ .yaw = 0, \ .flags = ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_NO_DROPS, \ - .drops = NPC_NO_DROPS, \ + .drops = NO_DROPS, \ .animations = CLUBBA_ANIMS, \ .extraAnimations = N(ExtraAnims_Clubba_Hitbox), \ } diff --git a/src/world/common/enemy/complete/Clubba.inc.c b/src/world/common/enemy/Clubba.inc.c similarity index 100% rename from src/world/common/enemy/complete/Clubba.inc.c rename to src/world/common/enemy/Clubba.inc.c diff --git a/src/world/common/enemy/complete/Clubba_Multi.inc.c b/src/world/common/enemy/Clubba_Multi.inc.c similarity index 97% rename from src/world/common/enemy/complete/Clubba_Multi.inc.c rename to src/world/common/enemy/Clubba_Multi.inc.c index 50e3718b91..d8558da200 100644 --- a/src/world/common/enemy/complete/Clubba_Multi.inc.c +++ b/src/world/common/enemy/Clubba_Multi.inc.c @@ -16,7 +16,7 @@ EvtScript N(EVS_NpcDefeat_Clubba) = { EVT_END }; -s32 N(ExtraAnims_Clubba)[] = { +AnimID N(ExtraAnims_Clubba)[] = { ANIM_WorldClubba_Anim00, ANIM_WorldClubba_Anim02, ANIM_WorldClubba_Anim03, @@ -26,12 +26,12 @@ s32 N(ExtraAnims_Clubba)[] = { ANIM_WorldClubba_Anim08, ANIM_WorldClubba_Anim11, ANIM_WorldClubba_Anim12, - -1 + ANIM_LIST_END }; -s32 N(ExtraAnims_Clubba_Hitbox)[] = { +AnimID N(ExtraAnims_Clubba_Hitbox)[] = { ANIM_WorldClubba_Anim00, - -1 + ANIM_LIST_END }; #ifdef INCLUDE_CLUBBA_WANDER diff --git a/src/world/common/enemy/complete/CrazyDayzee.h b/src/world/common/enemy/CrazyDayzee.h similarity index 100% rename from src/world/common/enemy/complete/CrazyDayzee.h rename to src/world/common/enemy/CrazyDayzee.h diff --git a/src/world/common/enemy/complete/CrazyDayzee.inc.c b/src/world/common/enemy/CrazyDayzee.inc.c similarity index 100% rename from src/world/common/enemy/complete/CrazyDayzee.inc.c rename to src/world/common/enemy/CrazyDayzee.inc.c diff --git a/src/world/common/enemy/complete/CrystalKing.h b/src/world/common/enemy/CrystalKing.h similarity index 100% rename from src/world/common/enemy/complete/CrystalKing.h rename to src/world/common/enemy/CrystalKing.h diff --git a/src/world/common/enemy/complete/CrystalKing.inc.c b/src/world/common/enemy/CrystalKing.inc.c similarity index 100% rename from src/world/common/enemy/complete/CrystalKing.inc.c rename to src/world/common/enemy/CrystalKing.inc.c diff --git a/src/world/common/enemy/complete/DarkTroopa.h b/src/world/common/enemy/DarkTroopa.h similarity index 100% rename from src/world/common/enemy/complete/DarkTroopa.h rename to src/world/common/enemy/DarkTroopa.h diff --git a/src/world/common/enemy/complete/DarkTroopa_Wander.inc.c b/src/world/common/enemy/DarkTroopa_Wander.inc.c similarity index 100% rename from src/world/common/enemy/complete/DarkTroopa_Wander.inc.c rename to src/world/common/enemy/DarkTroopa_Wander.inc.c diff --git a/src/world/common/enemy/complete/DryBones.h b/src/world/common/enemy/DryBones.h similarity index 94% rename from src/world/common/enemy/complete/DryBones.h rename to src/world/common/enemy/DryBones.h index 22fac6af26..56535a9afa 100644 --- a/src/world/common/enemy/complete/DryBones.h +++ b/src/world/common/enemy/DryBones.h @@ -41,11 +41,7 @@ .pos = { NPC_DISPOSE_LOCATION }, \ .yaw = 90, \ .flags = ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_NO_DROPS, \ - .drops = { \ - .dropFlags = NPC_DROP_FLAG_80, \ - .heartDrops = NO_DROPS, \ - .flowerDrops = NO_DROPS, \ - }, \ + .drops = NO_DROPS, \ .territory = { \ .wander = { \ .isFlying = TRUE, \ diff --git a/src/world/common/enemy/complete/DryBones.inc.c b/src/world/common/enemy/DryBones.inc.c similarity index 100% rename from src/world/common/enemy/complete/DryBones.inc.c rename to src/world/common/enemy/DryBones.inc.c diff --git a/src/world/common/enemy/complete/Duplighost.h b/src/world/common/enemy/Duplighost.h similarity index 100% rename from src/world/common/enemy/complete/Duplighost.h rename to src/world/common/enemy/Duplighost.h diff --git a/src/world/common/enemy/complete/Duplighost_Patrol.inc.c b/src/world/common/enemy/Duplighost_Patrol.inc.c similarity index 100% rename from src/world/common/enemy/complete/Duplighost_Patrol.inc.c rename to src/world/common/enemy/Duplighost_Patrol.inc.c diff --git a/src/world/common/enemy/complete/Duplighost_Wander.inc.c b/src/world/common/enemy/Duplighost_Wander.inc.c similarity index 100% rename from src/world/common/enemy/complete/Duplighost_Wander.inc.c rename to src/world/common/enemy/Duplighost_Wander.inc.c diff --git a/src/world/common/enemy/complete/Ember.h b/src/world/common/enemy/Ember.h similarity index 100% rename from src/world/common/enemy/complete/Ember.h rename to src/world/common/enemy/Ember.h diff --git a/src/world/common/enemy/complete/Ember.inc.c b/src/world/common/enemy/Ember.inc.c similarity index 100% rename from src/world/common/enemy/complete/Ember.inc.c rename to src/world/common/enemy/Ember.inc.c diff --git a/src/world/common/enemy/complete/FlyingMagikoopa.h b/src/world/common/enemy/FlyingMagikoopa.h similarity index 93% rename from src/world/common/enemy/complete/FlyingMagikoopa.h rename to src/world/common/enemy/FlyingMagikoopa.h index 8575a6099f..68bff3fb95 100644 --- a/src/world/common/enemy/complete/FlyingMagikoopa.h +++ b/src/world/common/enemy/FlyingMagikoopa.h @@ -2,7 +2,7 @@ #include "sprite/npc/Magikoopa.h" #include "sprite/npc/FlyingMagikoopa.h" -#define FLYING_MAGIKOOPA_DROPS \ +#define FLYING_MAGINO_DROPS \ { \ .dropFlags = NPC_DROP_FLAG_80, \ .itemDropChance = 5, \ @@ -45,11 +45,7 @@ .pos = { NPC_DISPOSE_LOCATION }, \ .yaw = 90, \ .flags = ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_NO_DROPS, \ - .drops = { \ - .dropFlags = NPC_DROP_FLAG_80, \ - .heartDrops = NO_DROPS, \ - .flowerDrops = NO_DROPS, \ - }, \ + .drops = NO_DROPS, \ .animations = { \ .idle = ANIM_FlyingMagikoopa_Anim00, \ .walk = ANIM_FlyingMagikoopa_Anim00, \ diff --git a/src/world/common/enemy/complete/FlyingMagikoopa.inc.c b/src/world/common/enemy/FlyingMagikoopa.inc.c similarity index 98% rename from src/world/common/enemy/complete/FlyingMagikoopa.inc.c rename to src/world/common/enemy/FlyingMagikoopa.inc.c index 17249bdb21..4581b66198 100644 --- a/src/world/common/enemy/complete/FlyingMagikoopa.inc.c +++ b/src/world/common/enemy/FlyingMagikoopa.inc.c @@ -47,7 +47,7 @@ NpcSettings N(NpcSettings_FlyingMagikoopa) = { .onDefeat = &N(EVS_NpcDefeat_FlyingMagikoopa), }; -s32 N(ExtraAnims_FlyingMagikoopa)[] = { +AnimID N(ExtraAnims_FlyingMagikoopa)[] = { ANIM_FlyingMagikoopa_Anim00, ANIM_FlyingMagikoopa_Anim01, ANIM_FlyingMagikoopa_Anim01, @@ -55,7 +55,7 @@ s32 N(ExtraAnims_FlyingMagikoopa)[] = { ANIM_FlyingMagikoopa_Anim02, ANIM_FlyingMagikoopa_Anim03, ANIM_FlyingMagikoopa_Anim04, - -1 + ANIM_LIST_END }; EvtScript N(EVS_NpcAuxAI_FlyingMagikoopa_AltHitbox) = { diff --git a/src/world/common/enemy/complete/ForestFuzzy.h b/src/world/common/enemy/ForestFuzzy.h similarity index 100% rename from src/world/common/enemy/complete/ForestFuzzy.h rename to src/world/common/enemy/ForestFuzzy.h diff --git a/src/world/common/enemy/complete/ForestFuzzy_Wander.inc.c b/src/world/common/enemy/ForestFuzzy_Wander.inc.c similarity index 100% rename from src/world/common/enemy/complete/ForestFuzzy_Wander.inc.c rename to src/world/common/enemy/ForestFuzzy_Wander.inc.c diff --git a/src/world/common/enemy/complete/FrostClubba.h b/src/world/common/enemy/FrostClubba.h similarity index 98% rename from src/world/common/enemy/complete/FrostClubba.h rename to src/world/common/enemy/FrostClubba.h index 3a5cd5e9de..91d0613440 100644 --- a/src/world/common/enemy/complete/FrostClubba.h +++ b/src/world/common/enemy/FrostClubba.h @@ -41,7 +41,7 @@ .pos = { NPC_DISPOSE_LOCATION }, \ .yaw = 0, \ .flags = ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_NO_DROPS, \ - .drops = NPC_NO_DROPS, \ + .drops = NO_DROPS, \ .animations = FROST_CLUBBA_ANIMS, \ .extraAnimations = N(ExtraAnims_FrostClubba_Hitbox), \ } diff --git a/src/world/common/enemy/complete/FrostClubba_Multi.inc.c b/src/world/common/enemy/FrostClubba_Multi.inc.c similarity index 97% rename from src/world/common/enemy/complete/FrostClubba_Multi.inc.c rename to src/world/common/enemy/FrostClubba_Multi.inc.c index ee811875bc..181de7b627 100644 --- a/src/world/common/enemy/complete/FrostClubba_Multi.inc.c +++ b/src/world/common/enemy/FrostClubba_Multi.inc.c @@ -16,7 +16,7 @@ EvtScript N(EVS_NpcDefeat_FrostClubba) = { EVT_END }; -s32 N(ExtraAnims_FrostClubba)[] = { +AnimID N(ExtraAnims_FrostClubba)[] = { ANIM_WorldClubba_Anim00, ANIM_WorldClubba_Anim02, ANIM_WorldClubba_Anim03, @@ -26,12 +26,12 @@ s32 N(ExtraAnims_FrostClubba)[] = { ANIM_WorldClubba_Anim08, ANIM_WorldClubba_Anim11, ANIM_WorldClubba_Anim12, - -1 + ANIM_LIST_END }; -s32 N(ExtraAnims_FrostClubba_Hitbox)[] = { +AnimID N(ExtraAnims_FrostClubba_Hitbox)[] = { ANIM_WorldClubba_Anim00, - -1 + ANIM_LIST_END }; #ifdef INCLUDE_FROST_CLUBBA_WANDER diff --git a/src/world/common/enemy/complete/FrostPiranha.h b/src/world/common/enemy/FrostPiranha.h similarity index 98% rename from src/world/common/enemy/complete/FrostPiranha.h rename to src/world/common/enemy/FrostPiranha.h index a3350ac84a..8804b24f1a 100644 --- a/src/world/common/enemy/complete/FrostPiranha.h +++ b/src/world/common/enemy/FrostPiranha.h @@ -42,7 +42,7 @@ .pos = { NPC_DISPOSE_LOCATION }, \ .yaw = 0, \ .flags = ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_NO_DROPS, \ - .drops = NPC_NO_DROPS, \ + .drops = NO_DROPS, \ .animations = FROST_PIRANHA_ANIMS, \ .extraAnimations = N(ExtraAnims_FrostPiranha_Hitbox), \ } diff --git a/src/world/common/enemy/complete/FrostPiranha.inc.c b/src/world/common/enemy/FrostPiranha.inc.c similarity index 94% rename from src/world/common/enemy/complete/FrostPiranha.inc.c rename to src/world/common/enemy/FrostPiranha.inc.c index b4f81cc034..8ce9c84100 100644 --- a/src/world/common/enemy/complete/FrostPiranha.inc.c +++ b/src/world/common/enemy/FrostPiranha.inc.c @@ -69,12 +69,12 @@ NpcSettings N(NpcSettings_FrostPiranha_Hitbox) = { .onDefeat = &N(EVS_GenericHitboxDefeat), }; -s32 N(ExtraAnims_FrostPiranha_Hitbox)[] = { +AnimID N(ExtraAnims_FrostPiranha_Hitbox)[] = { ANIM_LargePiranha_Frost_Anim00, - -1 + ANIM_LIST_END }; -s32 N(ExtraAnims_FrostPiranha)[] = { +AnimID N(ExtraAnims_FrostPiranha)[] = { ANIM_LargePiranha_Frost_Anim00, ANIM_LargePiranha_Frost_Anim01, ANIM_LargePiranha_Frost_Anim0E, @@ -82,5 +82,5 @@ s32 N(ExtraAnims_FrostPiranha)[] = { ANIM_LargePiranha_Frost_Anim06, ANIM_LargePiranha_Frost_Anim18, ANIM_LargePiranha_Frost_Anim17, - -1 + ANIM_LIST_END }; diff --git a/src/world/common/enemy/complete/Fuzzy.h b/src/world/common/enemy/Fuzzy.h similarity index 100% rename from src/world/common/enemy/complete/Fuzzy.h rename to src/world/common/enemy/Fuzzy.h diff --git a/src/world/common/enemy/complete/Fuzzy.inc.c b/src/world/common/enemy/Fuzzy.inc.c similarity index 100% rename from src/world/common/enemy/complete/Fuzzy.inc.c rename to src/world/common/enemy/Fuzzy.inc.c diff --git a/src/world/common/enemy/complete/Fuzzy_Wander.inc.c b/src/world/common/enemy/Fuzzy_Wander.inc.c similarity index 100% rename from src/world/common/enemy/complete/Fuzzy_Wander.inc.c rename to src/world/common/enemy/Fuzzy_Wander.inc.c diff --git a/src/world/common/enemy/complete/Gloomba.h b/src/world/common/enemy/Gloomba.h similarity index 100% rename from src/world/common/enemy/complete/Gloomba.h rename to src/world/common/enemy/Gloomba.h diff --git a/src/world/common/enemy/complete/Gloomba_Wander.inc.c b/src/world/common/enemy/Gloomba_Wander.inc.c similarity index 100% rename from src/world/common/enemy/complete/Gloomba_Wander.inc.c rename to src/world/common/enemy/Gloomba_Wander.inc.c diff --git a/src/world/common/enemy/complete/Goomba.h b/src/world/common/enemy/Goomba.h similarity index 100% rename from src/world/common/enemy/complete/Goomba.h rename to src/world/common/enemy/Goomba.h diff --git a/src/world/common/enemy/complete/Goomba.inc.c b/src/world/common/enemy/Goomba.inc.c similarity index 100% rename from src/world/common/enemy/complete/Goomba.inc.c rename to src/world/common/enemy/Goomba.inc.c diff --git a/src/world/common/enemy/complete/GoombaBros.h b/src/world/common/enemy/GoombaBros.h similarity index 91% rename from src/world/common/enemy/complete/GoombaBros.h rename to src/world/common/enemy/GoombaBros.h index b68dc0d214..bec1bb77ed 100644 --- a/src/world/common/enemy/complete/GoombaBros.h +++ b/src/world/common/enemy/GoombaBros.h @@ -1,13 +1,6 @@ #include "common.h" #include "sprite/npc/GoombaBros.h" -#define GOOMBA_BROS_DROPS \ -{ \ - .dropFlags = NPC_DROP_FLAG_80, \ - .heartDrops = NO_DROPS, \ - .flowerDrops = NO_DROPS, \ -} - #define GOOMBA_BROS_RED_ANIMS \ { \ .idle = ANIM_GoombaBros_Red_Idle, \ diff --git a/src/world/common/enemy/complete/GoombaBros_Guard.inc.c b/src/world/common/enemy/GoombaBros_Guard.inc.c similarity index 100% rename from src/world/common/enemy/complete/GoombaBros_Guard.inc.c rename to src/world/common/enemy/GoombaBros_Guard.inc.c diff --git a/src/world/common/enemy/complete/Goomba_Wander.inc.c b/src/world/common/enemy/Goomba_Wander.inc.c similarity index 100% rename from src/world/common/enemy/complete/Goomba_Wander.inc.c rename to src/world/common/enemy/Goomba_Wander.inc.c diff --git a/src/world/common/enemy/complete/GrooveGuy.h b/src/world/common/enemy/GrooveGuy.h similarity index 100% rename from src/world/common/enemy/complete/GrooveGuy.h rename to src/world/common/enemy/GrooveGuy.h diff --git a/src/world/common/enemy/complete/GrooveGuy.inc.c b/src/world/common/enemy/GrooveGuy.inc.c similarity index 100% rename from src/world/common/enemy/complete/GrooveGuy.inc.c rename to src/world/common/enemy/GrooveGuy.inc.c diff --git a/src/world/common/enemy/complete/Gulpit.h b/src/world/common/enemy/Gulpit.h similarity index 97% rename from src/world/common/enemy/complete/Gulpit.h rename to src/world/common/enemy/Gulpit.h index 187406dd3f..6ab51dc85a 100644 --- a/src/world/common/enemy/complete/Gulpit.h +++ b/src/world/common/enemy/Gulpit.h @@ -42,7 +42,7 @@ .pos = { NPC_DISPOSE_LOCATION }, \ .yaw = 0, \ .flags = ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_NO_DROPS, \ - .drops = NPC_NO_DROPS, \ + .drops = NO_DROPS, \ .animations = GULPIT_ANIMS, \ .extraAnimations = N(ExtraAnims_Gulpit_Hitbox), \ } diff --git a/src/world/common/enemy/complete/Gulpit.inc.c b/src/world/common/enemy/Gulpit.inc.c similarity index 93% rename from src/world/common/enemy/complete/Gulpit.inc.c rename to src/world/common/enemy/Gulpit.inc.c index ab5bc93f80..bd07773eb0 100644 --- a/src/world/common/enemy/complete/Gulpit.inc.c +++ b/src/world/common/enemy/Gulpit.inc.c @@ -58,17 +58,17 @@ NpcSettings N(NpcSettings_Gulpit_Hitbox) = { .actionFlags = AI_ACTION_08, }; -s32 N(ExtraAnims_Gulpit_Hitbox)[] = { +AnimID N(ExtraAnims_Gulpit_Hitbox)[] = { ANIM_Gulpit_Anim00, - -1 + ANIM_LIST_END }; -s32 N(ExtraAnims_Gulpit)[] = { +AnimID N(ExtraAnims_Gulpit)[] = { ANIM_Gulpit_Anim00, ANIM_Gulpit_Anim01, ANIM_Gulpit_Anim0B, ANIM_Gulpit_Anim04, ANIM_Gulpit_Anim02, ANIM_Gulpit_Anim03, - -1 + ANIM_LIST_END }; diff --git a/src/world/common/enemy/complete/HammerBros.h b/src/world/common/enemy/HammerBros.h similarity index 94% rename from src/world/common/enemy/complete/HammerBros.h rename to src/world/common/enemy/HammerBros.h index 09a8e87332..602a0764ba 100644 --- a/src/world/common/enemy/complete/HammerBros.h +++ b/src/world/common/enemy/HammerBros.h @@ -42,11 +42,7 @@ .pos = { NPC_DISPOSE_LOCATION }, \ .yaw = 90, \ .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_NO_DROPS, \ - .drops = { \ - .dropFlags = NPC_DROP_FLAG_80, \ - .heartDrops = NO_DROPS, \ - .flowerDrops = NO_DROPS, \ - }, \ + .drops = NO_DROPS, \ .territory = { \ .wander = { \ .isFlying = TRUE, \ diff --git a/src/world/common/enemy/HammerBros.inc.c b/src/world/common/enemy/HammerBros.inc.c new file mode 100644 index 0000000000..a7ff609cd3 --- /dev/null +++ b/src/world/common/enemy/HammerBros.inc.c @@ -0,0 +1,7 @@ +#include "HammerBros.h" + +NpcSettings N(NpcSettings_HammerBros) = { + .height = 36, + .radius = 24, + .level = 27, +}; diff --git a/src/world/common/enemy/complete/HammerBros.inc.c b/src/world/common/enemy/HammerBros_Wander.inc.c similarity index 96% rename from src/world/common/enemy/complete/HammerBros.inc.c rename to src/world/common/enemy/HammerBros_Wander.inc.c index 165f9b80f7..68d198b4c6 100644 --- a/src/world/common/enemy/complete/HammerBros.inc.c +++ b/src/world/common/enemy/HammerBros_Wander.inc.c @@ -45,7 +45,7 @@ EvtScript N(EVS_NpcAI_HammerBros) = { EVT_END }; -NpcSettings N(NpcSettings_HammerBros) = { +NpcSettings N(NpcSettings_HammerBros_Wander) = { .height = 36, .radius = 24, .level = 27, @@ -117,7 +117,7 @@ NpcSettings N(NpcSettings_HammerBros_Hammer) = { .actionFlags = AI_ACTION_08, }; -s32 N(ExtraAnims_HammerBros_Hammer)[] = { +AnimID N(ExtraAnims_HammerBros_Hammer)[] = { ANIM_HammerBros_Anim0D, - -1 + ANIM_LIST_END }; diff --git a/src/world/common/enemy/complete/HeartPlant.h b/src/world/common/enemy/HeartPlant.h similarity index 100% rename from src/world/common/enemy/complete/HeartPlant.h rename to src/world/common/enemy/HeartPlant.h diff --git a/src/world/common/enemy/complete/HeartPlant.inc.c b/src/world/common/enemy/HeartPlant.inc.c similarity index 98% rename from src/world/common/enemy/complete/HeartPlant.inc.c rename to src/world/common/enemy/HeartPlant.inc.c index ddc5885909..5b7ba95344 100644 --- a/src/world/common/enemy/complete/HeartPlant.inc.c +++ b/src/world/common/enemy/HeartPlant.inc.c @@ -51,6 +51,6 @@ NpcSettings N(NpcSettings_HeartPlant) = { #define HEART_PLANT_NPC_DATA \ .settings = &N(NpcSettings_HeartPlant), \ .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_8000 | ENEMY_FLAG_400000, \ - .drops = NPC_NO_DROPS, \ + .drops = NO_DROPS, \ .animations = HEART_PLANT_ANIMS, \ .tattle = MSG_NpcTattle_HeartPlant, \ diff --git a/src/world/common/enemy/complete/HuffNPuff.h b/src/world/common/enemy/HuffNPuff.h similarity index 83% rename from src/world/common/enemy/complete/HuffNPuff.h rename to src/world/common/enemy/HuffNPuff.h index 9c5926d220..1ee42df839 100644 --- a/src/world/common/enemy/complete/HuffNPuff.h +++ b/src/world/common/enemy/HuffNPuff.h @@ -1,13 +1,6 @@ #include "common.h" #include "sprite/npc/HuffNPuff.h" -#define HUFF_N_PUFF_NO_DROPS \ -{ \ - .dropFlags = NPC_DROP_FLAG_80, \ - .heartDrops = NO_DROPS, \ - .flowerDrops = NO_DROPS, \ -} - #define HUFF_N_PUFF_ANIMS \ { \ .idle = ANIM_HuffNPuff_Anim01, \ diff --git a/src/world/common/enemy/complete/HurtPlant.h b/src/world/common/enemy/HurtPlant.h similarity index 100% rename from src/world/common/enemy/complete/HurtPlant.h rename to src/world/common/enemy/HurtPlant.h diff --git a/src/world/common/enemy/complete/HurtPlant.inc.c b/src/world/common/enemy/HurtPlant.inc.c similarity index 97% rename from src/world/common/enemy/complete/HurtPlant.inc.c rename to src/world/common/enemy/HurtPlant.inc.c index 3d4ea93a7e..b3a102779a 100644 --- a/src/world/common/enemy/complete/HurtPlant.inc.c +++ b/src/world/common/enemy/HurtPlant.inc.c @@ -58,12 +58,12 @@ NpcSettings N(NpcSettings_HurtPlant) = { .onDefeat = &N(EVS_NpcDefeat_HurtPlant), }; -s32 N(ExtraAnims_HurtPlant)[] = { +AnimID N(ExtraAnims_HurtPlant)[] = { ANIM_HurtPlant_Anim00, ANIM_HurtPlant_Anim01, ANIM_HurtPlant_Anim02, ANIM_HurtPlant_Anim08, - -1 + ANIM_LIST_END }; #define HURT_PLANT_NPC_DATA \ diff --git a/src/world/common/enemy/complete/HyperCleft.h b/src/world/common/enemy/HyperCleft.h similarity index 100% rename from src/world/common/enemy/complete/HyperCleft.h rename to src/world/common/enemy/HyperCleft.h diff --git a/src/world/common/enemy/complete/HyperCleft.inc.c b/src/world/common/enemy/HyperCleft.inc.c similarity index 100% rename from src/world/common/enemy/complete/HyperCleft.inc.c rename to src/world/common/enemy/HyperCleft.inc.c diff --git a/src/world/common/enemy/complete/HyperGoomba.h b/src/world/common/enemy/HyperGoomba.h similarity index 100% rename from src/world/common/enemy/complete/HyperGoomba.h rename to src/world/common/enemy/HyperGoomba.h diff --git a/src/world/common/enemy/complete/HyperGoomba_Patrol.inc.c b/src/world/common/enemy/HyperGoomba_Patrol.inc.c similarity index 100% rename from src/world/common/enemy/complete/HyperGoomba_Patrol.inc.c rename to src/world/common/enemy/HyperGoomba_Patrol.inc.c diff --git a/src/world/common/enemy/complete/HyperGoomba_Wander.inc.c b/src/world/common/enemy/HyperGoomba_Wander.inc.c similarity index 100% rename from src/world/common/enemy/complete/HyperGoomba_Wander.inc.c rename to src/world/common/enemy/HyperGoomba_Wander.inc.c diff --git a/src/world/common/enemy/complete/HyperParagoomba.h b/src/world/common/enemy/HyperParagoomba.h similarity index 100% rename from src/world/common/enemy/complete/HyperParagoomba.h rename to src/world/common/enemy/HyperParagoomba.h diff --git a/src/world/common/enemy/complete/HyperParagoomba.inc.c b/src/world/common/enemy/HyperParagoomba.inc.c similarity index 100% rename from src/world/common/enemy/complete/HyperParagoomba.inc.c rename to src/world/common/enemy/HyperParagoomba.inc.c diff --git a/src/world/common/enemy/complete/JungleFuzzy.h b/src/world/common/enemy/JungleFuzzy.h similarity index 100% rename from src/world/common/enemy/complete/JungleFuzzy.h rename to src/world/common/enemy/JungleFuzzy.h diff --git a/src/world/common/enemy/complete/JungleFuzzy.inc.c b/src/world/common/enemy/JungleFuzzy.inc.c similarity index 100% rename from src/world/common/enemy/complete/JungleFuzzy.inc.c rename to src/world/common/enemy/JungleFuzzy.inc.c diff --git a/src/world/common/enemy/complete/JungleFuzzy_Wander.inc.c b/src/world/common/enemy/JungleFuzzy_Wander.inc.c similarity index 100% rename from src/world/common/enemy/complete/JungleFuzzy_Wander.inc.c rename to src/world/common/enemy/JungleFuzzy_Wander.inc.c diff --git a/src/world/common/enemy/complete/Kammy.h b/src/world/common/enemy/Kammy.h similarity index 100% rename from src/world/common/enemy/complete/Kammy.h rename to src/world/common/enemy/Kammy.h diff --git a/src/world/common/enemy/complete/Kammy.inc.c b/src/world/common/enemy/Kammy.inc.c similarity index 79% rename from src/world/common/enemy/complete/Kammy.inc.c rename to src/world/common/enemy/Kammy.inc.c index 15ec37d4fd..513ebff645 100644 --- a/src/world/common/enemy/complete/Kammy.inc.c +++ b/src/world/common/enemy/Kammy.inc.c @@ -1,8 +1,8 @@ #include "Kammy.h" NpcSettings N(NpcSettings_Kammy) = { - .height = 34, - .radius = 24, + .height = 40, + .radius = 30, .level = 26, .onHit = &EnemyNpcHit, .onDefeat = &EnemyNpcDefeat, diff --git a/src/world/common/enemy/Kammy_Flying.inc.c b/src/world/common/enemy/Kammy_Flying.inc.c new file mode 100644 index 0000000000..c0ff46f80a --- /dev/null +++ b/src/world/common/enemy/Kammy_Flying.inc.c @@ -0,0 +1,9 @@ +#include "Kammy.h" + +NpcSettings N(NpcSettings_Kammy_Flying) = { + .height = 34, + .radius = 24, + .level = 26, + .onHit = &EnemyNpcHit, + .onDefeat = &EnemyNpcDefeat, +}; diff --git a/src/world/common/enemy/Kammy_Guard.inc.c b/src/world/common/enemy/Kammy_Guard.inc.c new file mode 100644 index 0000000000..38988e7930 --- /dev/null +++ b/src/world/common/enemy/Kammy_Guard.inc.c @@ -0,0 +1,26 @@ +#include "Kammy.h" + +// odd enemy template used in kmr_02 for flying kammy + +#include "world/common/enemy/ai/GuardAI.inc.c" + +GuardAISettings N(AISettings_Kammy_Guard) = { + .playerSearchInterval = -1, + .chaseRadius = 300.0f, + .unk_AI_20 = 30, +}; + +EvtScript N(EVS_NpcAI_Kammy_Guard) = { + EVT_CALL(N(GuardAI_Main), EVT_PTR(N(AISettings_Kammy_Guard))) + EVT_RETURN + EVT_END +}; + +NpcSettings N(NpcSettings_Kammy_Guard) = { + .height = 40, + .radius = 30, + .level = 26, + .ai = &N(EVS_NpcAI_Kammy_Guard), + .onHit = &EnemyNpcHit, + .onDefeat = &EnemyNpcDefeat, +}; diff --git a/src/world/common/enemy/complete/KentCKoopa.h b/src/world/common/enemy/KentCKoopa.h similarity index 84% rename from src/world/common/enemy/complete/KentCKoopa.h rename to src/world/common/enemy/KentCKoopa.h index 9f1f7d85d9..f15578337d 100644 --- a/src/world/common/enemy/complete/KentCKoopa.h +++ b/src/world/common/enemy/KentCKoopa.h @@ -1,13 +1,6 @@ #include "common.h" #include "sprite/npc/KentCKoopa.h" -#define KENT_C_KOOPA_DROPS \ -{ \ - .dropFlags = NPC_DROP_FLAG_80, \ - .heartDrops = NO_DROPS, \ - .flowerDrops = NO_DROPS, \ -} - #define KENT_C_KOOPA_ANIMS \ { \ .idle = ANIM_KentCKoopa_Anim01, \ diff --git a/src/world/common/enemy/complete/KentCKoopa.inc.c b/src/world/common/enemy/KentCKoopa.inc.c similarity index 100% rename from src/world/common/enemy/complete/KentCKoopa.inc.c rename to src/world/common/enemy/KentCKoopa.inc.c diff --git a/src/world/common/enemy/complete/KoopaTroopa.h b/src/world/common/enemy/KoopaTroopa.h similarity index 100% rename from src/world/common/enemy/complete/KoopaTroopa.h rename to src/world/common/enemy/KoopaTroopa.h diff --git a/src/world/common/enemy/complete/KoopaTroopa_Patrol.inc.c b/src/world/common/enemy/KoopaTroopa_Patrol.inc.c similarity index 100% rename from src/world/common/enemy/complete/KoopaTroopa_Patrol.inc.c rename to src/world/common/enemy/KoopaTroopa_Patrol.inc.c diff --git a/src/world/common/enemy/complete/KoopaTroopa_Stationary.inc.c b/src/world/common/enemy/KoopaTroopa_Stationary.inc.c similarity index 100% rename from src/world/common/enemy/complete/KoopaTroopa_Stationary.inc.c rename to src/world/common/enemy/KoopaTroopa_Stationary.inc.c diff --git a/src/world/common/enemy/complete/KoopaTroopa_Wander.inc.c b/src/world/common/enemy/KoopaTroopa_Wander.inc.c similarity index 100% rename from src/world/common/enemy/complete/KoopaTroopa_Wander.inc.c rename to src/world/common/enemy/KoopaTroopa_Wander.inc.c diff --git a/src/world/common/enemy/complete/Koopatrol.h b/src/world/common/enemy/Koopatrol.h similarity index 89% rename from src/world/common/enemy/complete/Koopatrol.h rename to src/world/common/enemy/Koopatrol.h index 066f6821c8..9de3203582 100644 --- a/src/world/common/enemy/complete/Koopatrol.h +++ b/src/world/common/enemy/Koopatrol.h @@ -14,13 +14,6 @@ .maxCoinBonus = 3, \ } -#define KOOPATROL_NO_DROPS \ -{ \ - .dropFlags = NPC_DROP_FLAG_80, \ - .heartDrops = NO_DROPS, \ - .flowerDrops = NO_DROPS, \ -} - #define KOOPATROL_ANIMS \ { \ .idle = ANIM_WorldKoopatrol_Anim01, \ diff --git a/src/world/common/enemy/complete/Koopatrol_Patrol.inc.c b/src/world/common/enemy/Koopatrol_Patrol.inc.c similarity index 100% rename from src/world/common/enemy/complete/Koopatrol_Patrol.inc.c rename to src/world/common/enemy/Koopatrol_Patrol.inc.c diff --git a/src/world/common/enemy/complete/Koopatrol_Stationary.inc.c b/src/world/common/enemy/Koopatrol_Stationary.inc.c similarity index 100% rename from src/world/common/enemy/complete/Koopatrol_Stationary.inc.c rename to src/world/common/enemy/Koopatrol_Stationary.inc.c diff --git a/src/world/common/enemy/complete/Koopatrol_Wander.inc.c b/src/world/common/enemy/Koopatrol_Wander.inc.c similarity index 100% rename from src/world/common/enemy/complete/Koopatrol_Wander.inc.c rename to src/world/common/enemy/Koopatrol_Wander.inc.c diff --git a/src/world/common/enemy/complete/Lakitu.h b/src/world/common/enemy/Lakitu.h similarity index 100% rename from src/world/common/enemy/complete/Lakitu.h rename to src/world/common/enemy/Lakitu.h diff --git a/src/world/common/enemy/complete/Lakitu_SpinySpawner.inc.c b/src/world/common/enemy/Lakitu_SpinySpawner.inc.c similarity index 100% rename from src/world/common/enemy/complete/Lakitu_SpinySpawner.inc.c rename to src/world/common/enemy/Lakitu_SpinySpawner.inc.c diff --git a/src/world/common/enemy/complete/Lakitu_Stationary.inc.c b/src/world/common/enemy/Lakitu_Stationary.inc.c similarity index 100% rename from src/world/common/enemy/complete/Lakitu_Stationary.inc.c rename to src/world/common/enemy/Lakitu_Stationary.inc.c diff --git a/src/world/common/enemy/complete/LavaBubble.h b/src/world/common/enemy/LavaBubble.h similarity index 100% rename from src/world/common/enemy/complete/LavaBubble.h rename to src/world/common/enemy/LavaBubble.h diff --git a/src/world/common/enemy/complete/LavaBubble.inc.c b/src/world/common/enemy/LavaBubble.inc.c similarity index 100% rename from src/world/common/enemy/complete/LavaBubble.inc.c rename to src/world/common/enemy/LavaBubble.inc.c diff --git a/src/world/common/enemy/complete/LavaPiranha.h b/src/world/common/enemy/LavaPiranha.h similarity index 92% rename from src/world/common/enemy/complete/LavaPiranha.h rename to src/world/common/enemy/LavaPiranha.h index 41a04eaa05..95338ab584 100644 --- a/src/world/common/enemy/complete/LavaPiranha.h +++ b/src/world/common/enemy/LavaPiranha.h @@ -15,13 +15,6 @@ .maxCoinBonus = 3, \ } -#define LAVA_PIRANHA_NO_DROPS \ -{ \ - .dropFlags = NPC_DROP_FLAG_80, \ - .heartDrops = NO_DROPS, \ - .flowerDrops = NO_DROPS, \ -} - #define LAVA_PIRANHA_HEAD_ANIMS \ { \ .idle = ANIM_LavaPiranha_Anim03, \ diff --git a/src/world/common/enemy/complete/LavaPiranha.inc.c b/src/world/common/enemy/LavaPiranha.inc.c similarity index 100% rename from src/world/common/enemy/complete/LavaPiranha.inc.c rename to src/world/common/enemy/LavaPiranha.inc.c diff --git a/src/world/common/enemy/complete/MBush.h b/src/world/common/enemy/MBush.h similarity index 100% rename from src/world/common/enemy/complete/MBush.h rename to src/world/common/enemy/MBush.h diff --git a/src/world/common/enemy/complete/MBush.inc.c b/src/world/common/enemy/MBush.inc.c similarity index 100% rename from src/world/common/enemy/complete/MBush.inc.c rename to src/world/common/enemy/MBush.inc.c diff --git a/src/world/common/enemy/complete/Magikoopa.h b/src/world/common/enemy/Magikoopa.h similarity index 92% rename from src/world/common/enemy/complete/Magikoopa.h rename to src/world/common/enemy/Magikoopa.h index 4bd3eea43a..37708c1424 100644 --- a/src/world/common/enemy/complete/Magikoopa.h +++ b/src/world/common/enemy/Magikoopa.h @@ -2,7 +2,7 @@ #include "sprite/npc/Magikoopa.h" #include "sprite/npc/FlyingMagikoopa.h" -#define MAGIKOOPA_DROPS \ +#define MAGINO_DROPS \ { \ .dropFlags = NPC_DROP_FLAG_80, \ .itemDropChance = 5, \ @@ -45,11 +45,7 @@ .pos = { NPC_DISPOSE_LOCATION }, \ .yaw = 90, \ .flags = ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_NO_DROPS, \ - .drops = { \ - .dropFlags = NPC_DROP_FLAG_80, \ - .heartDrops = NO_DROPS, \ - .flowerDrops = NO_DROPS, \ - }, \ + .drops = NO_DROPS, \ .animations = { \ .idle = ANIM_Magikoopa_Anim00, \ .walk = ANIM_Magikoopa_Anim00, \ diff --git a/src/world/common/enemy/complete/Magikoopa.inc.c b/src/world/common/enemy/Magikoopa.inc.c similarity index 98% rename from src/world/common/enemy/complete/Magikoopa.inc.c rename to src/world/common/enemy/Magikoopa.inc.c index c1a660213f..0f5b448946 100644 --- a/src/world/common/enemy/complete/Magikoopa.inc.c +++ b/src/world/common/enemy/Magikoopa.inc.c @@ -73,7 +73,7 @@ NpcSettings N(NpcSettings_Magikoopa) = { .onDefeat = &N(EVS_NpcDefeat_Magikoopa), }; -s32 N(ExtraAnims_Magikoopa)[] = { +AnimID N(ExtraAnims_Magikoopa)[] = { ANIM_Magikoopa_Anim00, ANIM_Magikoopa_Anim01, ANIM_Magikoopa_Anim01, @@ -81,7 +81,7 @@ s32 N(ExtraAnims_Magikoopa)[] = { ANIM_Magikoopa_Anim02, ANIM_Magikoopa_Anim03, ANIM_Magikoopa_Anim04, - -1 + ANIM_LIST_END }; EvtScript N(EVS_NpcAuxAI_Magikoopa_GroundHitbox) = { diff --git a/src/world/common/enemy/complete/MontyMole.h b/src/world/common/enemy/MontyMole.h similarity index 100% rename from src/world/common/enemy/complete/MontyMole.h rename to src/world/common/enemy/MontyMole.h diff --git a/src/world/common/enemy/complete/MontyMole.inc.c b/src/world/common/enemy/MontyMole.inc.c similarity index 100% rename from src/world/common/enemy/complete/MontyMole.inc.c rename to src/world/common/enemy/MontyMole.inc.c diff --git a/src/world/common/enemy/complete/MontyMole_GroundAmbush.inc.c b/src/world/common/enemy/MontyMole_GroundAmbush.inc.c similarity index 100% rename from src/world/common/enemy/complete/MontyMole_GroundAmbush.inc.c rename to src/world/common/enemy/MontyMole_GroundAmbush.inc.c diff --git a/src/world/common/enemy/complete/MontyMole_StoneThrower.inc.c b/src/world/common/enemy/MontyMole_StoneThrower.inc.c similarity index 97% rename from src/world/common/enemy/complete/MontyMole_StoneThrower.inc.c rename to src/world/common/enemy/MontyMole_StoneThrower.inc.c index 379555e13d..7e71669951 100644 --- a/src/world/common/enemy/complete/MontyMole_StoneThrower.inc.c +++ b/src/world/common/enemy/MontyMole_StoneThrower.inc.c @@ -126,11 +126,7 @@ NpcSettings N(NpcSettings_MontyMole_Stone) = { .pos = { NPC_DISPOSE_LOCATION }, \ .yaw = 90, \ .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_NO_DROPS, \ - .drops = { \ - .dropFlags = NPC_DROP_FLAG_80, \ - .heartDrops = NO_DROPS, \ - .flowerDrops = NO_DROPS, \ - }, \ + .drops = NO_DROPS, \ .territory = { \ .wander = { \ .isFlying = TRUE, \ diff --git a/src/world/common/enemy/complete/MontyMole_WallAmbush.inc.c b/src/world/common/enemy/MontyMole_WallAmbush.inc.c similarity index 100% rename from src/world/common/enemy/complete/MontyMole_WallAmbush.inc.c rename to src/world/common/enemy/MontyMole_WallAmbush.inc.c diff --git a/src/world/common/enemy/complete/Paragloomba.h b/src/world/common/enemy/Paragloomba.h similarity index 100% rename from src/world/common/enemy/complete/Paragloomba.h rename to src/world/common/enemy/Paragloomba.h diff --git a/src/world/common/enemy/complete/Paragloomba_Wander.inc.c b/src/world/common/enemy/Paragloomba_Wander.inc.c similarity index 100% rename from src/world/common/enemy/complete/Paragloomba_Wander.inc.c rename to src/world/common/enemy/Paragloomba_Wander.inc.c diff --git a/src/world/common/enemy/complete/Paragoomba.h b/src/world/common/enemy/Paragoomba.h similarity index 100% rename from src/world/common/enemy/complete/Paragoomba.h rename to src/world/common/enemy/Paragoomba.h diff --git a/src/world/common/enemy/complete/Paragoomba_Wander.inc.c b/src/world/common/enemy/Paragoomba_Wander.inc.c similarity index 100% rename from src/world/common/enemy/complete/Paragoomba_Wander.inc.c rename to src/world/common/enemy/Paragoomba_Wander.inc.c diff --git a/src/world/common/enemy/complete/Paratroopa.h b/src/world/common/enemy/Paratroopa.h similarity index 100% rename from src/world/common/enemy/complete/Paratroopa.h rename to src/world/common/enemy/Paratroopa.h diff --git a/src/world/common/enemy/complete/Paratroopa.inc.c b/src/world/common/enemy/Paratroopa.inc.c similarity index 100% rename from src/world/common/enemy/complete/Paratroopa.inc.c rename to src/world/common/enemy/Paratroopa.inc.c diff --git a/src/world/common/enemy/complete/PiranhaPlant.h b/src/world/common/enemy/PiranhaPlant.h similarity index 93% rename from src/world/common/enemy/complete/PiranhaPlant.h rename to src/world/common/enemy/PiranhaPlant.h index fa105d5be3..347e422f0a 100644 --- a/src/world/common/enemy/complete/PiranhaPlant.h +++ b/src/world/common/enemy/PiranhaPlant.h @@ -41,11 +41,7 @@ .pos = { NPC_DISPOSE_LOCATION }, \ .yaw = 0, \ .flags = ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_NO_DROPS, \ - .drops = { \ - .dropFlags = NPC_DROP_FLAG_80, \ - .heartDrops = NO_DROPS, \ - .flowerDrops = NO_DROPS, \ - }, \ + .drops = NO_DROPS, \ .animations = { \ .idle = ANIM_SmallPiranha_Anim01, \ .walk = ANIM_SmallPiranha_Anim01, \ diff --git a/src/world/common/enemy/complete/PiranhaPlant.inc.c b/src/world/common/enemy/PiranhaPlant.inc.c similarity index 100% rename from src/world/common/enemy/complete/PiranhaPlant.inc.c rename to src/world/common/enemy/PiranhaPlant.inc.c diff --git a/src/world/common/enemy/complete/Pokey.h b/src/world/common/enemy/Pokey.h similarity index 100% rename from src/world/common/enemy/complete/Pokey.h rename to src/world/common/enemy/Pokey.h diff --git a/src/world/common/enemy/complete/Pokey.inc.c b/src/world/common/enemy/Pokey.inc.c similarity index 100% rename from src/world/common/enemy/complete/Pokey.inc.c rename to src/world/common/enemy/Pokey.inc.c diff --git a/src/world/common/enemy/complete/PokeyMummy.h b/src/world/common/enemy/PokeyMummy.h similarity index 100% rename from src/world/common/enemy/complete/PokeyMummy.h rename to src/world/common/enemy/PokeyMummy.h diff --git a/src/world/common/enemy/complete/PokeyMummy.inc.c b/src/world/common/enemy/PokeyMummy.inc.c similarity index 100% rename from src/world/common/enemy/complete/PokeyMummy.inc.c rename to src/world/common/enemy/PokeyMummy.inc.c diff --git a/src/world/common/enemy/complete/PutridPiranha.h b/src/world/common/enemy/PutridPiranha.h similarity index 92% rename from src/world/common/enemy/complete/PutridPiranha.h rename to src/world/common/enemy/PutridPiranha.h index 1764848948..c2997f608c 100644 --- a/src/world/common/enemy/complete/PutridPiranha.h +++ b/src/world/common/enemy/PutridPiranha.h @@ -42,10 +42,6 @@ .pos = { NPC_DISPOSE_LOCATION }, \ .yaw = 0, \ .flags = ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_NO_DROPS, \ - .drops = { \ - .dropFlags = NPC_DROP_FLAG_80, \ - .heartDrops = NO_DROPS, \ - .flowerDrops = NO_DROPS, \ - }, \ + .drops = NO_DROPS, \ .animations = PUTRID_PIRANHA_ANIMS, \ } diff --git a/src/world/common/enemy/complete/PutridPiranha.inc.c b/src/world/common/enemy/PutridPiranha.inc.c similarity index 100% rename from src/world/common/enemy/complete/PutridPiranha.inc.c rename to src/world/common/enemy/PutridPiranha.inc.c diff --git a/src/world/common/enemy/complete/PutridPiranhaSentinel.h b/src/world/common/enemy/PutridPiranhaSentinel.h similarity index 97% rename from src/world/common/enemy/complete/PutridPiranhaSentinel.h rename to src/world/common/enemy/PutridPiranhaSentinel.h index 343a764059..8343891eca 100644 --- a/src/world/common/enemy/complete/PutridPiranhaSentinel.h +++ b/src/world/common/enemy/PutridPiranhaSentinel.h @@ -1,7 +1,7 @@ #include "common.h" #include "sprite/npc/LargePiranha.h" -#define PIRANHA_SENTINEL_DROPS \ +#define PIRANHA_NO_DROPS \ { \ .dropFlags = NPC_DROP_FLAG_80, \ .itemDropChance = 5, \ diff --git a/src/world/common/enemy/complete/PutridPiranhaSentinel.inc.c b/src/world/common/enemy/PutridPiranhaSentinel.inc.c similarity index 100% rename from src/world/common/enemy/complete/PutridPiranhaSentinel.inc.c rename to src/world/common/enemy/PutridPiranhaSentinel.inc.c diff --git a/src/world/common/enemy/complete/PyroGuy.h b/src/world/common/enemy/PyroGuy.h similarity index 100% rename from src/world/common/enemy/complete/PyroGuy.h rename to src/world/common/enemy/PyroGuy.h diff --git a/src/world/common/enemy/complete/PyroGuy.inc.c b/src/world/common/enemy/PyroGuy.inc.c similarity index 100% rename from src/world/common/enemy/complete/PyroGuy.inc.c rename to src/world/common/enemy/PyroGuy.inc.c diff --git a/src/world/common/enemy/complete/Sentinel.h b/src/world/common/enemy/Sentinel.h similarity index 84% rename from src/world/common/enemy/complete/Sentinel.h rename to src/world/common/enemy/Sentinel.h index 38eb4e3f32..2e2b24f70b 100644 --- a/src/world/common/enemy/complete/Sentinel.h +++ b/src/world/common/enemy/Sentinel.h @@ -1,13 +1,6 @@ #include "common.h" #include "sprite/npc/Sentinel.h" -#define SENTINEL_DROPS \ -{ \ - .dropFlags = NPC_DROP_FLAG_80, \ - .heartDrops = NO_DROPS, \ - .flowerDrops = NO_DROPS, \ -} - #define SENTINEL_ANIMS \ { \ .idle = ANIM_Sentinel_Anim01, \ diff --git a/src/world/common/enemy/complete/Sentinel.inc.c b/src/world/common/enemy/Sentinel.inc.c similarity index 100% rename from src/world/common/enemy/complete/Sentinel.inc.c rename to src/world/common/enemy/Sentinel.inc.c diff --git a/src/world/common/enemy/complete/ShyGuy.h b/src/world/common/enemy/ShyGuy.h similarity index 98% rename from src/world/common/enemy/complete/ShyGuy.h rename to src/world/common/enemy/ShyGuy.h index ed79630293..340ce49b62 100644 --- a/src/world/common/enemy/complete/ShyGuy.h +++ b/src/world/common/enemy/ShyGuy.h @@ -1,13 +1,6 @@ #include "common.h" #include "sprite/npc/ShyGuy.h" -#define SHY_GUY_NO_DROPS \ -{ \ - .dropFlags = NPC_DROP_FLAG_80, \ - .heartDrops = NO_DROPS, \ - .flowerDrops = NO_DROPS, \ -} - #define SHY_GUY_DROPS \ { \ .dropFlags = NPC_DROP_FLAG_80, \ diff --git a/src/world/common/enemy/complete/ShyGuy_AvoidPlayer.inc.c b/src/world/common/enemy/ShyGuy_AvoidPlayer.inc.c similarity index 100% rename from src/world/common/enemy/complete/ShyGuy_AvoidPlayer.inc.c rename to src/world/common/enemy/ShyGuy_AvoidPlayer.inc.c diff --git a/src/world/common/enemy/complete/ShyGuy_Guard.inc.c b/src/world/common/enemy/ShyGuy_Guard.inc.c similarity index 100% rename from src/world/common/enemy/complete/ShyGuy_Guard.inc.c rename to src/world/common/enemy/ShyGuy_Guard.inc.c diff --git a/src/world/common/enemy/complete/ShyGuy_Patrol.inc.c b/src/world/common/enemy/ShyGuy_Patrol.inc.c similarity index 100% rename from src/world/common/enemy/complete/ShyGuy_Patrol.inc.c rename to src/world/common/enemy/ShyGuy_Patrol.inc.c diff --git a/src/world/common/enemy/complete/ShyGuy_Stationary.inc.c b/src/world/common/enemy/ShyGuy_Stationary.inc.c similarity index 100% rename from src/world/common/enemy/complete/ShyGuy_Stationary.inc.c rename to src/world/common/enemy/ShyGuy_Stationary.inc.c diff --git a/src/world/common/enemy/complete/ShyGuy_Wander.inc.c b/src/world/common/enemy/ShyGuy_Wander.inc.c similarity index 100% rename from src/world/common/enemy/complete/ShyGuy_Wander.inc.c rename to src/world/common/enemy/ShyGuy_Wander.inc.c diff --git a/src/world/common/enemy/complete/SkyGuy.h b/src/world/common/enemy/SkyGuy.h similarity index 100% rename from src/world/common/enemy/complete/SkyGuy.h rename to src/world/common/enemy/SkyGuy.h diff --git a/src/world/common/enemy/complete/SkyGuy.inc.c b/src/world/common/enemy/SkyGuy.inc.c similarity index 100% rename from src/world/common/enemy/complete/SkyGuy.inc.c rename to src/world/common/enemy/SkyGuy.inc.c diff --git a/src/world/common/enemy/complete/SpearGuy.h b/src/world/common/enemy/SpearGuy.h similarity index 97% rename from src/world/common/enemy/complete/SpearGuy.h rename to src/world/common/enemy/SpearGuy.h index af90f731fb..4eea35a90c 100644 --- a/src/world/common/enemy/complete/SpearGuy.h +++ b/src/world/common/enemy/SpearGuy.h @@ -41,7 +41,7 @@ .pos = { NPC_DISPOSE_LOCATION }, \ .yaw = 0, \ .flags = ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_NO_DROPS, \ - .drops = NPC_NO_DROPS, \ + .drops = NO_DROPS, \ .animations = SPEAR_GUY_ANIMS, \ .extraAnimations = N(ExtraAnims_SpearGuy_Hitbox), \ } diff --git a/src/world/common/enemy/complete/SpearGuy_Patrol.inc.c b/src/world/common/enemy/SpearGuy_Patrol.inc.c similarity index 100% rename from src/world/common/enemy/complete/SpearGuy_Patrol.inc.c rename to src/world/common/enemy/SpearGuy_Patrol.inc.c diff --git a/src/world/common/enemy/complete/SpearGuy_Wander.inc.c b/src/world/common/enemy/SpearGuy_Wander.inc.c similarity index 96% rename from src/world/common/enemy/complete/SpearGuy_Wander.inc.c rename to src/world/common/enemy/SpearGuy_Wander.inc.c index 5317f7d795..e3f7167a3b 100644 --- a/src/world/common/enemy/complete/SpearGuy_Wander.inc.c +++ b/src/world/common/enemy/SpearGuy_Wander.inc.c @@ -2,7 +2,7 @@ #include "world/common/enemy/ai/SpearGuyAI.inc.c" -s32 N(ExtraAnims_SpearGuy)[] = { +AnimID N(ExtraAnims_SpearGuy)[] = { ANIM_SpearGuy_Anim00, ANIM_SpearGuy_Anim03, ANIM_SpearGuy_Anim05, @@ -12,10 +12,10 @@ s32 N(ExtraAnims_SpearGuy)[] = { ANIM_SpearGuy_Anim10, ANIM_SpearGuy_Anim1A, ANIM_SpearGuy_Anim1B, - -1, + ANIM_LIST_END }; -s32 N(ExtraAnims_SpearGuy_Hitbox)[] = { +AnimID N(ExtraAnims_SpearGuy_Hitbox)[] = { ANIM_SpearGuy_Anim00, -1, }; diff --git a/src/world/common/enemy/complete/SpikeTop.h b/src/world/common/enemy/SpikeTop.h similarity index 100% rename from src/world/common/enemy/complete/SpikeTop.h rename to src/world/common/enemy/SpikeTop.h diff --git a/src/world/common/enemy/complete/SpikeTop.inc.c b/src/world/common/enemy/SpikeTop.inc.c similarity index 100% rename from src/world/common/enemy/complete/SpikeTop.inc.c rename to src/world/common/enemy/SpikeTop.inc.c diff --git a/src/world/common/enemy/complete/SpikedGloomba.h b/src/world/common/enemy/SpikedGloomba.h similarity index 100% rename from src/world/common/enemy/complete/SpikedGloomba.h rename to src/world/common/enemy/SpikedGloomba.h diff --git a/src/world/common/enemy/complete/SpikedGloomba_Wander.inc.c b/src/world/common/enemy/SpikedGloomba_Wander.inc.c similarity index 100% rename from src/world/common/enemy/complete/SpikedGloomba_Wander.inc.c rename to src/world/common/enemy/SpikedGloomba_Wander.inc.c diff --git a/src/world/common/enemy/complete/SpikedGoomba.h b/src/world/common/enemy/SpikedGoomba.h similarity index 100% rename from src/world/common/enemy/complete/SpikedGoomba.h rename to src/world/common/enemy/SpikedGoomba.h diff --git a/src/world/common/enemy/complete/SpikedGoomba_Patrol.inc.c b/src/world/common/enemy/SpikedGoomba_Patrol.inc.c similarity index 100% rename from src/world/common/enemy/complete/SpikedGoomba_Patrol.inc.c rename to src/world/common/enemy/SpikedGoomba_Patrol.inc.c diff --git a/src/world/common/enemy/complete/SpikedGoomba_Wander.inc.c b/src/world/common/enemy/SpikedGoomba_Wander.inc.c similarity index 100% rename from src/world/common/enemy/complete/SpikedGoomba_Wander.inc.c rename to src/world/common/enemy/SpikedGoomba_Wander.inc.c diff --git a/src/world/common/enemy/complete/Spiny.h b/src/world/common/enemy/Spiny.h similarity index 100% rename from src/world/common/enemy/complete/Spiny.h rename to src/world/common/enemy/Spiny.h diff --git a/src/world/common/enemy/complete/Spiny.inc.c b/src/world/common/enemy/Spiny.inc.c similarity index 100% rename from src/world/common/enemy/complete/Spiny.inc.c rename to src/world/common/enemy/Spiny.inc.c diff --git a/src/world/common/enemy/complete/SpyGuy.h b/src/world/common/enemy/SpyGuy.h similarity index 98% rename from src/world/common/enemy/complete/SpyGuy.h rename to src/world/common/enemy/SpyGuy.h index d18f8afede..2ca82af5bf 100644 --- a/src/world/common/enemy/complete/SpyGuy.h +++ b/src/world/common/enemy/SpyGuy.h @@ -65,7 +65,7 @@ .pos = { NPC_DISPOSE_LOCATION }, \ .yaw = 90, \ .flags = ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_NO_DROPS, \ - .drops = NPC_NO_DROPS, \ + .drops = NO_DROPS, \ .territory = { \ .wander = { \ .isFlying = TRUE, \ diff --git a/src/world/common/enemy/complete/SpyGuy.inc.c b/src/world/common/enemy/SpyGuy.inc.c similarity index 100% rename from src/world/common/enemy/complete/SpyGuy.inc.c rename to src/world/common/enemy/SpyGuy.inc.c diff --git a/src/world/common/enemy/complete/StoneChomp.h b/src/world/common/enemy/StoneChomp.h similarity index 100% rename from src/world/common/enemy/complete/StoneChomp.h rename to src/world/common/enemy/StoneChomp.h diff --git a/src/world/common/enemy/complete/StoneChomp.inc.c b/src/world/common/enemy/StoneChomp.inc.c similarity index 100% rename from src/world/common/enemy/complete/StoneChomp.inc.c rename to src/world/common/enemy/StoneChomp.inc.c diff --git a/src/world/common/enemy/complete/Swooper.h b/src/world/common/enemy/Swooper.h similarity index 100% rename from src/world/common/enemy/complete/Swooper.h rename to src/world/common/enemy/Swooper.h diff --git a/src/world/common/enemy/complete/Swooper.inc.c b/src/world/common/enemy/Swooper.inc.c similarity index 100% rename from src/world/common/enemy/complete/Swooper.inc.c rename to src/world/common/enemy/Swooper.inc.c diff --git a/src/world/common/enemy/complete/TubbaBlubba.h b/src/world/common/enemy/TubbaBlubba.h similarity index 91% rename from src/world/common/enemy/complete/TubbaBlubba.h rename to src/world/common/enemy/TubbaBlubba.h index ac7aabcf62..46de75617e 100644 --- a/src/world/common/enemy/complete/TubbaBlubba.h +++ b/src/world/common/enemy/TubbaBlubba.h @@ -1,13 +1,6 @@ #include "common.h" #include "sprite/npc/WorldTubba.h" -#define TUBBA_DROPS \ -{ \ - .dropFlags = NPC_DROP_FLAG_80, \ - .heartDrops = NO_DROPS, \ - .flowerDrops = NO_DROPS, \ -} - #define TUBBA_ANIMS \ { \ .idle = ANIM_WorldTubba_Anim06, \ diff --git a/src/world/common/enemy/complete/TubbaBlubba.inc.c b/src/world/common/enemy/TubbaBlubba.inc.c similarity index 100% rename from src/world/common/enemy/complete/TubbaBlubba.inc.c rename to src/world/common/enemy/TubbaBlubba.inc.c diff --git a/src/world/common/enemy/complete/TubbaBlubba_Patrol.inc.c b/src/world/common/enemy/TubbaBlubba_Patrol.inc.c similarity index 100% rename from src/world/common/enemy/complete/TubbaBlubba_Patrol.inc.c rename to src/world/common/enemy/TubbaBlubba_Patrol.inc.c diff --git a/src/world/common/enemy/complete/TuffPuff.h b/src/world/common/enemy/TuffPuff.h similarity index 87% rename from src/world/common/enemy/complete/TuffPuff.h rename to src/world/common/enemy/TuffPuff.h index 7cbfe01abd..5bc60d9a89 100644 --- a/src/world/common/enemy/complete/TuffPuff.h +++ b/src/world/common/enemy/TuffPuff.h @@ -1,13 +1,6 @@ #include "common.h" #include "sprite/npc/TuffPuff.h" -#define TUFF_PUFF_NO_DROPS \ -{ \ - .dropFlags = NPC_DROP_FLAG_80, \ - .heartDrops = NO_DROPS, \ - .flowerDrops = NO_DROPS, \ -} - #define TUFF_PUFF_DROPS \ { \ .dropFlags = NPC_DROP_FLAG_80, \ diff --git a/src/world/common/enemy/complete/TuffPuff.inc.c b/src/world/common/enemy/TuffPuff.inc.c similarity index 100% rename from src/world/common/enemy/complete/TuffPuff.inc.c rename to src/world/common/enemy/TuffPuff.inc.c diff --git a/src/world/common/enemy/complete/Whacka.h b/src/world/common/enemy/Whacka.h similarity index 82% rename from src/world/common/enemy/complete/Whacka.h rename to src/world/common/enemy/Whacka.h index 5cf62e8b4e..89323e7b93 100644 --- a/src/world/common/enemy/complete/Whacka.h +++ b/src/world/common/enemy/Whacka.h @@ -1,13 +1,6 @@ #include "common.h" #include "sprite/npc/Whacka.h" -#define WHACKA_DROPS \ -{ \ - .dropFlags = NPC_DROP_FLAG_80, \ - .heartDrops = NO_DROPS, \ - .flowerDrops = NO_DROPS, \ -} - #define WHACKA_ANIMS \ { \ .idle = ANIM_Whacka_Idle, \ diff --git a/src/world/common/enemy/complete/Whacka.inc.c b/src/world/common/enemy/Whacka.inc.c similarity index 100% rename from src/world/common/enemy/complete/Whacka.inc.c rename to src/world/common/enemy/Whacka.inc.c diff --git a/src/world/common/enemy/complete/YMagikoopa.h b/src/world/common/enemy/YMagikoopa.h similarity index 98% rename from src/world/common/enemy/complete/YMagikoopa.h rename to src/world/common/enemy/YMagikoopa.h index 3ca3341e97..c23fef532d 100644 --- a/src/world/common/enemy/complete/YMagikoopa.h +++ b/src/world/common/enemy/YMagikoopa.h @@ -2,7 +2,7 @@ #include "sprite/npc/Magikoopa.h" #include "sprite/npc/FlyingMagikoopa.h" -#define MAGIKOOPA_DROPS \ +#define MAGINO_DROPS \ { \ .dropFlags = NPC_DROP_FLAG_80, \ .itemDropChance = 25, \ diff --git a/src/world/common/enemy/ai/AvoidPlayerAI.inc.c b/src/world/common/enemy/ai/AvoidPlayerAI.inc.c index 83ca890b48..ad55daee25 100644 --- a/src/world/common/enemy/ai/AvoidPlayerAI.inc.c +++ b/src/world/common/enemy/ai/AvoidPlayerAI.inc.c @@ -159,7 +159,7 @@ void N(AvoidPlayerAI_LosePlayer)(Evt* script, MobileAISettings* npcAISettings, E } } -ApiStatus N(AvoidPlayerAI_Main)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(AvoidPlayerAI_Main)) { #ifdef _DEAD_H_ DeadEnemy* enemy = (DeadEnemy*)script->owner1.enemy; #else diff --git a/src/world/common/enemy/ai/ClubbaNappingAI.inc.c b/src/world/common/enemy/ai/ClubbaNappingAI.inc.c index 3dcd4dd7de..83d3a53261 100644 --- a/src/world/common/enemy/ai/ClubbaNappingAI.inc.c +++ b/src/world/common/enemy/ai/ClubbaNappingAI.inc.c @@ -199,7 +199,7 @@ void N(ClubbaNappingAI_FallAsleep)(Evt* script, MobileAISettings* aiSettings, En } } -ApiStatus N(ClubbaNappingAI_Main)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(ClubbaNappingAI_Main)) { Enemy* enemy = script->owner1.enemy; Npc* npc = get_npc_unsafe(enemy->npcID); Bytecode* args = script->ptrReadPos; diff --git a/src/world/common/enemy/ai/ClubbaPatrolAI.inc.c b/src/world/common/enemy/ai/ClubbaPatrolAI.inc.c index 54cf06c62a..1df9f42c74 100644 --- a/src/world/common/enemy/ai/ClubbaPatrolAI.inc.c +++ b/src/world/common/enemy/ai/ClubbaPatrolAI.inc.c @@ -5,7 +5,7 @@ #include "world/common/enemy/ai/MeleeHitbox.inc.c" #include "world/common/enemy/ai/States_PatrolAI.inc.c" -ApiStatus N(ClubbaPatrolAI_Main)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(ClubbaPatrolAI_Main)) { Enemy* enemy = script->owner1.enemy; Npc* npc = get_npc_unsafe(enemy->npcID); Bytecode* args = script->ptrReadPos; diff --git a/src/world/common/enemy/ai/FireBarAI.inc.c b/src/world/common/enemy/ai/FireBarAI.inc.c index bdd6f9a91e..5a2a475791 100644 --- a/src/world/common/enemy/ai/FireBarAI.inc.c +++ b/src/world/common/enemy/ai/FireBarAI.inc.c @@ -13,7 +13,7 @@ enum { FIRE_BAR_HIT = 2, }; -ApiStatus N(FireBarAI_Main)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(FireBarAI_Main)) { PlayerStatus* playerStatus = &gPlayerStatus; PartnerActionStatus* partnerActionStatus = &gPartnerActionStatus; Bytecode* args = script->ptrReadPos; diff --git a/src/world/common/enemy/ai/FlyingAI.inc.c b/src/world/common/enemy/ai/FlyingAI.inc.c index fdd02d234c..d9a937c9d2 100644 --- a/src/world/common/enemy/ai/FlyingAI.inc.c +++ b/src/world/common/enemy/ai/FlyingAI.inc.c @@ -434,7 +434,7 @@ void N(FlyingAI_Init)(Npc* npc, Enemy* enemy, Evt* script, MobileAISettings* aiS enemy->aiFlags |= ENEMY_AI_FLAG_10; } -ApiStatus N(FlyingAI_Main)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(FlyingAI_Main)) { #ifdef _DEAD_H_ DeadEnemy* enemy = (DeadEnemy*)script->owner1.enemy; #else diff --git a/src/world/common/enemy/ai/FlyingMagikoopaAI.inc.c b/src/world/common/enemy/ai/FlyingMagikoopaAI.inc.c index a369a569f4..2f0e9d1aa6 100644 --- a/src/world/common/enemy/ai/FlyingMagikoopaAI.inc.c +++ b/src/world/common/enemy/ai/FlyingMagikoopaAI.inc.c @@ -276,7 +276,7 @@ void N(FlyingMagikoopaAI_50)(Evt* script, MobileAISettings* aiSettings, EnemyDet } } -ApiStatus N(FlyingMagikoopaAI_Main)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(FlyingMagikoopaAI_Main)) { Bytecode* args = script->ptrReadPos; Enemy* enemy = script->owner1.enemy; Npc* npc = get_npc_unsafe(enemy->npcID); @@ -358,14 +358,14 @@ ApiStatus N(FlyingMagikoopaAI_Main)(Evt* script, s32 isInitialCall) { return ApiStatus_BLOCK; } -ApiStatus N(FlyingMagikoopaAI_OnHitInit)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(FlyingMagikoopaAI_OnHitInit)) { Enemy* enemy = script->owner1.enemy; evt_set_variable(script, LVar0, gCurrentEncounter.currentEnemy == enemy); return ApiStatus_DONE2; } -ApiStatus N(FlyingMagikoopaAI_OnHit)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(FlyingMagikoopaAI_OnHit)) { Enemy* enemy = script->owner1.enemy; Npc* npc = get_npc_unsafe(enemy->npcID); diff --git a/src/world/common/enemy/ai/FlyingNoAttackAI.inc.c b/src/world/common/enemy/ai/FlyingNoAttackAI.inc.c index 64b1c1d0d4..754e959354 100644 --- a/src/world/common/enemy/ai/FlyingNoAttackAI.inc.c +++ b/src/world/common/enemy/ai/FlyingNoAttackAI.inc.c @@ -94,7 +94,7 @@ void N(FlyingNoAttackAI_20)(Evt* script, MobileAISettings* aiSettings, EnemyDete } } -ApiStatus N(FlyingNoAttackAI_Main)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(FlyingNoAttackAI_Main)) { #ifdef _DEAD_H_ DeadEnemy* enemy = (DeadEnemy*)script->owner1.enemy; #else diff --git a/src/world/common/enemy/ai/GrooveGuyAI.inc.c b/src/world/common/enemy/ai/GrooveGuyAI.inc.c index 943af540d4..502a188a07 100644 --- a/src/world/common/enemy/ai/GrooveGuyAI.inc.c +++ b/src/world/common/enemy/ai/GrooveGuyAI.inc.c @@ -65,7 +65,7 @@ void N(GrooveGuyAI_03)(Evt* script, MobileAISettings* aiSettings, EnemyDetectVol } } -ApiStatus N(GrooveGuyAI_Main)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(GrooveGuyAI_Main)) { Enemy* enemy = script->owner1.enemy; Npc* npc = get_npc_unsafe(enemy->npcID); EnemyDetectVolume territory; diff --git a/src/world/common/enemy/ai/GuardAI.inc.c b/src/world/common/enemy/ai/GuardAI.inc.c index 793f7e2233..7dcae0af43 100644 --- a/src/world/common/enemy/ai/GuardAI.inc.c +++ b/src/world/common/enemy/ai/GuardAI.inc.c @@ -1,3 +1,6 @@ +#ifndef _AI_GUARD_H_ +#define _AI_GUARD_H_ + // Used in: // - kmr_02 Toad // - kmr_07 GoombaBros @@ -185,7 +188,7 @@ void N(GuardAI_ReturnHome)(Evt* script, GuardAISettings* aiSettings, EnemyDetect } } -ApiStatus N(GuardAI_Main)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(GuardAI_Main)) { Bytecode* args = script->ptrReadPos; Enemy* enemy = script->owner1.enemy; Npc* npc = get_npc_unsafe(enemy->npcID); @@ -262,3 +265,5 @@ ApiStatus N(GuardAI_Main)(Evt* script, s32 isInitialCall) { } return ApiStatus_BLOCK; } + +#endif diff --git a/src/world/common/enemy/ai/HoppingAI.inc.c b/src/world/common/enemy/ai/HoppingAI.inc.c index 7fd2de194a..329af9c57f 100644 --- a/src/world/common/enemy/ai/HoppingAI.inc.c +++ b/src/world/common/enemy/ai/HoppingAI.inc.c @@ -218,7 +218,7 @@ void N(HoppingAI_LosePlayer)(Evt* script, MobileAISettings* aiSettings, EnemyDet } } -ApiStatus N(HoppingAI_Main)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(HoppingAI_Main)) { Enemy* enemy = script->owner1.enemy; Bytecode* args = script->ptrReadPos; Npc* npc = get_npc_unsafe(enemy->npcID); diff --git a/src/world/common/enemy/ai/KoopaPatrolAI.inc.c b/src/world/common/enemy/ai/KoopaPatrolAI.inc.c index 9ceb760558..bc8edf2f31 100644 --- a/src/world/common/enemy/ai/KoopaPatrolAI.inc.c +++ b/src/world/common/enemy/ai/KoopaPatrolAI.inc.c @@ -6,7 +6,7 @@ #include "world/common/enemy/ai/States_TackleAI.inc.c" -ApiStatus N(KoopaPatrolAI_Main)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(KoopaPatrolAI_Main)) { Enemy* enemy = script->owner1.enemy; Npc* npc = get_npc_unsafe(enemy->npcID); Bytecode* args = script->ptrReadPos; diff --git a/src/world/common/enemy/ai/MagikoopaAI.inc.c b/src/world/common/enemy/ai/MagikoopaAI.inc.c index 42e120964f..affb76b6ee 100644 --- a/src/world/common/enemy/ai/MagikoopaAI.inc.c +++ b/src/world/common/enemy/ai/MagikoopaAI.inc.c @@ -227,7 +227,7 @@ void N(MagikoopaAI_24)(Evt* script, MobileAISettings* aiSettings, EnemyDetectVol } } -ApiStatus N(MagikoopaAI_Main)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(MagikoopaAI_Main)) { Enemy* enemy = script->owner1.enemy; Npc* npc = get_npc_unsafe(enemy->npcID); EnemyDetectVolume territory; @@ -306,7 +306,7 @@ ApiStatus N(MagikoopaAI_Main)(Evt* script, s32 isInitialCall) { return ApiStatus_BLOCK; } -ApiStatus N(MagikoopaAI_OnPlayerWon)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(MagikoopaAI_OnPlayerWon)) { Enemy* enemy = script->owner1.enemy; Npc* npc = get_npc_unsafe(enemy->npcID); @@ -315,7 +315,7 @@ ApiStatus N(MagikoopaAI_OnPlayerWon)(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -ApiStatus N(MagikoopaAI_OnPlayerFled)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(MagikoopaAI_OnPlayerFled)) { Enemy* enemy = script->owner1.enemy; Npc* npc = get_npc_unsafe(enemy->npcID); @@ -326,14 +326,14 @@ ApiStatus N(MagikoopaAI_OnPlayerFled)(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -ApiStatus N(MagikoopaAI_OnHitInit)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(MagikoopaAI_OnHitInit)) { Enemy* enemy = script->owner1.enemy; evt_set_variable(script, LVar0, gCurrentEncounter.currentEnemy == enemy); return ApiStatus_DONE2; } -ApiStatus N(MagikoopaAI_OnHit)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(MagikoopaAI_OnHit)) { Enemy* enemy = script->owner1.enemy; Npc* npc = get_npc_unsafe(enemy->npcID); diff --git a/src/world/common/enemy/ai/MagikoopaSpellAI.inc.c b/src/world/common/enemy/ai/MagikoopaSpellAI.inc.c index 3a15fd2ab9..01ebe562f0 100644 --- a/src/world/common/enemy/ai/MagikoopaSpellAI.inc.c +++ b/src/world/common/enemy/ai/MagikoopaSpellAI.inc.c @@ -38,7 +38,7 @@ s32 N(MagikoopaAI_CanShootSpell)(Evt* script, f32 arg1, f32 arg2, EnemyDetectVol return -1; } -ApiStatus N(MagikoopaAI_SpellMain)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(MagikoopaAI_SpellMain)) { Enemy* enemy = script->owner1.enemy; Npc sp20; Npc* sp20Ptr = &sp20; @@ -66,9 +66,9 @@ ApiStatus N(MagikoopaAI_SpellMain)(Evt* script, s32 isInitialCall) { enemy->varTable[3] = NULL; npc1->collisionRadius = 20; npc1->collisionHeight = 20; - npc1->pos.x = 0.0f; - npc1->pos.z = 0.0f; - npc1->pos.y = -1000.0f; + npc1->pos.x = NPC_DISPOSE_POS_X; + npc1->pos.y = NPC_DISPOSE_POS_Y; + npc1->pos.z = NPC_DISPOSE_POS_Z; enemy->varTable[0] = 0; script->functionTemp[0] = 1; /* fallthrough */ @@ -134,11 +134,11 @@ ApiStatus N(MagikoopaAI_SpellMain)(Evt* script, s32 isInitialCall) { npc1->collisionRadius = ((f32) npc1->duration * 7.0) + 20.0; npc1->collisionHeight = ((f32) npc1->duration * 7.0) + 20.0; } else if (npc1->duration == 7) { - npc1->pos.x = 0.0f; - npc1->pos.z = 0.0f; + npc1->pos.x = NPC_DISPOSE_POS_X; + npc1->pos.y = NPC_DISPOSE_POS_Y; + npc1->pos.z = NPC_DISPOSE_POS_Z; npc1->collisionRadius = 20; npc1->collisionHeight = 20; - npc1->pos.y = -1000.0f; } else if (npc1->duration >= 16) { enemy->varTable[0] = 0; script->functionTemp[0] = 0; diff --git a/src/world/common/enemy/ai/MeleeHitbox.inc.c b/src/world/common/enemy/ai/MeleeHitbox.inc.c index 3d7e12c84b..5dae1672c6 100644 --- a/src/world/common/enemy/ai/MeleeHitbox.inc.c +++ b/src/world/common/enemy/ai/MeleeHitbox.inc.c @@ -101,7 +101,7 @@ s32 N(MeleeHitbox_CanSeePlayer)(Evt* script) { return ret; } -ApiStatus N(MeleeHitbox_Main)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(MeleeHitbox_Main)) { #ifdef _DEAD_H_ DeadEnemy* hitboxEnemy = (DeadEnemy*)script->owner1.enemy; #else @@ -170,9 +170,9 @@ ApiStatus N(MeleeHitbox_Main)(Evt* script, s32 isInitialCall) { } if (baseEnemy->AI_VAR_ATTACK_STATE == MELEE_HITBOX_STATE_POST) { hitboxEnemy->flags |= ENEMY_FLAG_100000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_8000000 | ENEMY_FLAG_10000000; - hitboxNpc->pos.x = 0.0f; - hitboxNpc->pos.y = -1000.0f; - hitboxNpc->pos.z = 0.0f; + hitboxNpc->pos.x = NPC_DISPOSE_POS_X; + hitboxNpc->pos.y = NPC_DISPOSE_POS_Y; + hitboxNpc->pos.z = NPC_DISPOSE_POS_Z; hitboxEnemy->unk_07 = 1; script->functionTemp[0] = 0; } diff --git a/src/world/common/enemy/ai/MontyMoleAI.inc.c b/src/world/common/enemy/ai/MontyMoleAI.inc.c index cffbd3d293..1b780cfb23 100644 --- a/src/world/common/enemy/ai/MontyMoleAI.inc.c +++ b/src/world/common/enemy/ai/MontyMoleAI.inc.c @@ -225,7 +225,7 @@ static void N(MontyMoleAI_Burrow)(Evt* script, MobileAISettings* aiSettings, Ene } } -ApiStatus N(MontyMoleAI_Main)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(MontyMoleAI_Main)) { Bytecode* args = script->ptrReadPos; Enemy* enemy = script->owner1.enemy; Npc* npc = get_npc_unsafe(enemy->npcID); diff --git a/src/world/common/enemy/ai/ParatroopaAI.inc.c b/src/world/common/enemy/ai/ParatroopaAI.inc.c index ec2ba569dc..de62a2f85c 100644 --- a/src/world/common/enemy/ai/ParatroopaAI.inc.c +++ b/src/world/common/enemy/ai/ParatroopaAI.inc.c @@ -96,7 +96,7 @@ void N(ParatroopaAI_Reset)(Evt* script, MobileAISettings* aiSettings, EnemyDetec } } -ApiStatus N(ParatroopaAI_Main)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(ParatroopaAI_Main)) { Bytecode* args = script->ptrReadPos; Enemy* enemy = script->owner1.enemy; Npc* npc = get_npc_unsafe(enemy->npcID); diff --git a/src/world/common/enemy/ai/PatrolNoAttackAI.inc.c b/src/world/common/enemy/ai/PatrolNoAttackAI.inc.c index 0f6ddcadfa..5c0ffacfd0 100644 --- a/src/world/common/enemy/ai/PatrolNoAttackAI.inc.c +++ b/src/world/common/enemy/ai/PatrolNoAttackAI.inc.c @@ -11,7 +11,7 @@ // prerequisites #include "world/common/enemy/ai/States_PatrolAI.inc.c" -ApiStatus N(PatrolNoAttackAI_Main)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(PatrolNoAttackAI_Main)) { #ifdef _DEAD_H_ DeadEnemy* enemy = (DeadEnemy*)script->owner1.enemy; #else diff --git a/src/world/common/enemy/ai/ProjectileHitbox.inc.c b/src/world/common/enemy/ai/ProjectileHitbox.inc.c index cd7636de29..5bf9a2bba3 100644 --- a/src/world/common/enemy/ai/ProjectileHitbox.inc.c +++ b/src/world/common/enemy/ai/ProjectileHitbox.inc.c @@ -129,7 +129,7 @@ void N(ProjectileHitbox_33)(Evt* script) { } } -ApiStatus N(ProjectileAI_Main)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(ProjectileAI_Main)) { Enemy* enemy = script->owner1.enemy; Bytecode* args = script->ptrReadPos; s32 phi_s6 = 0; @@ -249,9 +249,9 @@ ApiStatus N(ProjectileAI_Main)(Evt* script, s32 isInitialCall) { } else { fx_walking_dust(2, npc->pos.x, npc->pos.y, npc->pos.z, 0, 0); enemy->varTable[0] = 0; - npc->pos.x = 0.0f; - npc->pos.y = -1000.0f; - npc->pos.z = 0.0f; + npc->pos.x = NPC_DISPOSE_POS_X; + npc->pos.y = NPC_DISPOSE_POS_Y; + npc->pos.z = NPC_DISPOSE_POS_Z; npc->jumpVelocity = 0.0f; npc->flags |= NPC_FLAG_2; disable_npc_shadow(npc); @@ -265,7 +265,7 @@ ApiStatus N(ProjectileAI_Main)(Evt* script, s32 isInitialCall) { return ApiStatus_BLOCK; } -ApiStatus N(ProjectileAI_Reflect)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(ProjectileAI_Reflect)) { Enemy* enemy = script->owner1.enemy; Camera* camera = &gCameras[gCurrentCamID]; s32 phi_s4 = 0; @@ -354,9 +354,9 @@ ApiStatus N(ProjectileAI_Reflect)(Evt* script, s32 isInitialCall) { if (phi_s4 != 0) { fx_walking_dust(2, npc->pos.x, npc->pos.y, npc->pos.z, 0, 0); enemy->varTable[0] = 0; - npc->pos.x = 0.0f; - npc->pos.z = 0.0f; - npc->pos.y = -1000.0f; + npc->pos.x = NPC_DISPOSE_POS_X; + npc->pos.y = NPC_DISPOSE_POS_Y; + npc->pos.z = NPC_DISPOSE_POS_Z; npc->flags |= NPC_FLAG_2; disable_npc_shadow(npc); npc->flags &= ~NPC_FLAG_JUMPING; diff --git a/src/world/common/enemy/ai/RangedAttackAI.inc.c b/src/world/common/enemy/ai/RangedAttackAI.inc.c index a8bf7bc8a2..fe49c478a8 100644 --- a/src/world/common/enemy/ai/RangedAttackAI.inc.c +++ b/src/world/common/enemy/ai/RangedAttackAI.inc.c @@ -11,7 +11,7 @@ // prerequisites #include "world/common/enemy/ai/ProjectileHitbox.inc.c" -ApiStatus N(RangedAttackAI_Main)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(RangedAttackAI_Main)) { EnemyDetectVolume territory; EnemyDetectVolume* territoryPtr = &territory; Enemy* enemy = script->owner1.enemy; diff --git a/src/world/common/enemy/ai/SentinelAI.inc.c b/src/world/common/enemy/ai/SentinelAI.inc.c index 526154fcca..413355cb3b 100644 --- a/src/world/common/enemy/ai/SentinelAI.inc.c +++ b/src/world/common/enemy/ai/SentinelAI.inc.c @@ -274,7 +274,7 @@ void N(SentinelAI_ReturnHome)(Evt* script, MobileAISettings* aiSettings, EnemyDe } } -ApiStatus N(SentinelAI_Main)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(SentinelAI_Main)) { Enemy* enemy = script->owner1.enemy; Npc* npc = get_npc_unsafe(enemy->npcID); Bytecode* args = script->ptrReadPos; diff --git a/src/world/common/enemy/ai/ShyGuyPatrolAI.inc.c b/src/world/common/enemy/ai/ShyGuyPatrolAI.inc.c index be1c489379..cddb4df3b9 100644 --- a/src/world/common/enemy/ai/ShyGuyPatrolAI.inc.c +++ b/src/world/common/enemy/ai/ShyGuyPatrolAI.inc.c @@ -59,7 +59,7 @@ void N(ShyGuyPatrolAI_17)(Evt* script, MobileAISettings* aiSettings, EnemyDetect } } -ApiStatus N(ShyGuyPatrolAI_Main)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(ShyGuyPatrolAI_Main)) { Enemy* enemy = script->owner1.enemy; Npc* npc = get_npc_unsafe(enemy->npcID); EnemyDetectVolume territory; diff --git a/src/world/common/enemy/ai/ShyGuyWanderAI.inc.c b/src/world/common/enemy/ai/ShyGuyWanderAI.inc.c index 879c2452f8..8e9e7b382e 100644 --- a/src/world/common/enemy/ai/ShyGuyWanderAI.inc.c +++ b/src/world/common/enemy/ai/ShyGuyWanderAI.inc.c @@ -57,7 +57,7 @@ void N(ShyGuyWanderAI_17)(Evt* script, MobileAISettings* aiSettings, EnemyDetect } } -ApiStatus N(ShyGuyWanderAI_Main)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(ShyGuyWanderAI_Main)) { Enemy* enemy = script->owner1.enemy; Npc* npc = get_npc_unsafe(enemy->npcID); EnemyDetectVolume territory; diff --git a/src/world/common/enemy/ai/SpinyAI.inc.c b/src/world/common/enemy/ai/SpinyAI.inc.c index c3ddbe8c47..a22d4568fc 100644 --- a/src/world/common/enemy/ai/SpinyAI.inc.c +++ b/src/world/common/enemy/ai/SpinyAI.inc.c @@ -8,7 +8,7 @@ // prerequisites #include "world/common/enemy/ai/TackleAI.inc.c" -ApiStatus N(SpinyAI_Main)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(SpinyAI_Main)) { #ifdef _DEAD_H_ DeadEnemy* enemy = (DeadEnemy*)script->owner1.enemy; #else @@ -55,9 +55,9 @@ ApiStatus N(SpinyAI_Main)(Evt* script, s32 isInitialCall) { npc->flags |= NPC_FLAG_8; enemy->varTable[10] = 0; enemy->varTable[11] = -1; - npc->pos.x = 0.0f; - npc->pos.y = -1000.0f; - npc->pos.z = 0.0f; + npc->pos.x = NPC_DISPOSE_POS_X; + npc->pos.y = NPC_DISPOSE_POS_Y; + npc->pos.z = NPC_DISPOSE_POS_Z; } if (enemy->aiFlags & ENEMY_AI_FLAG_SUSPEND) { @@ -212,9 +212,9 @@ ApiStatus N(SpinyAI_Main)(Evt* script, s32 isInitialCall) { break; case 110: npc->duration = 30; - npc->pos.x = 0.0f; - npc->pos.z = 0.0f; - npc->pos.y = -1000.0f; + npc->pos.x = NPC_DISPOSE_POS_X; + npc->pos.y = NPC_DISPOSE_POS_Y; + npc->pos.z = NPC_DISPOSE_POS_Z; npc->flags |= NPC_FLAG_8 | NPC_FLAG_2; npc->flags &= ~NPC_FLAG_GRAVITY; script->AI_TEMP_STATE = 111; diff --git a/src/world/common/enemy/ai/StoneChompAI.inc.c b/src/world/common/enemy/ai/StoneChompAI.inc.c index 2aba1fb40b..1708793213 100644 --- a/src/world/common/enemy/ai/StoneChompAI.inc.c +++ b/src/world/common/enemy/ai/StoneChompAI.inc.c @@ -17,7 +17,7 @@ void N(StoneChompAI_ChaseInit)(Evt* script, MobileAISettings* aiSettings, EnemyD npc->jumpScale = 1.5f; } -ApiStatus N(StoneChompAI_Main)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(StoneChompAI_Main)) { Enemy* enemy = script->owner1.enemy; Bytecode* args = script->ptrReadPos; Npc* npc = get_npc_unsafe(enemy->npcID); diff --git a/src/world/common/enemy/ai/TackleAI.inc.c b/src/world/common/enemy/ai/TackleAI.inc.c index 8723df9e0d..c343cff360 100644 --- a/src/world/common/enemy/ai/TackleAI.inc.c +++ b/src/world/common/enemy/ai/TackleAI.inc.c @@ -11,7 +11,7 @@ // prerequisites #include "world/common/enemy/ai/States_TackleAI.inc.c" -ApiStatus N(TackleAI_Main)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(TackleAI_Main)) { #ifdef _DEAD_H_ DeadEnemy* enemy = (DeadEnemy*)script->owner1.enemy; #else diff --git a/src/world/common/npc/BigLanternGhost.h b/src/world/common/npc/BigLanternGhost.h index 9b9be8b965..7801c15e2f 100644 --- a/src/world/common/npc/BigLanternGhost.h +++ b/src/world/common/npc/BigLanternGhost.h @@ -1,13 +1,6 @@ #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, \ diff --git a/src/world/common/npc/Bobomb.h b/src/world/common/npc/Bobomb.h index 0095b55c91..ecded8b781 100644 --- a/src/world/common/npc/Bobomb.h +++ b/src/world/common/npc/Bobomb.h @@ -1,13 +1,6 @@ #include "common.h" #include "sprite/npc/WorldBobomb.h" -#define BOBOMB_DROPS \ -{ \ - .dropFlags = NPC_DROP_FLAG_80, \ - .heartDrops = NO_DROPS, \ - .flowerDrops = NO_DROPS, \ -} - #define BOBOMB_GREEN_ANIMS \ { \ .idle = ANIM_WorldBobomb_Green_Idle, \ diff --git a/src/world/common/npc/Boo.h b/src/world/common/npc/Boo.h index 0f3ae87391..e4f20c4658 100644 --- a/src/world/common/npc/Boo.h +++ b/src/world/common/npc/Boo.h @@ -1,13 +1,6 @@ #include "common.h" #include "sprite/npc/Boo.h" -#define BOO_DROPS \ -{ \ - .dropFlags = NPC_DROP_FLAG_80, \ - .heartDrops = NO_DROPS, \ - .flowerDrops = NO_DROPS, \ -} - #define NORMAL_BOO_ANIMS \ { \ .idle = ANIM_Boo_Idle, \ diff --git a/src/world/common/npc/Boo_Patrol.inc.c b/src/world/common/npc/Boo_Patrol.inc.c index a7271d053f..2d49f322ba 100644 --- a/src/world/common/npc/Boo_Patrol.inc.c +++ b/src/world/common/npc/Boo_Patrol.inc.c @@ -55,7 +55,7 @@ void N(BooPatrolAI_Loiter)(Evt* script, MobileAISettings* aiSettings, EnemyDetec } } -ApiStatus N(BooPatrolAI_Main)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(BooPatrolAI_Main)) { Enemy* enemy = script->owner1.enemy; Bytecode* args = script->ptrReadPos; Npc* npc = get_npc_unsafe(enemy->npcID); diff --git a/src/world/common/npc/Bootler.h b/src/world/common/npc/Bootler.h index 40a13eab54..bea53e0e70 100644 --- a/src/world/common/npc/Bootler.h +++ b/src/world/common/npc/Bootler.h @@ -1,13 +1,6 @@ #include "common.h" #include "sprite/npc/Bootler.h" -#define BOOTLER_DROPS \ -{ \ - .dropFlags = NPC_DROP_FLAG_80, \ - .heartDrops = NO_DROPS, \ - .flowerDrops = NO_DROPS, \ -} - #define BOOTLER_ANIMS \ { \ .idle = ANIM_Bootler_Idle, \ diff --git a/src/world/common/npc/Bow.h b/src/world/common/npc/Bow.h index 8f5bd1e6d1..0b8f35ca71 100644 --- a/src/world/common/npc/Bow.h +++ b/src/world/common/npc/Bow.h @@ -1,13 +1,6 @@ #include "common.h" #include "sprite/npc/WorldBow.h" -#define BOW_DROPS \ -{ \ - .dropFlags = NPC_DROP_FLAG_80, \ - .heartDrops = NO_DROPS, \ - .flowerDrops = NO_DROPS, \ -} - #define BOW_ANIMS \ { \ .idle = ANIM_WorldBow_Idle, \ diff --git a/src/world/common/npc/Bowser.h b/src/world/common/npc/Bowser.h new file mode 100644 index 0000000000..cdc06e9e63 --- /dev/null +++ b/src/world/common/npc/Bowser.h @@ -0,0 +1,22 @@ +#include "common.h" +#include "sprite/npc/WorldBowser.h" + +#define BOWSER_ANIMS \ +{ \ + .idle = ANIM_WorldBowser_Idle, \ + .walk = ANIM_WorldBowser_Idle, \ + .run = ANIM_WorldBowser_Idle, \ + .chase = ANIM_WorldBowser_Idle, \ + .anim_4 = ANIM_WorldBowser_Idle, \ + .anim_5 = ANIM_WorldBowser_Idle, \ + .death = ANIM_WorldBowser_Idle, \ + .hit = ANIM_WorldBowser_Idle, \ + .anim_8 = ANIM_WorldBowser_Idle, \ + .anim_9 = ANIM_WorldBowser_Idle, \ + .anim_A = ANIM_WorldBowser_Idle, \ + .anim_B = ANIM_WorldBowser_Idle, \ + .anim_C = ANIM_WorldBowser_Idle, \ + .anim_D = ANIM_WorldBowser_Idle, \ + .anim_E = ANIM_WorldBowser_Idle, \ + .anim_F = ANIM_WorldBowser_Idle, \ +} diff --git a/src/world/common/npc/Bowser.inc.c b/src/world/common/npc/Bowser.inc.c new file mode 100644 index 0000000000..be5bac1255 --- /dev/null +++ b/src/world/common/npc/Bowser.inc.c @@ -0,0 +1,7 @@ +#include "Bowser.h" + +NpcSettings N(NpcSettings_Bowser) = { + .height = 75, + .radius = 72, + .level = 99, +}; diff --git a/src/world/common/npc/Bubulb.h b/src/world/common/npc/Bubulb.h index 59836040ef..424d67fccd 100644 --- a/src/world/common/npc/Bubulb.h +++ b/src/world/common/npc/Bubulb.h @@ -1,13 +1,6 @@ #include "common.h" #include "sprite/npc/Bubulb.h" -#define BUBULB_DROPS \ -{ \ - .dropFlags = NPC_DROP_FLAG_80, \ - .heartDrops = NO_DROPS, \ - .flowerDrops = NO_DROPS, \ -} - #define BUBULB_PINK_ANIMS \ { \ .idle = ANIM_Bubulb_Pink_Idle, \ diff --git a/src/world/common/npc/Dryite.h b/src/world/common/npc/Dryite.h index 4b8cb5a339..0d5e5dfda8 100644 --- a/src/world/common/npc/Dryite.h +++ b/src/world/common/npc/Dryite.h @@ -1,13 +1,6 @@ #include "common.h" #include "sprite/npc/Dryite.h" -#define DRYITE_DROPS \ -{ \ - .dropFlags = NPC_DROP_FLAG_80, \ - .heartDrops = NO_DROPS, \ - .flowerDrops = NO_DROPS, \ -} - #define DRYITE_GREEN_ANIMS \ { \ ANIM_Dryite_Green_Idle, \ diff --git a/src/world/common/npc/GateFlower.h b/src/world/common/npc/GateFlower.h index 412913a8d7..a3a1573bfb 100644 --- a/src/world/common/npc/GateFlower.h +++ b/src/world/common/npc/GateFlower.h @@ -1,13 +1,6 @@ #include "common.h" #include "sprite/npc/GateFlower.h" -#define GATE_FLOWER_DROPS \ -{ \ - .dropFlags = NPC_DROP_FLAG_80, \ - .heartDrops = NO_DROPS, \ - .flowerDrops = NO_DROPS, \ -} - #define GATE_FLOWER_BLUE_ANIMS \ { \ .idle = ANIM_GateFlower_Blue_Idle, \ diff --git a/src/world/common/npc/GoombaFamily.h b/src/world/common/npc/GoombaFamily.h index 664c39c477..1a0597cb2c 100644 --- a/src/world/common/npc/GoombaFamily.h +++ b/src/world/common/npc/GoombaFamily.h @@ -5,13 +5,6 @@ #include "sprite/npc/Goomama.h" #include "sprite/npc/Goombaria.h" -#define GOOMPA_DROPS \ -{ \ - .dropFlags = NPC_DROP_FLAG_80, \ - .heartDrops = NO_DROPS, \ - .flowerDrops = NO_DROPS, \ -} - #define GOOMPA_ANIMS \ { \ .idle = ANIM_Goompa_Idle, \ @@ -32,13 +25,6 @@ .anim_F = ANIM_Goompa_Run, \ } -#define GOOMA_DROPS \ -{ \ - .dropFlags = NPC_DROP_FLAG_80, \ - .heartDrops = NO_DROPS, \ - .flowerDrops = NO_DROPS, \ -} - #define GOOMA_ANIMS \ { \ .idle = ANIM_Gooma_Idle, \ @@ -59,13 +45,6 @@ .anim_F = ANIM_Gooma_Run, \ } -#define GOOMPAPA_DROPS \ -{ \ - .dropFlags = NPC_DROP_FLAG_80, \ - .heartDrops = NO_DROPS, \ - .flowerDrops = NO_DROPS, \ -} - #define GOOMPAPA_ANIMS \ { \ .idle = ANIM_Goompapa_Idle, \ @@ -86,13 +65,6 @@ .anim_F = ANIM_Goompapa_Run, \ } -#define GOOMAMA_DROPS \ -{ \ - .dropFlags = NPC_DROP_FLAG_80, \ - .heartDrops = NO_DROPS, \ - .flowerDrops = NO_DROPS, \ -} - #define GOOMAMA_ANIMS \ { \ .idle = ANIM_Goomama_Idle, \ @@ -113,13 +85,6 @@ .anim_F = ANIM_Goomama_Run, \ } -#define GOOMBARIO_DROPS \ -{ \ - .dropFlags = NPC_DROP_FLAG_80, \ - .heartDrops = NO_DROPS, \ - .flowerDrops = NO_DROPS, \ -} - #define GOOMBARIO_ANIMS \ { \ .idle = ANIM_WorldGoombario_Idle, \ @@ -140,13 +105,6 @@ .anim_F = ANIM_WorldGoombario_Run, \ } -#define GOOMBARIA_DROPS \ -{ \ - .dropFlags = NPC_DROP_FLAG_80, \ - .heartDrops = NO_DROPS, \ - .flowerDrops = NO_DROPS, \ -} - #define GOOMBARIA_ANIMS \ { \ .idle = ANIM_Goombaria_Idle, \ diff --git a/src/world/common/npc/Goombaria.h b/src/world/common/npc/Goombaria.h index 0ec27c5cf8..5fa48eece8 100644 --- a/src/world/common/npc/Goombaria.h +++ b/src/world/common/npc/Goombaria.h @@ -1,13 +1,6 @@ #include "common.h" #include "sprite/npc/Goombaria.h" -#define GOOMBARIA_DROPS \ -{ \ - .dropFlags = NPC_DROP_FLAG_80, \ - .heartDrops = NO_DROPS, \ - .flowerDrops = NO_DROPS, \ -} - #define GOOMBARIA_ANIMS \ { \ .idle = ANIM_Goombaria_Idle, \ diff --git a/src/world/common/npc/GourmetGuy.h b/src/world/common/npc/GourmetGuy.h new file mode 100644 index 0000000000..8450188f6e --- /dev/null +++ b/src/world/common/npc/GourmetGuy.h @@ -0,0 +1,22 @@ +#include "common.h" +#include "sprite/npc/GourmetGuy.h" + +#define GOURMET_GUY_ANIMS \ +{ \ + .idle = ANIM_GourmetGuy_Idle, \ + .walk = ANIM_GourmetGuy_Idle, \ + .run = ANIM_GourmetGuy_Idle, \ + .chase = ANIM_GourmetGuy_Idle, \ + .anim_4 = ANIM_GourmetGuy_Idle, \ + .anim_5 = ANIM_GourmetGuy_Idle, \ + .death = ANIM_GourmetGuy_Idle, \ + .hit = ANIM_GourmetGuy_Idle, \ + .anim_8 = ANIM_GourmetGuy_Idle, \ + .anim_9 = ANIM_GourmetGuy_Idle, \ + .anim_A = ANIM_GourmetGuy_Idle, \ + .anim_B = ANIM_GourmetGuy_Idle, \ + .anim_C = ANIM_GourmetGuy_Idle, \ + .anim_D = ANIM_GourmetGuy_Idle, \ + .anim_E = ANIM_GourmetGuy_Idle, \ + .anim_F = ANIM_GourmetGuy_Idle, \ +} diff --git a/src/world/common/npc/GourmetGuy.inc.c b/src/world/common/npc/GourmetGuy.inc.c new file mode 100644 index 0000000000..6999191fa2 --- /dev/null +++ b/src/world/common/npc/GourmetGuy.inc.c @@ -0,0 +1,7 @@ +#include "GourmetGuy.h" + +NpcSettings N(NpcSettings_GourmetGuy) = { + .height = 68, + .radius = 60, + .level = 99, +}; diff --git a/src/world/common/npc/JrTroopa.h b/src/world/common/npc/JrTroopa.h index 52d3e7e170..8e62853f9e 100644 --- a/src/world/common/npc/JrTroopa.h +++ b/src/world/common/npc/JrTroopa.h @@ -1,13 +1,6 @@ #include "common.h" #include "sprite/npc/JrTroopa.h" -#define JR_TROOPA_DROPS \ -{ \ - .dropFlags = NPC_DROP_FLAG_80, \ - .heartDrops = NO_DROPS, \ - .flowerDrops = NO_DROPS, \ -} - #define JR_TROOPA_ANIMS \ { \ .idle = ANIM_JrTroopa_Idle, \ diff --git a/src/world/common/npc/Kolorado.h b/src/world/common/npc/Kolorado.h index dde7f5c55d..614e57e581 100644 --- a/src/world/common/npc/Kolorado.h +++ b/src/world/common/npc/Kolorado.h @@ -2,13 +2,6 @@ #include "sprite/npc/Kolorado.h" #include "sprite/npc/Archeologist.h" -#define KOLORADO_DROPS \ -{ \ - .dropFlags = NPC_DROP_FLAG_80, \ - .heartDrops = NO_DROPS, \ - .flowerDrops = NO_DROPS, \ -} - #define KOLORADO_ANIMS \ { \ .idle = ANIM_Kolorado_Idle, \ diff --git a/src/world/common/npc/KoloradoWife.h b/src/world/common/npc/KoloradoWife.h index e9b29534fb..40076ca971 100644 --- a/src/world/common/npc/KoloradoWife.h +++ b/src/world/common/npc/KoloradoWife.h @@ -1,13 +1,6 @@ #include "common.h" #include "sprite/npc/KoloradoWife.h" -#define KOLORADO_WIFE_DROPS \ -{ \ - .dropFlags = NPC_DROP_FLAG_80, \ - .heartDrops = NO_DROPS, \ - .flowerDrops = NO_DROPS, \ -} - #define KOLORADO_WIFE_ANIMS \ { \ .idle = ANIM_KoloradoWife_Idle, \ diff --git a/src/world/common/npc/Koopa.h b/src/world/common/npc/Koopa.h index 088f0f4aad..16fb08b049 100644 --- a/src/world/common/npc/Koopa.h +++ b/src/world/common/npc/Koopa.h @@ -1,13 +1,6 @@ #include "common.h" #include "sprite/npc/Koopa.h" -#define KOOPA_DROPS \ -{ \ - .dropFlags = NPC_DROP_FLAG_80, \ - .heartDrops = NO_DROPS, \ - .flowerDrops = NO_DROPS, \ -} - #define KOOPA_ANIMS \ { \ .idle = ANIM_Koopa_Idle, \ diff --git a/src/world/common/npc/KoopaBros.h b/src/world/common/npc/KoopaBros.h index 181d22ed2b..d1911f1828 100644 --- a/src/world/common/npc/KoopaBros.h +++ b/src/world/common/npc/KoopaBros.h @@ -1,13 +1,6 @@ #include "common.h" #include "sprite/npc/KoopaBros.h" -#define KOOPA_BROS_DROPS \ -{ \ - .dropFlags = NPC_DROP_FLAG_80, \ - .heartDrops = NO_DROPS, \ - .flowerDrops = NO_DROPS, \ -} - #define BLACK_KOOPA_BROS_ANIMS \ { \ .idle = ANIM_KoopaBros_Black_Anim04, \ diff --git a/src/world/common/npc/KoopaKoot.h b/src/world/common/npc/KoopaKoot.h index ccb08f9d6f..c88396bc2d 100644 --- a/src/world/common/npc/KoopaKoot.h +++ b/src/world/common/npc/KoopaKoot.h @@ -1,13 +1,6 @@ #include "common.h" #include "sprite/npc/KoopaKoot.h" -#define KOOPA_KOOT_DROPS \ -{ \ - .dropFlags = NPC_DROP_FLAG_80, \ - .heartDrops = NO_DROPS, \ - .flowerDrops = NO_DROPS, \ -} - #define KOOPA_KOOT_ANIMS \ { \ .idle = ANIM_KoopaKoot_Idle, \ diff --git a/src/world/common/npc/Lily.h b/src/world/common/npc/Lily.h index ab1f1e04e4..d008bed7a6 100644 --- a/src/world/common/npc/Lily.h +++ b/src/world/common/npc/Lily.h @@ -1,13 +1,6 @@ #include "common.h" #include "sprite/npc/Lily.h" -#define LILY_DROPS \ -{ \ - .dropFlags = NPC_DROP_FLAG_80, \ - .heartDrops = NO_DROPS, \ - .flowerDrops = NO_DROPS, \ -} - #define LILY_ANIMS \ { \ .idle = ANIM_Lily_Idle, \ diff --git a/src/world/common/npc/Luigi.h b/src/world/common/npc/Luigi.h index 6f4abf7e2a..80800f639a 100644 --- a/src/world/common/npc/Luigi.h +++ b/src/world/common/npc/Luigi.h @@ -1,13 +1,6 @@ #include "common.h" #include "sprite/npc/Luigi.h" -#define LUIGI_DROPS \ -{ \ - .dropFlags = NPC_DROP_FLAG_80, \ - .heartDrops = NO_DROPS, \ - .flowerDrops = NO_DROPS, \ -} - #define LUIGI_ANIMS \ { \ .idle = ANIM_Luigi_Still, \ diff --git a/src/world/common/npc/Mouser.h b/src/world/common/npc/Mouser.h index bb2492d37a..0db1b2d7d9 100644 --- a/src/world/common/npc/Mouser.h +++ b/src/world/common/npc/Mouser.h @@ -4,13 +4,6 @@ #include "sprite/npc/DisguisedMoustafa.h" #include "sprite/npc/Moustafa.h" -#define MOUSER_DROPS \ -{ \ - .dropFlags = NPC_DROP_FLAG_80, \ - .heartDrops = NO_DROPS, \ - .flowerDrops = NO_DROPS, \ -} - #define MOUSER_BLUE_ANIMS \ { \ ANIM_Mouser_Blue_Idle, \ diff --git a/src/world/common/npc/Oaklie.h b/src/world/common/npc/Oaklie.h index a0ba05426e..463829f040 100644 --- a/src/world/common/npc/Oaklie.h +++ b/src/world/common/npc/Oaklie.h @@ -1,13 +1,6 @@ #include "common.h" #include "sprite/npc/Oaklie.h" -#define OAKLIE_DROPS \ -{ \ - .dropFlags = NPC_DROP_FLAG_80, \ - .heartDrops = NO_DROPS, \ - .flowerDrops = NO_DROPS, \ -} - #define OAKLIE_ANIMS \ { \ .idle = ANIM_Oaklie_Idle, \ diff --git a/src/world/common/npc/Peach.h b/src/world/common/npc/Peach.h new file mode 100644 index 0000000000..50accb777b --- /dev/null +++ b/src/world/common/npc/Peach.h @@ -0,0 +1,21 @@ +#include "common.h" + +#define PEACH_ANIMS \ +{ \ + .idle = ANIM_Peach_A0000, \ + .walk = ANIM_Peach_A0000, \ + .run = ANIM_Peach_A0000, \ + .chase = ANIM_Peach_A0000, \ + .anim_4 = ANIM_Peach_A0000, \ + .anim_5 = ANIM_Peach_A0000, \ + .death = ANIM_Peach_A0000, \ + .hit = ANIM_Peach_A0000, \ + .anim_8 = ANIM_Peach_A0000, \ + .anim_9 = ANIM_Peach_A0000, \ + .anim_A = ANIM_Peach_A0000, \ + .anim_B = ANIM_Peach_A0000, \ + .anim_C = ANIM_Peach_A0000, \ + .anim_D = ANIM_Peach_A0000, \ + .anim_E = ANIM_Peach_A0000, \ + .anim_F = ANIM_Peach_A0000, \ +} diff --git a/src/world/common/npc/Peach.inc.c b/src/world/common/npc/Peach.inc.c new file mode 100644 index 0000000000..4bb0fb9940 --- /dev/null +++ b/src/world/common/npc/Peach.inc.c @@ -0,0 +1,7 @@ +#include "Peach.h" + +NpcSettings N(NpcSettings_Peach) = { + .height = 46, + .radius = 36, + .level = 99, +}; diff --git a/src/world/common/npc/Penguin.h b/src/world/common/npc/Penguin.h index af0afaee08..016ba680a9 100644 --- a/src/world/common/npc/Penguin.h +++ b/src/world/common/npc/Penguin.h @@ -3,13 +3,6 @@ #include "sprite/npc/MayorPenguinWife.h" #include "sprite/npc/Penguin.h" -#define PENGUIN_DROPS \ -{ \ - .dropFlags = NPC_DROP_FLAG_80, \ - .heartDrops = NO_DROPS, \ - .flowerDrops = NO_DROPS, \ -} - #define PENGUIN_ANIMS \ { \ .idle = ANIM_Penguin_Idle, \ diff --git a/src/world/common/npc/Posie.h b/src/world/common/npc/Posie.h index 1b0961ee8e..7ae3099640 100644 --- a/src/world/common/npc/Posie.h +++ b/src/world/common/npc/Posie.h @@ -1,13 +1,6 @@ #include "common.h" #include "sprite/npc/Posie.h" -#define POSIE_DROPS \ -{ \ - .dropFlags = NPC_DROP_FLAG_80, \ - .heartDrops = NO_DROPS, \ - .flowerDrops = NO_DROPS, \ -} - #define POSIE_ANIMS \ { \ .idle = ANIM_Posie_Idle, \ diff --git a/src/world/common/npc/Rosie.h b/src/world/common/npc/Rosie.h index 1cfef71d47..a726f43f5c 100644 --- a/src/world/common/npc/Rosie.h +++ b/src/world/common/npc/Rosie.h @@ -1,13 +1,6 @@ #include "common.h" #include "sprite/npc/Rosie.h" -#define ROSIE_DROPS \ -{ \ - .dropFlags = NPC_DROP_FLAG_80, \ - .heartDrops = NO_DROPS, \ - .flowerDrops = NO_DROPS, \ -} - #define ROSIE_ANIMS \ { \ .idle = ANIM_Rosie_Idle, \ diff --git a/src/world/common/npc/StarRod.h b/src/world/common/npc/StarRod.h new file mode 100644 index 0000000000..877b47b2ab --- /dev/null +++ b/src/world/common/npc/StarRod.h @@ -0,0 +1,22 @@ +#include "common.h" +#include "sprite/npc/StarRod.h" + +#define STAR_ROD_ANIMS \ +{ \ + .idle = ANIM_StarRod_Still, \ + .walk = ANIM_StarRod_Still, \ + .run = ANIM_StarRod_Still, \ + .chase = ANIM_StarRod_Still, \ + .anim_4 = ANIM_StarRod_Still, \ + .anim_5 = ANIM_StarRod_Still, \ + .death = ANIM_StarRod_Still, \ + .hit = ANIM_StarRod_Still, \ + .anim_8 = ANIM_StarRod_Still, \ + .anim_9 = ANIM_StarRod_Still, \ + .anim_A = ANIM_StarRod_Still, \ + .anim_B = ANIM_StarRod_Still, \ + .anim_C = ANIM_StarRod_Still, \ + .anim_D = ANIM_StarRod_Still, \ + .anim_E = ANIM_StarRod_Still, \ + .anim_F = ANIM_StarRod_Still, \ +} diff --git a/src/world/common/npc/StarRod.inc.c b/src/world/common/npc/StarRod.inc.c new file mode 100644 index 0000000000..b072e499f2 --- /dev/null +++ b/src/world/common/npc/StarRod.inc.c @@ -0,0 +1,13 @@ +#include "StarRod.h" + +EvtScript N(EVS_NpcAuxAI_StarRod) = { + EVT_RETURN + EVT_END +}; + +NpcSettings N(NpcSettings_StarRod) = { + .height = 24, + .radius = 24, + .level = 99, + .otherAI = &N(EVS_NpcAuxAI_StarRod), +}; diff --git a/src/world/common/npc/StarSpirit.h b/src/world/common/npc/StarSpirit.h index 838a1215fe..62c257a7aa 100644 --- a/src/world/common/npc/StarSpirit.h +++ b/src/world/common/npc/StarSpirit.h @@ -9,13 +9,6 @@ #include "sprite/npc/StarMan.h" #include "sprite/npc/Twink.h" -#define ELDSTAR_DROPS \ -{ \ - .dropFlags = NPC_DROP_FLAG_80, \ - .heartDrops = NO_DROPS, \ - .flowerDrops = NO_DROPS, \ -} - #define ELDSTAR_ANIMS \ { \ .idle = ANIM_WorldEldstar_Idle, \ @@ -36,13 +29,6 @@ .anim_F = ANIM_WorldEldstar_Idle, \ } -#define MAMAR_DROPS \ -{ \ - .dropFlags = NPC_DROP_FLAG_80, \ - .heartDrops = NO_DROPS, \ - .flowerDrops = NO_DROPS, \ -} - #define MAMAR_ANIMS \ { \ .idle = ANIM_WorldMamar_Idle, \ @@ -63,13 +49,6 @@ .anim_F = ANIM_WorldMamar_Idle, \ } -#define SKOLAR_DROPS \ -{ \ - .dropFlags = NPC_DROP_FLAG_80, \ - .heartDrops = NO_DROPS, \ - .flowerDrops = NO_DROPS, \ -} - #define SKOLAR_ANIMS \ { \ .idle = ANIM_WorldSkolar_Idle, \ @@ -90,13 +69,6 @@ .anim_F = ANIM_WorldSkolar_Idle, \ } -#define MUSKULAR_DROPS \ -{ \ - .dropFlags = NPC_DROP_FLAG_80, \ - .heartDrops = NO_DROPS, \ - .flowerDrops = NO_DROPS, \ -} - #define MUSKULAR_ANIMS \ { \ .idle = ANIM_WorldMuskular_Idle, \ @@ -117,13 +89,6 @@ .anim_F = ANIM_WorldMuskular_Idle, \ } -#define MISSTAR_DROPS \ -{ \ - .dropFlags = NPC_DROP_FLAG_80, \ - .heartDrops = NO_DROPS, \ - .flowerDrops = NO_DROPS, \ -} - #define MISSTAR_ANIMS \ { \ .idle = ANIM_WorldMisstar_Idle, \ @@ -144,13 +109,6 @@ .anim_F = ANIM_WorldMisstar_Idle, \ } -#define KLEVAR_DROPS \ -{ \ - .dropFlags = NPC_DROP_FLAG_80, \ - .heartDrops = NO_DROPS, \ - .flowerDrops = NO_DROPS, \ -} - #define KLEVAR_ANIMS \ { \ .idle = ANIM_WorldKlevar_Idle, \ @@ -171,13 +129,6 @@ .anim_F = ANIM_WorldKlevar_Idle, \ } -#define KALMAR_DROPS \ -{ \ - .dropFlags = NPC_DROP_FLAG_80, \ - .heartDrops = NO_DROPS, \ - .flowerDrops = NO_DROPS, \ -} - #define KALMAR_ANIMS \ { \ .idle = ANIM_WorldKalmar_Idle, \ @@ -198,13 +149,6 @@ .anim_F = ANIM_WorldKalmar_Idle, \ } -#define STAR_MAN_DROPS \ -{ \ - .dropFlags = NPC_DROP_FLAG_80, \ - .heartDrops = NO_DROPS, \ - .flowerDrops = NO_DROPS, \ -} - #define STAR_MAN_ANIMS \ { \ .idle = ANIM_StarMan_Idle, \ @@ -225,13 +169,6 @@ .anim_F = ANIM_StarMan_Idle, \ } -#define STAR_KID_DROPS \ -{ \ - .dropFlags = NPC_DROP_FLAG_80, \ - .heartDrops = NO_DROPS, \ - .flowerDrops = NO_DROPS, \ -} - #define STAR_KID_ANIMS \ { \ .idle = ANIM_Twink_Idle, \ diff --git a/src/world/common/npc/Sun.h b/src/world/common/npc/Sun.h index 4b27048673..d91453de52 100644 --- a/src/world/common/npc/Sun.h +++ b/src/world/common/npc/Sun.h @@ -1,13 +1,6 @@ #include "common.h" #include "sprite/npc/Sun.h" -#define SUN_DROPS \ -{ \ - .dropFlags = NPC_DROP_FLAG_80, \ - .heartDrops = NO_DROPS, \ - .flowerDrops = NO_DROPS, \ -} - #define SUN_ANIMS \ { \ .idle = ANIM_Sun_Idle, \ diff --git a/src/world/common/npc/Toad.h b/src/world/common/npc/Toad.h index b1e93ce1c2..d3de3ae510 100644 --- a/src/world/common/npc/Toad.h +++ b/src/world/common/npc/Toad.h @@ -1,10 +1,5 @@ #include "common.h" #include "sprite/npc/Toad.h" -#include "sprite/npc/ToadKid.h" -#include "sprite/npc/Toadette.h" -#include "sprite/npc/ToadGuard.h" - -#define TOAD_DROPS NPC_NO_DROPS #define TOAD_RED_ANIMS \ { \ @@ -105,257 +100,3 @@ .anim_E = ANIM_Toad_Pink_Run, \ .anim_F = ANIM_Toad_Pink_Run, \ } - -#define TOAD_KID_DROPS \ -{ \ - .dropFlags = NPC_DROP_FLAG_80, \ - .heartDrops = NO_DROPS, \ - .flowerDrops = NO_DROPS, \ -} - -#define TOAD_KID_RED_ANIMS \ -{ \ - .idle = ANIM_ToadKid_Red_Idle, \ - .walk = ANIM_ToadKid_Red_Walk, \ - .run = ANIM_ToadKid_Red_Run, \ - .chase = ANIM_ToadKid_Red_Run, \ - .anim_4 = ANIM_ToadKid_Red_Idle, \ - .anim_5 = ANIM_ToadKid_Red_Idle, \ - .death = ANIM_ToadKid_Red_Still, \ - .hit = ANIM_ToadKid_Red_Still, \ - .anim_8 = ANIM_ToadKid_Red_Still, \ - .anim_9 = ANIM_ToadKid_Red_Still, \ - .anim_A = ANIM_ToadKid_Red_Still, \ - .anim_B = ANIM_ToadKid_Red_Still, \ - .anim_C = ANIM_ToadKid_Red_Still, \ - .anim_D = ANIM_ToadKid_Red_Still, \ - .anim_E = ANIM_ToadKid_Red_Still, \ - .anim_F = ANIM_ToadKid_Red_Still, \ -} - -#define TOAD_KID_GREEN_ANIMS \ -{ \ - .idle = ANIM_ToadKid_Green_Idle, \ - .walk = ANIM_ToadKid_Green_Walk, \ - .run = ANIM_ToadKid_Green_Run, \ - .chase = ANIM_ToadKid_Green_Run, \ - .anim_4 = ANIM_ToadKid_Green_Idle, \ - .anim_5 = ANIM_ToadKid_Green_Idle, \ - .death = ANIM_ToadKid_Green_Still, \ - .hit = ANIM_ToadKid_Green_Still, \ - .anim_8 = ANIM_ToadKid_Green_Still, \ - .anim_9 = ANIM_ToadKid_Green_Still, \ - .anim_A = ANIM_ToadKid_Green_Still, \ - .anim_B = ANIM_ToadKid_Green_Still, \ - .anim_C = ANIM_ToadKid_Green_Still, \ - .anim_D = ANIM_ToadKid_Green_Still, \ - .anim_E = ANIM_ToadKid_Green_Still, \ - .anim_F = ANIM_ToadKid_Green_Still, \ -} - -#define TOAD_KID_BLUE_ANIMS \ -{ \ - .idle = ANIM_ToadKid_Blue_Idle, \ - .walk = ANIM_ToadKid_Blue_Walk, \ - .run = ANIM_ToadKid_Blue_Run, \ - .chase = ANIM_ToadKid_Blue_Run, \ - .anim_4 = ANIM_ToadKid_Blue_Idle, \ - .anim_5 = ANIM_ToadKid_Blue_Idle, \ - .death = ANIM_ToadKid_Blue_Still, \ - .hit = ANIM_ToadKid_Blue_Still, \ - .anim_8 = ANIM_ToadKid_Blue_Still, \ - .anim_9 = ANIM_ToadKid_Blue_Still, \ - .anim_A = ANIM_ToadKid_Blue_Still, \ - .anim_B = ANIM_ToadKid_Blue_Still, \ - .anim_C = ANIM_ToadKid_Blue_Still, \ - .anim_D = ANIM_ToadKid_Blue_Still, \ - .anim_E = ANIM_ToadKid_Blue_Still, \ - .anim_F = ANIM_ToadKid_Blue_Still, \ -} - -#define TOAD_KID_YELLOW_ANIMS \ -{ \ - .idle = ANIM_ToadKid_Yellow_Idle, \ - .walk = ANIM_ToadKid_Yellow_Walk, \ - .run = ANIM_ToadKid_Yellow_Run, \ - .chase = ANIM_ToadKid_Yellow_Run, \ - .anim_4 = ANIM_ToadKid_Yellow_Idle, \ - .anim_5 = ANIM_ToadKid_Yellow_Idle, \ - .death = ANIM_ToadKid_Yellow_Still, \ - .hit = ANIM_ToadKid_Yellow_Still, \ - .anim_8 = ANIM_ToadKid_Yellow_Still, \ - .anim_9 = ANIM_ToadKid_Yellow_Still, \ - .anim_A = ANIM_ToadKid_Yellow_Still, \ - .anim_B = ANIM_ToadKid_Yellow_Still, \ - .anim_C = ANIM_ToadKid_Yellow_Still, \ - .anim_D = ANIM_ToadKid_Yellow_Still, \ - .anim_E = ANIM_ToadKid_Yellow_Still, \ - .anim_F = ANIM_ToadKid_Yellow_Still, \ -} - -#define TOADETTE_DROPS \ -{ \ - .dropFlags = NPC_DROP_FLAG_80, \ - .heartDrops = NO_DROPS, \ - .flowerDrops = NO_DROPS, \ -} - -#define TOADETTE_ORANGE_ANIMS \ -{ \ - .idle = ANIM_Toadette_Orange_Idle, \ - .walk = ANIM_Toadette_Orange_Walk, \ - .run = ANIM_Toadette_Orange_Run, \ - .chase = ANIM_Toadette_Orange_Run, \ - .anim_4 = ANIM_Toadette_Orange_Idle, \ - .anim_5 = ANIM_Toadette_Orange_Idle, \ - .death = ANIM_Toadette_Orange_Disappointed, \ - .hit = ANIM_Toadette_Orange_Disappointed, \ - .anim_8 = ANIM_Toadette_Orange_Run, \ - .anim_9 = ANIM_Toadette_Orange_Run, \ - .anim_A = ANIM_Toadette_Orange_Run, \ - .anim_B = ANIM_Toadette_Orange_Run, \ - .anim_C = ANIM_Toadette_Orange_Run, \ - .anim_D = ANIM_Toadette_Orange_Run, \ - .anim_E = ANIM_Toadette_Orange_Run, \ - .anim_F = ANIM_Toadette_Orange_Run, \ -} - -#define TOADETTE_PINK_ANIMS \ -{ \ - .idle = ANIM_Toadette_Pink_Idle, \ - .walk = ANIM_Toadette_Pink_Walk, \ - .run = ANIM_Toadette_Pink_Run, \ - .chase = ANIM_Toadette_Pink_Run, \ - .anim_4 = ANIM_Toadette_Pink_Idle, \ - .anim_5 = ANIM_Toadette_Pink_Idle, \ - .death = ANIM_Toadette_Pink_Disappointed, \ - .hit = ANIM_Toadette_Pink_Disappointed, \ - .anim_8 = ANIM_Toadette_Pink_Run, \ - .anim_9 = ANIM_Toadette_Pink_Run, \ - .anim_A = ANIM_Toadette_Pink_Run, \ - .anim_B = ANIM_Toadette_Pink_Run, \ - .anim_C = ANIM_Toadette_Pink_Run, \ - .anim_D = ANIM_Toadette_Pink_Run, \ - .anim_E = ANIM_Toadette_Pink_Run, \ - .anim_F = ANIM_Toadette_Pink_Run, \ -} - -#define TOADETTE_GREEN_ANIMS \ -{ \ - .idle = ANIM_Toadette_Green_Idle, \ - .walk = ANIM_Toadette_Green_Walk, \ - .run = ANIM_Toadette_Green_Run, \ - .chase = ANIM_Toadette_Green_Run, \ - .anim_4 = ANIM_Toadette_Green_Idle, \ - .anim_5 = ANIM_Toadette_Green_Idle, \ - .death = ANIM_Toadette_Green_Disappointed, \ - .hit = ANIM_Toadette_Green_Disappointed, \ - .anim_8 = ANIM_Toadette_Green_Run, \ - .anim_9 = ANIM_Toadette_Green_Run, \ - .anim_A = ANIM_Toadette_Green_Run, \ - .anim_B = ANIM_Toadette_Green_Run, \ - .anim_C = ANIM_Toadette_Green_Run, \ - .anim_D = ANIM_Toadette_Green_Run, \ - .anim_E = ANIM_Toadette_Green_Run, \ - .anim_F = ANIM_Toadette_Green_Run, \ -} - -#define TOADETTE_PURPLE_ANIMS \ -{ \ - .idle = ANIM_Toadette_Purple_Idle, \ - .walk = ANIM_Toadette_Purple_Walk, \ - .run = ANIM_Toadette_Purple_Run, \ - .chase = ANIM_Toadette_Purple_Run, \ - .anim_4 = ANIM_Toadette_Purple_Idle, \ - .anim_5 = ANIM_Toadette_Purple_Idle, \ - .death = ANIM_Toadette_Purple_Disappointed, \ - .hit = ANIM_Toadette_Purple_Disappointed, \ - .anim_8 = ANIM_Toadette_Purple_Run, \ - .anim_9 = ANIM_Toadette_Purple_Run, \ - .anim_A = ANIM_Toadette_Purple_Run, \ - .anim_B = ANIM_Toadette_Purple_Run, \ - .anim_C = ANIM_Toadette_Purple_Run, \ - .anim_D = ANIM_Toadette_Purple_Run, \ - .anim_E = ANIM_Toadette_Purple_Run, \ - .anim_F = ANIM_Toadette_Purple_Run, \ -} - -#define TOAD_GUARD_RED_ANIMS \ -{ \ - .idle = ANIM_ToadGuard_Red_Idle, \ - .walk = ANIM_ToadGuard_Red_Idle, \ - .run = ANIM_ToadGuard_Red_Idle, \ - .chase = ANIM_ToadGuard_Red_Idle, \ - .anim_4 = ANIM_ToadGuard_Red_Idle, \ - .anim_5 = ANIM_ToadGuard_Red_Idle, \ - .death = ANIM_ToadGuard_Red_Idle, \ - .hit = ANIM_ToadGuard_Red_Idle, \ - .anim_8 = ANIM_ToadGuard_Red_Idle, \ - .anim_9 = ANIM_ToadGuard_Red_Idle, \ - .anim_A = ANIM_ToadGuard_Red_Idle, \ - .anim_B = ANIM_ToadGuard_Red_Idle, \ - .anim_C = ANIM_ToadGuard_Red_Idle, \ - .anim_D = ANIM_ToadGuard_Red_Idle, \ - .anim_E = ANIM_ToadGuard_Red_Idle, \ - .anim_F = ANIM_ToadGuard_Red_Idle, \ -} - -#define TOAD_GUARD_GREEN_ANIMS \ -{ \ - .idle = ANIM_ToadGuard_Green_Idle, \ - .walk = ANIM_ToadGuard_Green_Idle, \ - .run = ANIM_ToadGuard_Green_Idle, \ - .chase = ANIM_ToadGuard_Green_Idle, \ - .anim_4 = ANIM_ToadGuard_Green_Idle, \ - .anim_5 = ANIM_ToadGuard_Green_Idle, \ - .death = ANIM_ToadGuard_Green_Idle, \ - .hit = ANIM_ToadGuard_Green_Idle, \ - .anim_8 = ANIM_ToadGuard_Green_Idle, \ - .anim_9 = ANIM_ToadGuard_Green_Idle, \ - .anim_A = ANIM_ToadGuard_Green_Idle, \ - .anim_B = ANIM_ToadGuard_Green_Idle, \ - .anim_C = ANIM_ToadGuard_Green_Idle, \ - .anim_D = ANIM_ToadGuard_Green_Idle, \ - .anim_E = ANIM_ToadGuard_Green_Idle, \ - .anim_F = ANIM_ToadGuard_Green_Idle, \ -} - -#define TOAD_GUARD_BLUE_ANIMS \ -{ \ - .idle = ANIM_ToadGuard_Blue_Idle, \ - .walk = ANIM_ToadGuard_Blue_Idle, \ - .run = ANIM_ToadGuard_Blue_Idle, \ - .chase = ANIM_ToadGuard_Blue_Idle, \ - .anim_4 = ANIM_ToadGuard_Blue_Idle, \ - .anim_5 = ANIM_ToadGuard_Blue_Idle, \ - .death = ANIM_ToadGuard_Blue_Idle, \ - .hit = ANIM_ToadGuard_Blue_Idle, \ - .anim_8 = ANIM_ToadGuard_Blue_Idle, \ - .anim_9 = ANIM_ToadGuard_Blue_Idle, \ - .anim_A = ANIM_ToadGuard_Blue_Idle, \ - .anim_B = ANIM_ToadGuard_Blue_Idle, \ - .anim_C = ANIM_ToadGuard_Blue_Idle, \ - .anim_D = ANIM_ToadGuard_Blue_Idle, \ - .anim_E = ANIM_ToadGuard_Blue_Idle, \ - .anim_F = ANIM_ToadGuard_Blue_Idle, \ -} - -#define TOAD_GUARD_YELLOW_ANIMS \ -{ \ - .idle = ANIM_ToadGuard_Yellow_Idle, \ - .walk = ANIM_ToadGuard_Yellow_Idle, \ - .run = ANIM_ToadGuard_Yellow_Idle, \ - .chase = ANIM_ToadGuard_Yellow_Idle, \ - .anim_4 = ANIM_ToadGuard_Yellow_Idle, \ - .anim_5 = ANIM_ToadGuard_Yellow_Idle, \ - .death = ANIM_ToadGuard_Yellow_Idle, \ - .hit = ANIM_ToadGuard_Yellow_Idle, \ - .anim_8 = ANIM_ToadGuard_Yellow_Idle, \ - .anim_9 = ANIM_ToadGuard_Yellow_Idle, \ - .anim_A = ANIM_ToadGuard_Yellow_Idle, \ - .anim_B = ANIM_ToadGuard_Yellow_Idle, \ - .anim_C = ANIM_ToadGuard_Yellow_Idle, \ - .anim_D = ANIM_ToadGuard_Yellow_Idle, \ - .anim_E = ANIM_ToadGuard_Yellow_Idle, \ - .anim_F = ANIM_ToadGuard_Yellow_Idle, \ -} diff --git a/src/world/common/npc/ToadGuard.h b/src/world/common/npc/ToadGuard.h new file mode 100644 index 0000000000..34ec12f5dd --- /dev/null +++ b/src/world/common/npc/ToadGuard.h @@ -0,0 +1,82 @@ +#include "common.h" +#include "sprite/npc/ToadGuard.h" + +#define TOAD_GUARD_RED_ANIMS \ +{ \ + .idle = ANIM_ToadGuard_Red_Idle, \ + .walk = ANIM_ToadGuard_Red_Idle, \ + .run = ANIM_ToadGuard_Red_Idle, \ + .chase = ANIM_ToadGuard_Red_Idle, \ + .anim_4 = ANIM_ToadGuard_Red_Idle, \ + .anim_5 = ANIM_ToadGuard_Red_Idle, \ + .death = ANIM_ToadGuard_Red_Idle, \ + .hit = ANIM_ToadGuard_Red_Idle, \ + .anim_8 = ANIM_ToadGuard_Red_Idle, \ + .anim_9 = ANIM_ToadGuard_Red_Idle, \ + .anim_A = ANIM_ToadGuard_Red_Idle, \ + .anim_B = ANIM_ToadGuard_Red_Idle, \ + .anim_C = ANIM_ToadGuard_Red_Idle, \ + .anim_D = ANIM_ToadGuard_Red_Idle, \ + .anim_E = ANIM_ToadGuard_Red_Idle, \ + .anim_F = ANIM_ToadGuard_Red_Idle, \ +} + +#define TOAD_GUARD_GREEN_ANIMS \ +{ \ + .idle = ANIM_ToadGuard_Green_Idle, \ + .walk = ANIM_ToadGuard_Green_Idle, \ + .run = ANIM_ToadGuard_Green_Idle, \ + .chase = ANIM_ToadGuard_Green_Idle, \ + .anim_4 = ANIM_ToadGuard_Green_Idle, \ + .anim_5 = ANIM_ToadGuard_Green_Idle, \ + .death = ANIM_ToadGuard_Green_Idle, \ + .hit = ANIM_ToadGuard_Green_Idle, \ + .anim_8 = ANIM_ToadGuard_Green_Idle, \ + .anim_9 = ANIM_ToadGuard_Green_Idle, \ + .anim_A = ANIM_ToadGuard_Green_Idle, \ + .anim_B = ANIM_ToadGuard_Green_Idle, \ + .anim_C = ANIM_ToadGuard_Green_Idle, \ + .anim_D = ANIM_ToadGuard_Green_Idle, \ + .anim_E = ANIM_ToadGuard_Green_Idle, \ + .anim_F = ANIM_ToadGuard_Green_Idle, \ +} + +#define TOAD_GUARD_BLUE_ANIMS \ +{ \ + .idle = ANIM_ToadGuard_Blue_Idle, \ + .walk = ANIM_ToadGuard_Blue_Idle, \ + .run = ANIM_ToadGuard_Blue_Idle, \ + .chase = ANIM_ToadGuard_Blue_Idle, \ + .anim_4 = ANIM_ToadGuard_Blue_Idle, \ + .anim_5 = ANIM_ToadGuard_Blue_Idle, \ + .death = ANIM_ToadGuard_Blue_Idle, \ + .hit = ANIM_ToadGuard_Blue_Idle, \ + .anim_8 = ANIM_ToadGuard_Blue_Idle, \ + .anim_9 = ANIM_ToadGuard_Blue_Idle, \ + .anim_A = ANIM_ToadGuard_Blue_Idle, \ + .anim_B = ANIM_ToadGuard_Blue_Idle, \ + .anim_C = ANIM_ToadGuard_Blue_Idle, \ + .anim_D = ANIM_ToadGuard_Blue_Idle, \ + .anim_E = ANIM_ToadGuard_Blue_Idle, \ + .anim_F = ANIM_ToadGuard_Blue_Idle, \ +} + +#define TOAD_GUARD_YELLOW_ANIMS \ +{ \ + .idle = ANIM_ToadGuard_Yellow_Idle, \ + .walk = ANIM_ToadGuard_Yellow_Idle, \ + .run = ANIM_ToadGuard_Yellow_Idle, \ + .chase = ANIM_ToadGuard_Yellow_Idle, \ + .anim_4 = ANIM_ToadGuard_Yellow_Idle, \ + .anim_5 = ANIM_ToadGuard_Yellow_Idle, \ + .death = ANIM_ToadGuard_Yellow_Idle, \ + .hit = ANIM_ToadGuard_Yellow_Idle, \ + .anim_8 = ANIM_ToadGuard_Yellow_Idle, \ + .anim_9 = ANIM_ToadGuard_Yellow_Idle, \ + .anim_A = ANIM_ToadGuard_Yellow_Idle, \ + .anim_B = ANIM_ToadGuard_Yellow_Idle, \ + .anim_C = ANIM_ToadGuard_Yellow_Idle, \ + .anim_D = ANIM_ToadGuard_Yellow_Idle, \ + .anim_E = ANIM_ToadGuard_Yellow_Idle, \ + .anim_F = ANIM_ToadGuard_Yellow_Idle, \ +} diff --git a/src/world/common/npc/ToadKid.h b/src/world/common/npc/ToadKid.h new file mode 100644 index 0000000000..56cc0f79bb --- /dev/null +++ b/src/world/common/npc/ToadKid.h @@ -0,0 +1,82 @@ +#include "common.h" +#include "sprite/npc/ToadKid.h" + +#define TOAD_KID_RED_ANIMS \ +{ \ + .idle = ANIM_ToadKid_Red_Idle, \ + .walk = ANIM_ToadKid_Red_Walk, \ + .run = ANIM_ToadKid_Red_Run, \ + .chase = ANIM_ToadKid_Red_Run, \ + .anim_4 = ANIM_ToadKid_Red_Idle, \ + .anim_5 = ANIM_ToadKid_Red_Idle, \ + .death = ANIM_ToadKid_Red_Still, \ + .hit = ANIM_ToadKid_Red_Still, \ + .anim_8 = ANIM_ToadKid_Red_Still, \ + .anim_9 = ANIM_ToadKid_Red_Still, \ + .anim_A = ANIM_ToadKid_Red_Still, \ + .anim_B = ANIM_ToadKid_Red_Still, \ + .anim_C = ANIM_ToadKid_Red_Still, \ + .anim_D = ANIM_ToadKid_Red_Still, \ + .anim_E = ANIM_ToadKid_Red_Still, \ + .anim_F = ANIM_ToadKid_Red_Still, \ +} + +#define TOAD_KID_GREEN_ANIMS \ +{ \ + .idle = ANIM_ToadKid_Green_Idle, \ + .walk = ANIM_ToadKid_Green_Walk, \ + .run = ANIM_ToadKid_Green_Run, \ + .chase = ANIM_ToadKid_Green_Run, \ + .anim_4 = ANIM_ToadKid_Green_Idle, \ + .anim_5 = ANIM_ToadKid_Green_Idle, \ + .death = ANIM_ToadKid_Green_Still, \ + .hit = ANIM_ToadKid_Green_Still, \ + .anim_8 = ANIM_ToadKid_Green_Still, \ + .anim_9 = ANIM_ToadKid_Green_Still, \ + .anim_A = ANIM_ToadKid_Green_Still, \ + .anim_B = ANIM_ToadKid_Green_Still, \ + .anim_C = ANIM_ToadKid_Green_Still, \ + .anim_D = ANIM_ToadKid_Green_Still, \ + .anim_E = ANIM_ToadKid_Green_Still, \ + .anim_F = ANIM_ToadKid_Green_Still, \ +} + +#define TOAD_KID_BLUE_ANIMS \ +{ \ + .idle = ANIM_ToadKid_Blue_Idle, \ + .walk = ANIM_ToadKid_Blue_Walk, \ + .run = ANIM_ToadKid_Blue_Run, \ + .chase = ANIM_ToadKid_Blue_Run, \ + .anim_4 = ANIM_ToadKid_Blue_Idle, \ + .anim_5 = ANIM_ToadKid_Blue_Idle, \ + .death = ANIM_ToadKid_Blue_Still, \ + .hit = ANIM_ToadKid_Blue_Still, \ + .anim_8 = ANIM_ToadKid_Blue_Still, \ + .anim_9 = ANIM_ToadKid_Blue_Still, \ + .anim_A = ANIM_ToadKid_Blue_Still, \ + .anim_B = ANIM_ToadKid_Blue_Still, \ + .anim_C = ANIM_ToadKid_Blue_Still, \ + .anim_D = ANIM_ToadKid_Blue_Still, \ + .anim_E = ANIM_ToadKid_Blue_Still, \ + .anim_F = ANIM_ToadKid_Blue_Still, \ +} + +#define TOAD_KID_YELLOW_ANIMS \ +{ \ + .idle = ANIM_ToadKid_Yellow_Idle, \ + .walk = ANIM_ToadKid_Yellow_Walk, \ + .run = ANIM_ToadKid_Yellow_Run, \ + .chase = ANIM_ToadKid_Yellow_Run, \ + .anim_4 = ANIM_ToadKid_Yellow_Idle, \ + .anim_5 = ANIM_ToadKid_Yellow_Idle, \ + .death = ANIM_ToadKid_Yellow_Still, \ + .hit = ANIM_ToadKid_Yellow_Still, \ + .anim_8 = ANIM_ToadKid_Yellow_Still, \ + .anim_9 = ANIM_ToadKid_Yellow_Still, \ + .anim_A = ANIM_ToadKid_Yellow_Still, \ + .anim_B = ANIM_ToadKid_Yellow_Still, \ + .anim_C = ANIM_ToadKid_Yellow_Still, \ + .anim_D = ANIM_ToadKid_Yellow_Still, \ + .anim_E = ANIM_ToadKid_Yellow_Still, \ + .anim_F = ANIM_ToadKid_Yellow_Still, \ +} diff --git a/src/world/common/npc/ToadMinister.h b/src/world/common/npc/ToadMinister.h new file mode 100644 index 0000000000..74d61ed23c --- /dev/null +++ b/src/world/common/npc/ToadMinister.h @@ -0,0 +1,22 @@ +#include "common.h" +#include "sprite/npc/ToadMinister.h" + +#define TOAD_MINISTER_ANIMS \ +{ \ + .idle = ANIM_ToadMinister_Idle, \ + .walk = ANIM_ToadMinister_Idle, \ + .run = ANIM_ToadMinister_Idle, \ + .chase = ANIM_ToadMinister_Idle, \ + .anim_4 = ANIM_ToadMinister_Idle, \ + .anim_5 = ANIM_ToadMinister_Idle, \ + .death = ANIM_ToadMinister_Idle, \ + .hit = ANIM_ToadMinister_Idle, \ + .anim_8 = ANIM_ToadMinister_Idle, \ + .anim_9 = ANIM_ToadMinister_Idle, \ + .anim_A = ANIM_ToadMinister_Idle, \ + .anim_B = ANIM_ToadMinister_Idle, \ + .anim_C = ANIM_ToadMinister_Idle, \ + .anim_D = ANIM_ToadMinister_Idle, \ + .anim_E = ANIM_ToadMinister_Idle, \ + .anim_F = ANIM_ToadMinister_Idle, \ +} diff --git a/src/world/common/npc/Toad_Collection.h b/src/world/common/npc/Toad_Collection.h new file mode 100644 index 0000000000..d8d1e1c41b --- /dev/null +++ b/src/world/common/npc/Toad_Collection.h @@ -0,0 +1,5 @@ +#include "Toad.h" +#include "Toadette.h" +#include "ToadKid.h" +#include "ToadGuard.h" +#include "ToadMinister.h" diff --git a/src/world/common/npc/Toad_Guard.inc.c b/src/world/common/npc/Toad_Guard.inc.c index 9aedf00691..94fa9109cb 100644 --- a/src/world/common/npc/Toad_Guard.inc.c +++ b/src/world/common/npc/Toad_Guard.inc.c @@ -1,4 +1,4 @@ -#include "Toad.h" +#include "Toad_Collection.h" #include "world/common/enemy/ai/GuardAI.inc.c" diff --git a/src/world/common/npc/Toad_Patrol.inc.c b/src/world/common/npc/Toad_Patrol.inc.c index aebabcdb9e..21d6a784b7 100644 --- a/src/world/common/npc/Toad_Patrol.inc.c +++ b/src/world/common/npc/Toad_Patrol.inc.c @@ -1,4 +1,4 @@ -#include "Toad.h" +#include "Toad_Collection.h" #include "world/common/enemy/ai/PatrolNoAttackAI.inc.c" diff --git a/src/world/common/npc/Toad_Stationary.inc.c b/src/world/common/npc/Toad_Stationary.inc.c index defd80d961..11d51d595e 100644 --- a/src/world/common/npc/Toad_Stationary.inc.c +++ b/src/world/common/npc/Toad_Stationary.inc.c @@ -1,4 +1,4 @@ -#include "Toad.h" +#include "Toad_Collection.h" NpcSettings N(NpcSettings_Toad_Stationary) = { .height = 30, diff --git a/src/world/common/npc/Toad_Wander.inc.c b/src/world/common/npc/Toad_Wander.inc.c index 83696c0036..53c6d20803 100644 --- a/src/world/common/npc/Toad_Wander.inc.c +++ b/src/world/common/npc/Toad_Wander.inc.c @@ -1,4 +1,4 @@ -#include "Toad.h" +#include "Toad_Collection.h" MobileAISettings N(AISettings_Toad_Wander) = { .moveSpeed = 1.5f, diff --git a/src/world/common/npc/Toadette.h b/src/world/common/npc/Toadette.h new file mode 100644 index 0000000000..1fc7ee7538 --- /dev/null +++ b/src/world/common/npc/Toadette.h @@ -0,0 +1,82 @@ +#include "common.h" +#include "sprite/npc/Toadette.h" + +#define TOADETTE_ORANGE_ANIMS \ +{ \ + .idle = ANIM_Toadette_Orange_Idle, \ + .walk = ANIM_Toadette_Orange_Walk, \ + .run = ANIM_Toadette_Orange_Run, \ + .chase = ANIM_Toadette_Orange_Run, \ + .anim_4 = ANIM_Toadette_Orange_Idle, \ + .anim_5 = ANIM_Toadette_Orange_Idle, \ + .death = ANIM_Toadette_Orange_Disappointed, \ + .hit = ANIM_Toadette_Orange_Disappointed, \ + .anim_8 = ANIM_Toadette_Orange_Run, \ + .anim_9 = ANIM_Toadette_Orange_Run, \ + .anim_A = ANIM_Toadette_Orange_Run, \ + .anim_B = ANIM_Toadette_Orange_Run, \ + .anim_C = ANIM_Toadette_Orange_Run, \ + .anim_D = ANIM_Toadette_Orange_Run, \ + .anim_E = ANIM_Toadette_Orange_Run, \ + .anim_F = ANIM_Toadette_Orange_Run, \ +} + +#define TOADETTE_PINK_ANIMS \ +{ \ + .idle = ANIM_Toadette_Pink_Idle, \ + .walk = ANIM_Toadette_Pink_Walk, \ + .run = ANIM_Toadette_Pink_Run, \ + .chase = ANIM_Toadette_Pink_Run, \ + .anim_4 = ANIM_Toadette_Pink_Idle, \ + .anim_5 = ANIM_Toadette_Pink_Idle, \ + .death = ANIM_Toadette_Pink_Disappointed, \ + .hit = ANIM_Toadette_Pink_Disappointed, \ + .anim_8 = ANIM_Toadette_Pink_Run, \ + .anim_9 = ANIM_Toadette_Pink_Run, \ + .anim_A = ANIM_Toadette_Pink_Run, \ + .anim_B = ANIM_Toadette_Pink_Run, \ + .anim_C = ANIM_Toadette_Pink_Run, \ + .anim_D = ANIM_Toadette_Pink_Run, \ + .anim_E = ANIM_Toadette_Pink_Run, \ + .anim_F = ANIM_Toadette_Pink_Run, \ +} + +#define TOADETTE_GREEN_ANIMS \ +{ \ + .idle = ANIM_Toadette_Green_Idle, \ + .walk = ANIM_Toadette_Green_Walk, \ + .run = ANIM_Toadette_Green_Run, \ + .chase = ANIM_Toadette_Green_Run, \ + .anim_4 = ANIM_Toadette_Green_Idle, \ + .anim_5 = ANIM_Toadette_Green_Idle, \ + .death = ANIM_Toadette_Green_Disappointed, \ + .hit = ANIM_Toadette_Green_Disappointed, \ + .anim_8 = ANIM_Toadette_Green_Run, \ + .anim_9 = ANIM_Toadette_Green_Run, \ + .anim_A = ANIM_Toadette_Green_Run, \ + .anim_B = ANIM_Toadette_Green_Run, \ + .anim_C = ANIM_Toadette_Green_Run, \ + .anim_D = ANIM_Toadette_Green_Run, \ + .anim_E = ANIM_Toadette_Green_Run, \ + .anim_F = ANIM_Toadette_Green_Run, \ +} + +#define TOADETTE_PURPLE_ANIMS \ +{ \ + .idle = ANIM_Toadette_Purple_Idle, \ + .walk = ANIM_Toadette_Purple_Walk, \ + .run = ANIM_Toadette_Purple_Run, \ + .chase = ANIM_Toadette_Purple_Run, \ + .anim_4 = ANIM_Toadette_Purple_Idle, \ + .anim_5 = ANIM_Toadette_Purple_Idle, \ + .death = ANIM_Toadette_Purple_Disappointed, \ + .hit = ANIM_Toadette_Purple_Disappointed, \ + .anim_8 = ANIM_Toadette_Purple_Run, \ + .anim_9 = ANIM_Toadette_Purple_Run, \ + .anim_A = ANIM_Toadette_Purple_Run, \ + .anim_B = ANIM_Toadette_Purple_Run, \ + .anim_C = ANIM_Toadette_Purple_Run, \ + .anim_D = ANIM_Toadette_Purple_Run, \ + .anim_E = ANIM_Toadette_Purple_Run, \ + .anim_F = ANIM_Toadette_Purple_Run, \ +} diff --git a/src/world/common/npc/Tolielup.h b/src/world/common/npc/Tolielup.h index 0b86a823ed..f200db131b 100644 --- a/src/world/common/npc/Tolielup.h +++ b/src/world/common/npc/Tolielup.h @@ -1,13 +1,6 @@ #include "common.h" #include "sprite/npc/Tolielup.h" -#define TOLIELUP_DROPS \ -{ \ - .dropFlags = NPC_DROP_FLAG_80, \ - .heartDrops = NO_DROPS, \ - .flowerDrops = NO_DROPS, \ -} - #define TOLIELUP_ANIMS \ { \ .idle = ANIM_Tolielup_Idle, \ diff --git a/src/world/common/npc/TrainToad.h b/src/world/common/npc/TrainToad.h index 00e6bdd4fd..846444ec8a 100644 --- a/src/world/common/npc/TrainToad.h +++ b/src/world/common/npc/TrainToad.h @@ -1,13 +1,6 @@ #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, \ diff --git a/src/world/common/npc/TubbasHeart.h b/src/world/common/npc/TubbasHeart.h index 38da66d24b..ed8e127c7a 100644 --- a/src/world/common/npc/TubbasHeart.h +++ b/src/world/common/npc/TubbasHeart.h @@ -1,13 +1,6 @@ #include "common.h" #include "sprite/npc/TubbasHeart.h" -#define TUBBAS_HEART_DROPS \ -{ \ - .dropFlags = NPC_DROP_FLAG_80, \ - .heartDrops = NO_DROPS, \ - .flowerDrops = NO_DROPS, \ -} - #define TUBBAS_HEART_ANIMS \ { \ .idle = ANIM_TubbasHeart_Anim01, \ diff --git a/src/world/common/npc/Twink.h b/src/world/common/npc/Twink.h index 9255c078fe..3bdb68fb17 100644 --- a/src/world/common/npc/Twink.h +++ b/src/world/common/npc/Twink.h @@ -1,13 +1,6 @@ #include "common.h" #include "sprite/npc/Twink.h" -#define TWINK_DROPS \ -{ \ - .dropFlags = NPC_DROP_FLAG_80, \ - .heartDrops = NO_DROPS, \ - .flowerDrops = NO_DROPS, \ -} - #define TWINK_ANIMS \ { \ .idle = ANIM_Twink_Idle, \ diff --git a/src/world/common/npc/Yakkey.h b/src/world/common/npc/Yakkey.h index 06ccfebd5d..abcb0c49fb 100644 --- a/src/world/common/npc/Yakkey.h +++ b/src/world/common/npc/Yakkey.h @@ -1,13 +1,6 @@ #include "common.h" #include "sprite/npc/Yakkey.h" -#define YAKKEY_DROPS \ -{ \ - .dropFlags = NPC_DROP_FLAG_80, \ - .heartDrops = NO_DROPS, \ - .flowerDrops = NO_DROPS, \ -} - #define YAKKEY_ANIMS \ { \ .idle = ANIM_Yakkey_Idle, \ diff --git a/src/world/common/npc/Yoshi.h b/src/world/common/npc/Yoshi.h index 39c80e7845..831183aa06 100644 --- a/src/world/common/npc/Yoshi.h +++ b/src/world/common/npc/Yoshi.h @@ -4,13 +4,6 @@ #include "sprite/npc/VillageLeader.h" #include "sprite/npc/LeadersFriend.h" -#define YOSHI_DROPS \ -{ \ - .dropFlags = NPC_DROP_FLAG_80, \ - .heartDrops = NO_DROPS, \ - .flowerDrops = NO_DROPS, \ -} - #define YOSHI_GREEN_ANIMS \ { \ .idle = ANIM_Yoshi_Green_Idle, \ diff --git a/src/world/common/todo/AddPlayerHandsOffset.inc.c b/src/world/common/todo/AddPlayerHandsOffset.inc.c index c0dd756054..ec3c882eeb 100644 --- a/src/world/common/todo/AddPlayerHandsOffset.inc.c +++ b/src/world/common/todo/AddPlayerHandsOffset.inc.c @@ -1,7 +1,7 @@ #include "common.h" #include "npc.h" -ApiStatus N(AddPlayerHandsOffset)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(AddPlayerHandsOffset)) { PlayerStatus* playerStatus = &gPlayerStatus; Bytecode* args = script->ptrReadPos; s32 xVar = *args++; diff --git a/src/world/common/todo/CheckDripCollisionWithNPC.inc.c b/src/world/common/todo/CheckDripCollisionWithNPC.inc.c index 22c42fb831..49b9435a22 100644 --- a/src/world/common/todo/CheckDripCollisionWithNPC.inc.c +++ b/src/world/common/todo/CheckDripCollisionWithNPC.inc.c @@ -2,7 +2,7 @@ #include "npc.h" #include "model.h" -ApiStatus N(CheckDripCollisionWithNPC)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(CheckDripCollisionWithNPC)) { PlayerStatus* playerStatus = &gPlayerStatus; Bytecode* args = script->ptrReadPos; s32 treeIndex = evt_get_variable(script, *args++); diff --git a/src/world/common/todo/CheckPartnerFlags1000.inc.c b/src/world/common/todo/CheckPartnerFlags1000.inc.c index ba750edc4e..edc5e3500a 100644 --- a/src/world/common/todo/CheckPartnerFlags1000.inc.c +++ b/src/world/common/todo/CheckPartnerFlags1000.inc.c @@ -1,7 +1,7 @@ #include "common.h" #include "npc.h" -ApiStatus N(CheckPartnerFlags1000)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(CheckPartnerFlags1000)) { if (get_npc_unsafe(NPC_PARTNER)->flags & NPC_FLAG_1000) { return ApiStatus_DONE2; } else { diff --git a/src/world/common/todo/DeadUnkFunc1.inc.c b/src/world/common/todo/DeadUnkFunc1.inc.c deleted file mode 100644 index bdf0b0a9d2..0000000000 --- a/src/world/common/todo/DeadUnkFunc1.inc.c +++ /dev/null @@ -1,7 +0,0 @@ -#include "common.h" -#include "effects.h" - -ApiStatus N(DeadUnkFunc1)(Evt* script, s32 isInitialCall) { - fx_sun_undeclared(FX_SUN_FROM_RIGHT, 0, 0, 0, 0, 0); - return ApiStatus_DONE2; -} diff --git a/src/world/common/todo/GetEncounterEnemyIsOwner.inc.c b/src/world/common/todo/GetEncounterEnemyIsOwner.inc.c index df05fc7542..a7bf2de6da 100644 --- a/src/world/common/todo/GetEncounterEnemyIsOwner.inc.c +++ b/src/world/common/todo/GetEncounterEnemyIsOwner.inc.c @@ -1,7 +1,7 @@ #include "common.h" #include "npc.h" -ApiStatus N(GetEncounterEnemyIsOwner)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(GetEncounterEnemyIsOwner)) { Enemy* enemy = script->owner1.enemy; evt_set_variable(script, LVar0, gCurrentEncounter.currentEnemy == enemy); diff --git a/src/world/common/todo/GetEntityPosition.inc.c b/src/world/common/todo/GetEntityPosition.inc.c index ee225be3f3..662ee13508 100644 --- a/src/world/common/todo/GetEntityPosition.inc.c +++ b/src/world/common/todo/GetEntityPosition.inc.c @@ -1,7 +1,7 @@ #include "common.h" #include "npc.h" -ApiStatus N(GetEntityPosition)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(GetEntityPosition)) { Bytecode* args = script->ptrReadPos; Entity* entity = get_entity_by_index(evt_get_variable(script, *args++)); diff --git a/src/world/common/todo/GetItemEmptyCount.inc.c b/src/world/common/todo/GetItemEmptyCount.inc.c index 8d3eef36fd..b6cdd9d8e0 100644 --- a/src/world/common/todo/GetItemEmptyCount.inc.c +++ b/src/world/common/todo/GetItemEmptyCount.inc.c @@ -1,6 +1,6 @@ #include "common.h" -ApiStatus N(GetItemEmptyCount)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(GetItemEmptyCount)) { script->varTable[1] = get_item_empty_count(); return ApiStatus_DONE2; diff --git a/src/world/common/todo/GetItemName.inc.c b/src/world/common/todo/GetItemName.inc.c index 92b5ad1314..41049a84ef 100644 --- a/src/world/common/todo/GetItemName.inc.c +++ b/src/world/common/todo/GetItemName.inc.c @@ -1,10 +1,11 @@ #include "common.h" #include "npc.h" -ApiStatus N(GetItemName)(Evt* script, s32 isInitialCall) { - Bytecode args = *script->ptrReadPos; - s32 itemID = evt_get_variable(script, args); +API_CALLABLE(N(GetItemName)) { + Bytecode* args = script->ptrReadPos; + s32 inOutVar = *args++; + s32 itemID = evt_get_variable(script, inOutVar); - evt_set_variable(script, args, LOOKUP_ITEM(itemID).nameMsg); + evt_set_variable(script, inOutVar, LOOKUP_ITEM(itemID).nameMsg); return ApiStatus_DONE2; } diff --git a/src/world/common/todo/GetLeftRightPoints.inc.c b/src/world/common/todo/GetLeftRightPoints.inc.c index dafd1233da..137dcd2762 100644 --- a/src/world/common/todo/GetLeftRightPoints.inc.c +++ b/src/world/common/todo/GetLeftRightPoints.inc.c @@ -1,7 +1,7 @@ #include "common.h" #include "npc.h" -ApiStatus N(GetLeftRightPoints)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(GetLeftRightPoints)) { Bytecode* args = script->ptrReadPos; s32 posX = evt_get_variable(script, *args++); s32 posZ = evt_get_variable(script, *args++); diff --git a/src/world/common/todo/GetNpcCollisionHeight.inc.c b/src/world/common/todo/GetNpcCollisionHeight.inc.c index 2f53a4ef14..e9f47cc39a 100644 --- a/src/world/common/todo/GetNpcCollisionHeight.inc.c +++ b/src/world/common/todo/GetNpcCollisionHeight.inc.c @@ -1,7 +1,7 @@ #include "common.h" #include "npc.h" -ApiStatus N(GetNpcCollisionHeight)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(GetNpcCollisionHeight)) { Bytecode* args = script->ptrReadPos; s32 npcID = evt_get_variable(script, *args++); Npc* npc = get_npc_safe(npcID); diff --git a/src/world/common/todo/GetPeachDisguise.inc.c b/src/world/common/todo/GetPeachDisguise.inc.c index 419753dc15..bdcb0a7271 100644 --- a/src/world/common/todo/GetPeachDisguise.inc.c +++ b/src/world/common/todo/GetPeachDisguise.inc.c @@ -1,7 +1,7 @@ #include "common.h" #include "npc.h" -ApiStatus N(GetPeachDisguise)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(GetPeachDisguise)) { Bytecode* args = script->ptrReadPos; evt_set_variable(script, *args++, gPlayerStatus.peachDisguise); diff --git a/src/world/common/todo/GetPlayerCoins.inc.c b/src/world/common/todo/GetPlayerCoins.inc.c index a2e055f7f5..d1e972a32f 100644 --- a/src/world/common/todo/GetPlayerCoins.inc.c +++ b/src/world/common/todo/GetPlayerCoins.inc.c @@ -1,7 +1,7 @@ #include "common.h" #include "npc.h" -ApiStatus N(GetPlayerCoins)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(GetPlayerCoins)) { script->varTable[0] = gPlayerData.coins; return ApiStatus_DONE2; } diff --git a/src/world/common/todo/HeartPlant_SpawnHeart.inc.c b/src/world/common/todo/HeartPlant_SpawnHeart.inc.c index 1dce080aa6..c012f23a3e 100644 --- a/src/world/common/todo/HeartPlant_SpawnHeart.inc.c +++ b/src/world/common/todo/HeartPlant_SpawnHeart.inc.c @@ -1,6 +1,6 @@ #include "common.h" -ApiStatus N(HeartPlant_SpawnHeart)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(HeartPlant_SpawnHeart)) { Enemy* enemy = script->owner1.enemy; Npc* npc = get_npc_unsafe(enemy->npcID); diff --git a/src/world/common/todo/IsBerserkerEquipped.inc.c b/src/world/common/todo/IsBerserkerEquipped.inc.c index ba73b8affb..00e7bf0820 100644 --- a/src/world/common/todo/IsBerserkerEquipped.inc.c +++ b/src/world/common/todo/IsBerserkerEquipped.inc.c @@ -2,7 +2,7 @@ #include "npc.h" #include "battle/action_cmd.h" -ApiStatus N(IsBerserkerEquipped)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(IsBerserkerEquipped)) { script->varTable[0] = gBattleStatus.actionCommandMode; script->varTable[1] = 15; diff --git a/src/world/common/todo/IsHammerMaxCharged.inc.c b/src/world/common/todo/IsHammerMaxCharged.inc.c index 7297779d11..fc5168d5aa 100644 --- a/src/world/common/todo/IsHammerMaxCharged.inc.c +++ b/src/world/common/todo/IsHammerMaxCharged.inc.c @@ -1,7 +1,7 @@ #include "common.h" #include "npc.h" -ApiStatus N(IsHammerMaxCharged)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(IsHammerMaxCharged)) { script->varTable[0] = FALSE; if (gBattleStatus.hammerCharge >= 99) { diff --git a/src/world/common/todo/IsItemBadge.inc.c b/src/world/common/todo/IsItemBadge.inc.c index 3e56f0f727..08f9bc03db 100644 --- a/src/world/common/todo/IsItemBadge.inc.c +++ b/src/world/common/todo/IsItemBadge.inc.c @@ -1,7 +1,7 @@ #include "common.h" #include "npc.h" -ApiStatus N(IsItemBadge)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(IsItemBadge)) { Bytecode* args = script->ptrReadPos; s32 itemIndex = evt_get_variable(script, *args++); diff --git a/src/world/common/todo/IsJumpMaxCharged.inc.c b/src/world/common/todo/IsJumpMaxCharged.inc.c index 487796eb63..3265de4fc9 100644 --- a/src/world/common/todo/IsJumpMaxCharged.inc.c +++ b/src/world/common/todo/IsJumpMaxCharged.inc.c @@ -1,7 +1,7 @@ #include "common.h" #include "npc.h" -ApiStatus N(IsJumpMaxCharged)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(IsJumpMaxCharged)) { script->varTable[0] = FALSE; if (gBattleStatus.jumpCharge >= 99) { diff --git a/src/world/common/todo/ItemChoice_WaitForSelection.inc.c b/src/world/common/todo/ItemChoice_WaitForSelection.inc.c index 4094e8b5a8..a115a925ee 100644 --- a/src/world/common/todo/ItemChoice_WaitForSelection.inc.c +++ b/src/world/common/todo/ItemChoice_WaitForSelection.inc.c @@ -1,7 +1,7 @@ #include "common.h" NOP_FIX -ApiStatus N(ItemChoice_WaitForSelection)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(ItemChoice_WaitForSelection)) { Bytecode* args = script->ptrReadPos; if (isInitialCall) { diff --git a/src/world/common/todo/PlayBigSmokePuff.inc.c b/src/world/common/todo/PlayBigSmokePuff.inc.c index 89c05d6ae4..75ee19b42b 100644 --- a/src/world/common/todo/PlayBigSmokePuff.inc.c +++ b/src/world/common/todo/PlayBigSmokePuff.inc.c @@ -2,7 +2,7 @@ #include "effects.h" #include "evt.h" -ApiStatus N(PlayBigSmokePuff)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(PlayBigSmokePuff)) { Bytecode* args = script->ptrReadPos; s32 x = evt_get_variable(script, *args++); s32 y = evt_get_variable(script, *args++); diff --git a/src/world/common/todo/PlayRisingBubble.inc.c b/src/world/common/todo/PlayRisingBubble.inc.c index b75d077ef6..d5b611d2d9 100644 --- a/src/world/common/todo/PlayRisingBubble.inc.c +++ b/src/world/common/todo/PlayRisingBubble.inc.c @@ -2,7 +2,7 @@ #include "effects.h" #include "evt.h" -ApiStatus N(PlayRisingBubble)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(PlayRisingBubble)) { Bytecode* args = script->ptrReadPos; s32 x = evt_get_variable(script, *args++); s32 y = evt_get_variable(script, *args++); diff --git a/src/world/common/todo/RemovePadlock.inc.c b/src/world/common/todo/RemovePadlock.inc.c index 7953a0afac..aba8e44a09 100644 --- a/src/world/common/todo/RemovePadlock.inc.c +++ b/src/world/common/todo/RemovePadlock.inc.c @@ -1,7 +1,7 @@ #include "common.h" #include "npc.h" -ApiStatus N(RemovePadlock)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(RemovePadlock)) { Entity* entity = get_entity_by_index(script->varTable[0]); entity->flags |= ENTITY_FLAG_100000; diff --git a/src/world/common/todo/Set80151310_0.inc.c b/src/world/common/todo/Set80151310_0.inc.c index 56ac97fb59..37abe3fc84 100644 --- a/src/world/common/todo/Set80151310_0.inc.c +++ b/src/world/common/todo/Set80151310_0.inc.c @@ -1,7 +1,7 @@ #include "common.h" #include "npc.h" -ApiStatus N(Set80151310_0)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(Set80151310_0)) { gEntityHideMode = ENTITY_HIDE_MODE_0; return ApiStatus_DONE2; } diff --git a/src/world/common/todo/SetCamera0Flag1000.inc.c b/src/world/common/todo/SetCamera0Flag1000.inc.c index 5c653d4a1d..82db7c10d2 100644 --- a/src/world/common/todo/SetCamera0Flag1000.inc.c +++ b/src/world/common/todo/SetCamera0Flag1000.inc.c @@ -2,7 +2,7 @@ #include "npc.h" #include "camera.h" -ApiStatus N(SetCamera0Flag1000)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(SetCamera0Flag1000)) { Camera* camera = &gCameras[CAM_DEFAULT]; camera->flags |= CAMERA_FLAG_1000; diff --git a/src/world/common/todo/SetCamera0MoveFlag1.inc.c b/src/world/common/todo/SetCamera0MoveFlag1.inc.c index 88d1d873c8..04e8e273ee 100644 --- a/src/world/common/todo/SetCamera0MoveFlag1.inc.c +++ b/src/world/common/todo/SetCamera0MoveFlag1.inc.c @@ -1,7 +1,7 @@ #include "common.h" #include "npc.h" -ApiStatus N(SetCamera0MoveFlag1)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(SetCamera0MoveFlag1)) { Camera* camera = &gCameras[CAM_DEFAULT]; camera->moveFlags |= CAMERA_MOVE_IGNORE_PLAYER_Y; diff --git a/src/world/common/todo/SetEntityPositionF.inc.c b/src/world/common/todo/SetEntityPositionF.inc.c index bba939cd64..0560d3d531 100644 --- a/src/world/common/todo/SetEntityPositionF.inc.c +++ b/src/world/common/todo/SetEntityPositionF.inc.c @@ -1,7 +1,7 @@ #include "common.h" #include "map.h" -ApiStatus N(SetEntityPositionF)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(SetEntityPositionF)) { Bytecode* args = script->ptrReadPos; s32 entityIndex = evt_get_variable(script, *args++); f32 x = evt_get_variable(script, *args++); diff --git a/src/world/common/todo/ShouldMovesAutoSucceed.inc.c b/src/world/common/todo/ShouldMovesAutoSucceed.inc.c index a93f7ec53f..8818800b11 100644 --- a/src/world/common/todo/ShouldMovesAutoSucceed.inc.c +++ b/src/world/common/todo/ShouldMovesAutoSucceed.inc.c @@ -1,7 +1,7 @@ #include "common.h" #include "npc.h" -ApiStatus N(ShouldMovesAutoSucceed)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(ShouldMovesAutoSucceed)) { script->varTable[0] = FALSE; if (is_ability_active(ABILITY_RIGHT_ON)) { diff --git a/src/world/common/todo/SomeItemEntityFunc.inc.c b/src/world/common/todo/SomeItemEntityFunc.inc.c index 0b04eaf4c1..c3eaf38b86 100644 --- a/src/world/common/todo/SomeItemEntityFunc.inc.c +++ b/src/world/common/todo/SomeItemEntityFunc.inc.c @@ -1,7 +1,7 @@ #include "common.h" #include "npc.h" -ApiStatus N(SomeItemEntityFunc)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(SomeItemEntityFunc)) { ItemEntity* itemEntity = get_item_entity(script->varTable[0]); if (isInitialCall) { diff --git a/src/world/common/todo/SpinyTromp_CheckDist.inc.c b/src/world/common/todo/SpinyTromp_CheckDist.inc.c index 957dced915..bb2304570b 100644 --- a/src/world/common/todo/SpinyTromp_CheckDist.inc.c +++ b/src/world/common/todo/SpinyTromp_CheckDist.inc.c @@ -1,7 +1,7 @@ #include "common.h" #include "npc.h" -ApiStatus N(SpinyTromp_CheckDist)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(SpinyTromp_CheckDist)) { f32 x = script->varTable[0] - gPlayerStatus.position.x; f32 y = script->varTable[2] - gPlayerStatus.position.y; f32 z = 0.0f - gPlayerStatus.position.z; diff --git a/src/world/common/todo/StarSpiritEffectFunc.inc.c b/src/world/common/todo/StarSpiritEffectFunc.inc.c index 37d16cd0b4..2909c8cf48 100644 --- a/src/world/common/todo/StarSpiritEffectFunc.inc.c +++ b/src/world/common/todo/StarSpiritEffectFunc.inc.c @@ -2,6 +2,10 @@ #include "npc.h" #include "effects.h" +#ifndef STAR_SPIRIT_DATA_VAR + #error STAR_SPIRIT_DATA_VAR is not defined! +#endif + // seems to be a macro in the original based on usage #define EVT_SPIRIT_ADJUST_CAM(pitch) \ EVT_CALL(GetCamDistance, CAM_DEFAULT, LVar1) \ @@ -12,7 +16,7 @@ EVT_CALL(SetCamPitch, CAM_DEFAULT, LVar2, pitch) \ EVT_END_IF -ApiStatus N(StarSpiritEffectFunc1)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(StarSpiritEffectFunc1)) { StarSpiritData* ptr = script->varTablePtr[0]; sfx_adjust_env_sound_pos(SOUND_A2, SOUND_SPACE_MODE_0, ptr->unk_00, ptr->unk_04, ptr->unk_08); @@ -24,14 +28,14 @@ ApiStatus N(StarSpiritEffectFunc1)(Evt* script, s32 isInitialCall) { } } -ApiStatus N(StarSpiritEffectFunc2)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(StarSpiritEffectFunc2)) { Bytecode* args = script->ptrReadPos; if (isInitialCall) { StarSpiritData* ptr = heap_malloc(sizeof(*ptr)); script->varTablePtr[0] = ptr; - evt_set_variable(NULL, MapVar(1), script->varTable[0]); + evt_set_variable(NULL, STAR_SPIRIT_DATA_VAR, script->varTable[0]); ptr->unk_38 = evt_get_variable(script, *args++); ptr->unk_3C = evt_get_variable(script, *args++); ptr->unk_0C = evt_get_float_variable(script, *args++); @@ -53,7 +57,7 @@ ApiStatus N(StarSpiritEffectFunc2)(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -ApiStatus N(StarSpiritEffectFunc3)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(StarSpiritEffectFunc3)) { PlayerStatus* playerStatus = &gPlayerStatus; StarSpiritData* ptr = script->varTablePtr[0]; @@ -146,14 +150,14 @@ ApiStatus N(StarSpiritEffectFunc3)(Evt* script, s32 isInitialCall) { return ApiStatus_BLOCK; } -ApiStatus N(StarSpiritEffectFunc4)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(StarSpiritEffectFunc4)) { s32 var = evt_get_variable(script, *script->ptrReadPos); StarSpiritData* ptr = script->varTablePtr[0]; return (ptr->unk_4E == var) * ApiStatus_DONE2; } -ApiStatus N(StarSpiritEffectFunc5)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(StarSpiritEffectFunc5)) { Bytecode* args = script->ptrReadPos; if (isInitialCall) { @@ -174,7 +178,7 @@ ApiStatus N(StarSpiritEffectFunc5)(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -ApiStatus N(StarSpiritEffectFunc6)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(StarSpiritEffectFunc6)) { PlayerStatus* playerStatus = &gPlayerStatus; StarSpiritData* ptr = script->varTablePtr[0]; diff --git a/src/world/common/todo/StashVars.inc.c b/src/world/common/todo/StashVars.inc.c index 95f86a4a6b..5257eb2caa 100644 --- a/src/world/common/todo/StashVars.inc.c +++ b/src/world/common/todo/StashVars.inc.c @@ -4,7 +4,7 @@ // remove this and uncomment other when all data from all maps that use this are migrated to C extern s32** N(varStash); -ApiStatus N(StashVars)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(StashVars)) { //static s32** varTable = NULL; s32 i; diff --git a/src/world/common/todo/SwitchToPartner.inc.c b/src/world/common/todo/SwitchToPartner.inc.c index 59a3bbdee5..3321d43e88 100644 --- a/src/world/common/todo/SwitchToPartner.inc.c +++ b/src/world/common/todo/SwitchToPartner.inc.c @@ -1,6 +1,6 @@ #include "common.h" -ApiStatus N(SwitchToPartner)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(SwitchToPartner)) { switch_to_partner(evt_get_variable(script, *script->ptrReadPos)); return ApiStatus_DONE2; } diff --git a/src/world/common/todo/SyncStatusMenu.inc.c b/src/world/common/todo/SyncStatusMenu.inc.c index 8dc9e768c4..aadb6719e6 100644 --- a/src/world/common/todo/SyncStatusMenu.inc.c +++ b/src/world/common/todo/SyncStatusMenu.inc.c @@ -1,7 +1,7 @@ #include "common.h" #include "npc.h" -ApiStatus N(SyncStatusMenu)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(SyncStatusMenu)) { sync_status_menu(); return ApiStatus_DONE2; } diff --git a/src/world/common/todo/UnkAngleFunc005.inc.c b/src/world/common/todo/UnkAngleFunc005.inc.c index 06666ce48a..d546674579 100644 --- a/src/world/common/todo/UnkAngleFunc005.inc.c +++ b/src/world/common/todo/UnkAngleFunc005.inc.c @@ -1,7 +1,7 @@ #include "common.h" #include "npc.h" -ApiStatus N(UnkAngleFunc005)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(UnkAngleFunc005)) { Npc* npc = get_npc_safe(script->owner2.npcID); switch (script->functionTemp[1]) { diff --git a/src/world/common/todo/UnkFloatFunc001.inc.c b/src/world/common/todo/UnkFloatFunc001.inc.c index e634ee118d..d2a732b58c 100644 --- a/src/world/common/todo/UnkFloatFunc001.inc.c +++ b/src/world/common/todo/UnkFloatFunc001.inc.c @@ -2,7 +2,7 @@ #include "npc.h" // Similar to CosInterpMinMax -ApiStatus N(UnkFloatFunc001)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(UnkFloatFunc001)) { Bytecode* args = script->ptrReadPos; s32 a1 = *args++; s32 var0 = evt_get_variable(script, a1); diff --git a/src/world/common/todo/UnkFloatFuncAbs.inc.c b/src/world/common/todo/UnkFloatFuncAbs.inc.c deleted file mode 100644 index 460983d669..0000000000 --- a/src/world/common/todo/UnkFloatFuncAbs.inc.c +++ /dev/null @@ -1,25 +0,0 @@ -#include "common.h" -#include "npc.h" - -// Same as CosInterpMinMax with an extra abs on diff -ApiStatus N(UnkFloatFuncAbs)(Evt* script, s32 isInitialCall) { - Bytecode* args = script->ptrReadPos; - s32 a1 = *args++; - s32 var0 = evt_get_variable(script, a1); - s32 a2 = *args++; - f32 var1 = evt_get_float_variable(script, *args++); - f32 var2 = evt_get_float_variable(script, *args++); - s32 var3 = evt_get_variable(script, *args++); - s32 var4 = evt_get_variable(script, *args++); - f32 temp = (evt_get_float_variable(script, *args++) / 180.0f) * PI; - f32 diff = fabsf(var2 - var1) / 2; - - if (var4 != 0 && var3 < var0) { - var0 = var3; - evt_set_variable(script, a1, var3); - } - - evt_set_float_variable(script, a2, (var1 + diff) - (diff * cos_rad(((var0 * PI) / var3) + temp))); - - return ApiStatus_DONE2; -} diff --git a/src/world/common/todo/UnkFunc1.inc.c b/src/world/common/todo/UnkFunc1.inc.c index 42c44e13ee..b5a87bc090 100644 --- a/src/world/common/todo/UnkFunc1.inc.c +++ b/src/world/common/todo/UnkFunc1.inc.c @@ -1,7 +1,7 @@ #include "common.h" #include "npc.h" -ApiStatus N(UnkFunc1)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(UnkFunc1)) { increment_status_menu_disabled(); set_screen_overlay_params_back(0, 255.0f); return ApiStatus_DONE2; diff --git a/src/world/common/todo/UnkFunc12.inc.c b/src/world/common/todo/UnkFunc12.inc.c index cf2e01990f..9eff61c17a 100644 --- a/src/world/common/todo/UnkFunc12.inc.c +++ b/src/world/common/todo/UnkFunc12.inc.c @@ -1,7 +1,7 @@ #include "common.h" #include "npc.h" -ApiStatus N(UnkFunc12)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(UnkFunc12)) { PlayerStatus* playerStatus = &gPlayerStatus; f32 posX, posY, posZ, hitDepth; diff --git a/src/world/common/todo/UnkFunc42.inc.c b/src/world/common/todo/UnkFunc42.inc.c index 68566e4f16..eb75d642e9 100644 --- a/src/world/common/todo/UnkFunc42.inc.c +++ b/src/world/common/todo/UnkFunc42.inc.c @@ -1,7 +1,7 @@ #include "common.h" #include "npc.h" -ApiStatus N(UnkFunc42)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(UnkFunc42)) { script->varTable[10] = atan2(script->varTable[0], script->varTable[2], script->varTable[3], script->varTable[5]); return ApiStatus_DONE2; } diff --git a/src/world/common/todo/UnkFunc46.inc.c b/src/world/common/todo/UnkFunc46.inc.c index 620302a7c1..64fe29f9cb 100644 --- a/src/world/common/todo/UnkFunc46.inc.c +++ b/src/world/common/todo/UnkFunc46.inc.c @@ -1,7 +1,7 @@ #include "common.h" #include "npc.h" -ApiStatus N(UnkFunc46)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(UnkFunc46)) { f32 var1 = script->varTable[0]; f32 var2 = script->varTable[2]; f32 var3 = 0.0f; diff --git a/src/world/common/todo/UnkFunc48.inc.c b/src/world/common/todo/UnkFunc48.inc.c index a33901f895..7e6643cff4 100644 --- a/src/world/common/todo/UnkFunc48.inc.c +++ b/src/world/common/todo/UnkFunc48.inc.c @@ -1,7 +1,7 @@ #include "common.h" #include "npc.h" -ApiStatus N(UnkFunc48)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(UnkFunc48)) { gPlayerStatus.pitch = evt_get_variable(script, *script->ptrReadPos); return ApiStatus_DONE2; } diff --git a/src/world/common/todo/UnkFunc49.inc.c b/src/world/common/todo/UnkFunc49.inc.c index e8fdfd3be4..183654a7f1 100644 --- a/src/world/common/todo/UnkFunc49.inc.c +++ b/src/world/common/todo/UnkFunc49.inc.c @@ -1,7 +1,7 @@ #include "common.h" #include "npc.h" -ApiStatus N(UnkFunc49)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(UnkFunc49)) { script->varTable[5] = (cos_deg(-(f32) script->varTable[3] - 35.0) * 3.0) - 2.3; script->varTable[6] = sin_deg(-(f32) script->varTable[3] - 35.0) * 5.0; diff --git a/src/world/common/todo/UnkFunc50.inc.c b/src/world/common/todo/UnkFunc50.inc.c index 9a2c766b65..ecd2f29f42 100644 --- a/src/world/common/todo/UnkFunc50.inc.c +++ b/src/world/common/todo/UnkFunc50.inc.c @@ -1,7 +1,7 @@ #include "common.h" #include "npc.h" -ApiStatus N(UnkFunc50)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(UnkFunc50)) { f32 x = UNK_FUNC_50_LVar1 - script->varTable[0]; f32 z = UNK_FUNC_50_LVar2 - script->varTable[2]; diff --git a/src/world/common/todo/UnkFunc51.inc.c b/src/world/common/todo/UnkFunc51.inc.c index f5abbaed34..0d87718ead 100644 --- a/src/world/common/todo/UnkFunc51.inc.c +++ b/src/world/common/todo/UnkFunc51.inc.c @@ -1,7 +1,7 @@ #include "common.h" #include "npc.h" -ApiStatus N(UnkFunc51)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(UnkFunc51)) { Bytecode* args = script->ptrReadPos; script->functionTemp[0] = evt_get_variable(script, *args++); diff --git a/src/world/common/todo/UnkFunc52.inc.c b/src/world/common/todo/UnkFunc52.inc.c index f2393d7c87..bef2b94360 100644 --- a/src/world/common/todo/UnkFunc52.inc.c +++ b/src/world/common/todo/UnkFunc52.inc.c @@ -1,7 +1,7 @@ #include "common.h" #include "battle/battle.h" -ApiStatus N(UnkFunc52)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(UnkFunc52)) { Bytecode* args = script->ptrReadPos; Actor* actor; diff --git a/src/world/common/todo/UnkFunc56.inc.c b/src/world/common/todo/UnkFunc56.inc.c index 18958667a4..14f637d6b0 100644 --- a/src/world/common/todo/UnkFunc56.inc.c +++ b/src/world/common/todo/UnkFunc56.inc.c @@ -1,7 +1,7 @@ #include "common.h" #include "model.h" -ApiStatus N(UnkFunc56)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(UnkFunc56)) { BattleStatus* battleStatus = &gBattleStatus; Bytecode* args = script->ptrReadPos; Model* model = get_model_from_list_index(get_model_list_index_from_tree_index(evt_get_variable(script, *args++))); diff --git a/src/world/common/todo/UnkFunc62.inc.c b/src/world/common/todo/UnkFunc62.inc.c index 4deb338029..246941e770 100644 --- a/src/world/common/todo/UnkFunc62.inc.c +++ b/src/world/common/todo/UnkFunc62.inc.c @@ -1,7 +1,7 @@ #include "common.h" #include "npc.h" -ApiStatus N(UnkFunc62)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(UnkFunc62)) { Bytecode* args = script->ptrReadPos; Actor* actor = get_actor(script->owner1.enemyID); ActorState* state = &actor->state; diff --git a/src/world/common/todo/UnkMoveFunc1.inc.c b/src/world/common/todo/UnkMoveFunc1.inc.c index 684c391c70..0d91d762ba 100644 --- a/src/world/common/todo/UnkMoveFunc1.inc.c +++ b/src/world/common/todo/UnkMoveFunc1.inc.c @@ -2,7 +2,7 @@ #include "npc.h" #include "battle/action_cmd.h" -ApiStatus N(UnkMoveFunc1)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(UnkMoveFunc1)) { BattleStatus* battleStatus = &gBattleStatus; Actor* playerActor = battleStatus->playerActor; f32 posX = playerActor->currentPos.x; diff --git a/src/world/common/todo/UnkMoveFunc2.inc.c b/src/world/common/todo/UnkMoveFunc2.inc.c index fb69293d6e..f526cf46f1 100644 --- a/src/world/common/todo/UnkMoveFunc2.inc.c +++ b/src/world/common/todo/UnkMoveFunc2.inc.c @@ -1,7 +1,7 @@ #include "common.h" #include "npc.h" -ApiStatus N(UnkMoveFunc2)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(UnkMoveFunc2)) { Bytecode* args = script->ptrReadPos; s32 var1 = evt_get_variable(script, *args++); s32 var2 = evt_get_variable(script, *args++); diff --git a/src/world/common/todo/UnkMoveFunc3.inc.c b/src/world/common/todo/UnkMoveFunc3.inc.c index d18d48185c..fb794d8e22 100644 --- a/src/world/common/todo/UnkMoveFunc3.inc.c +++ b/src/world/common/todo/UnkMoveFunc3.inc.c @@ -1,7 +1,7 @@ #include "common.h" #include "npc.h" -ApiStatus N(UnkMoveFunc3)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(UnkMoveFunc3)) { Bytecode* args = script->ptrReadPos; s32 var1 = evt_get_variable(script, *args++); s32 var2 = evt_get_variable(script, *args++); diff --git a/src/world/common/todo/UnkPartnerPosFuncs.inc.c b/src/world/common/todo/UnkPartnerPosFuncs.inc.c index e577bc6a26..45bb985c6e 100644 --- a/src/world/common/todo/UnkPartnerPosFuncs.inc.c +++ b/src/world/common/todo/UnkPartnerPosFuncs.inc.c @@ -1,13 +1,13 @@ #include "common.h" -ApiStatus N(SuperBlock_PartnerSparkles2)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(SuperBlock_PartnerSparkles2)) { Npc* partner = get_npc_safe(NPC_PARTNER); fx_sparkles(FX_SPARKLES_2, partner->pos.x, partner->pos.y + 30.0f, partner->pos.z, 30.0f); return ApiStatus_DONE2; } -ApiStatus N(SuperBlock_PartnerSparkles4)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(SuperBlock_PartnerSparkles4)) { Npc* partner = get_npc_safe(NPC_PARTNER); fx_sparkles(FX_SPARKLES_4, partner->pos.x, partner->pos.y + 30.0f, partner->pos.z, 30.0f); diff --git a/src/world/common/todo/UnsetCamera0Flag1000.inc.c b/src/world/common/todo/UnsetCamera0Flag1000.inc.c index f4a677bcd2..9213823866 100644 --- a/src/world/common/todo/UnsetCamera0Flag1000.inc.c +++ b/src/world/common/todo/UnsetCamera0Flag1000.inc.c @@ -2,7 +2,7 @@ #include "npc.h" #include "camera.h" -ApiStatus N(UnsetCamera0Flag1000)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(UnsetCamera0Flag1000)) { Camera* camera = &gCameras[CAM_DEFAULT]; camera->flags &= ~CAMERA_FLAG_1000; diff --git a/src/world/common/todo/UnsetCamera0MoveFlag1.inc.c b/src/world/common/todo/UnsetCamera0MoveFlag1.inc.c index bae4b06b87..4147cc9857 100644 --- a/src/world/common/todo/UnsetCamera0MoveFlag1.inc.c +++ b/src/world/common/todo/UnsetCamera0MoveFlag1.inc.c @@ -1,7 +1,7 @@ #include "common.h" #include "npc.h" -ApiStatus N(UnsetCamera0MoveFlag1)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(UnsetCamera0MoveFlag1)) { Camera* camera = &gCameras[CAM_DEFAULT]; camera->moveFlags &= ~CAMERA_MOVE_IGNORE_PLAYER_Y; diff --git a/src/world/common/todo/WaitForPlayerToLand.inc.c b/src/world/common/todo/WaitForPlayerToLand.inc.c index 457a8e68c8..9d99c3ae92 100644 --- a/src/world/common/todo/WaitForPlayerToLand.inc.c +++ b/src/world/common/todo/WaitForPlayerToLand.inc.c @@ -1,7 +1,7 @@ #include "common.h" #include "npc.h" -ApiStatus N(WaitForPlayerToLand)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(WaitForPlayerToLand)) { script->varTable[0] = 0; if ((gPartnerActionStatus.partnerActionState != PARTNER_ACTION_NONE) && (gPartnerActionStatus.actingPartner == PARTNER_BOMBETTE)) { script->varTable[0] = 1; diff --git a/src/world/common/util/CheckPositionRelativeToPlane.inc.c b/src/world/common/util/CheckPositionRelativeToPlane.inc.c index 6f7d7fcbdf..5493583cf0 100644 --- a/src/world/common/util/CheckPositionRelativeToPlane.inc.c +++ b/src/world/common/util/CheckPositionRelativeToPlane.inc.c @@ -35,7 +35,7 @@ #define PLANE_SIDE_NEGATIVE 0 #define PLANE_SIDE_POSITIVE 1 -ApiStatus N(CheckPositionRelativeToPlane)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(CheckPositionRelativeToPlane)) { Bytecode* args = script->ptrReadPos; PlayerStatus* playerStatus = &gPlayerStatus; f32 Ax = evt_get_variable(script, *args++); diff --git a/src/world/common/util/GetDefeatedEnemyCount.inc.c b/src/world/common/util/GetDefeatedEnemyCount.inc.c index 06b5dfde22..692e3bc554 100644 --- a/src/world/common/util/GetDefeatedEnemyCount.inc.c +++ b/src/world/common/util/GetDefeatedEnemyCount.inc.c @@ -1,6 +1,6 @@ #include "common.h" -ApiStatus N(GetDefeatedEnemyCount)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(GetDefeatedEnemyCount)) { Bytecode* args = script->ptrReadPos; EncounterStatus* encounterStatus = &gCurrentEncounter; s32 enemyCount = 0; diff --git a/src/world/common/util/GetKammyBroomEmitterPos.inc.c b/src/world/common/util/GetKammyBroomEmitterPos.inc.c index 31d7b03840..357b7d4651 100644 --- a/src/world/common/util/GetKammyBroomEmitterPos.inc.c +++ b/src/world/common/util/GetKammyBroomEmitterPos.inc.c @@ -6,7 +6,7 @@ #define KAMMY_NPC 0 #endif -ApiStatus N(GetKammyBroomEmitterPos)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(GetKammyBroomEmitterPos)) { Npc* npc = get_npc_unsafe(KAMMY_NPC); script->varTable[0] = npc->pos.x + (sin_deg(npc->yaw + gCameras[CAM_DEFAULT].currentYaw + 180.0f) * 40.0f); diff --git a/src/world/common/util/SetLightningBoltPurple.inc.c b/src/world/common/util/SetLightningBoltPurple.inc.c new file mode 100644 index 0000000000..1554591600 --- /dev/null +++ b/src/world/common/util/SetLightningBoltPurple.inc.c @@ -0,0 +1,15 @@ +#include "common.h" +#include "effects.h" + +API_CALLABLE(N(SetLightningBoltPurple)) { + EffectInstance* effect = (EffectInstance*)script->varTable[15]; + + effect->data.lightningBolt->outerColor.r = 85; + effect->data.lightningBolt->outerColor.g = 42; + effect->data.lightningBolt->outerColor.b = 255; + effect->data.lightningBolt->innerColor.r = 255; + effect->data.lightningBolt->innerColor.g = 175; + effect->data.lightningBolt->innerColor.b = 239; + + return ApiStatus_DONE2; +} diff --git a/src/world/dead/area_flo/flo_00/flo_00_3_npc.c b/src/world/dead/area_flo/flo_00/flo_00_3_npc.c index 78b50ca32d..1b995c24d7 100644 --- a/src/world/dead/area_flo/flo_00/flo_00_3_npc.c +++ b/src/world/dead/area_flo/flo_00/flo_00_3_npc.c @@ -618,26 +618,22 @@ EvtScript N(EVS_NpcInit_Lakilulu) = { EVT_END }; -StaticNpc N(NpcData_Wisterwood) = { +NpcData N(NpcData_Wisterwood) = { .id = NPC_Dummy_Wisterwood, - .settings = &N(NpcSettings_Dummy), .pos = { -72.0f, 60.0f, -100.0f }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_200 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_Wisterwood), - .drops = BUBULB_DROPS, + .settings = &N(NpcSettings_Dummy), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_200 | ENEMY_FLAG_800, + .drops = NO_DROPS, .animations = BUBULB_PINK_ANIMS, }; -StaticNpc N(NpcData_Bubulbs)[] = { +NpcData N(NpcData_Bubulbs)[] = { { .id = NPC_Bubulb_01, - .settings = &N(NpcSettings_Bubulb_Patrol), .pos = { -59.0f, 0.0f, -40.0f }, .yaw = 90, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_800 | ENEMY_FLAG_2000, - .init = &N(EVS_NpcInit_Bubulb_01), - .drops = BUBULB_DROPS, .territory = { .patrol = { .isFlying = TRUE, @@ -652,17 +648,17 @@ StaticNpc N(NpcData_Bubulbs)[] = { .detectSize = { 100 }, } }, + .init = &N(EVS_NpcInit_Bubulb_01), + .settings = &N(NpcSettings_Bubulb_Patrol), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .drops = NO_DROPS, .animations = BUBULB_PINK_ANIMS, .tattle = MSG_NpcTattle_FLO_BubulbA, }, { .id = NPC_Bubulb_02, - .settings = &N(NpcSettings_Bubulb_Patrol), .pos = { 67.0f, 0.0f, 85.0f }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_800 | ENEMY_FLAG_2000, - .init = &N(EVS_NpcInit_Bubulb_02), - .drops = BUBULB_DROPS, .territory = { .patrol = { .isFlying = TRUE, @@ -677,17 +673,17 @@ StaticNpc N(NpcData_Bubulbs)[] = { .detectSize = { 100 }, } }, + .init = &N(EVS_NpcInit_Bubulb_02), + .settings = &N(NpcSettings_Bubulb_Patrol), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .drops = NO_DROPS, .animations = BUBULB_PURPLE_ANIMS, .tattle = MSG_NpcTattle_FLO_BubulbB, }, { .id = NPC_Bubulb_03, - .settings = &N(NpcSettings_Bubulb_Patrol), .pos = { 90.0f, 0.0f, 410.0f }, .yaw = 90, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_800 | ENEMY_FLAG_2000, - .init = &N(EVS_NpcInit_Bubulb_03), - .drops = BUBULB_DROPS, .territory = { .patrol = { .isFlying = TRUE, @@ -702,17 +698,17 @@ StaticNpc N(NpcData_Bubulbs)[] = { .detectSize = { 100 }, } }, + .init = &N(EVS_NpcInit_Bubulb_03), + .settings = &N(NpcSettings_Bubulb_Patrol), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .drops = NO_DROPS, .animations = BUBULB_GREEN_ANIMS, .tattle = MSG_NpcTattle_FLO_BubulbC, }, { .id = NPC_Bubulb_04, - .settings = &N(NpcSettings_Bubulb_Patrol), .pos = { 200.0f, 0.0f, 430.0f }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_800 | ENEMY_FLAG_2000, - .init = &N(EVS_NpcInit_Bubulb_04), - .drops = BUBULB_DROPS, .territory = { .patrol = { .isFlying = TRUE, @@ -727,46 +723,46 @@ StaticNpc N(NpcData_Bubulbs)[] = { .detectSize = { 100 }, } }, + .init = &N(EVS_NpcInit_Bubulb_04), + .settings = &N(NpcSettings_Bubulb_Patrol), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .drops = NO_DROPS, .animations = BUBULB_YELLOW_ANIMS, .tattle = MSG_NpcTattle_FLO_BubulbD, }, }; -StaticNpc N(NpcData_Tolielup) = { +NpcData N(NpcData_Tolielup) = { .id = NPC_Tolielup, - .settings = &N(NpcSettings_Tolielup), .pos = { -400.0f, 0.0f, 190.0f }, .yaw = 90, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_Tolielup), - .drops = TOLIELUP_DROPS, + .settings = &N(NpcSettings_Tolielup), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, + .drops = NO_DROPS, .animations = TOLIELUP_ANIMS, .tattle = MSG_NpcTattle_Tolielup, }; -StaticNpc N(NpcData_Klevar) = { +NpcData N(NpcData_Klevar) = { .id = NPC_Klevar, - .settings = &N(NpcSettings_StarSpirit), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_Klevar), - .drops = KLEVAR_DROPS, + .settings = &N(NpcSettings_StarSpirit), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = NO_DROPS, .animations = KLEVAR_ANIMS, }; -StaticNpc N(NpcData_Lakilulu) = { +NpcData N(NpcData_Lakilulu) = { .id = NPC_Lakilulu, - .settings = &N(NpcSettings_Dummy), .pos = { 198.0f, 0.0f, 363.0f }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_Lakilulu), - .drops = { - .dropFlags = NPC_DROP_FLAG_80, - .heartDrops = NO_DROPS, - .flowerDrops = NO_DROPS, - }, + .settings = &N(NpcSettings_Dummy), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = NO_DROPS, .animations = { .idle = ANIM_Lakilulu_Idle, .walk = ANIM_Lakilulu_Idle, 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 b591fad44a..78aedaebf9 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 @@ -75,15 +75,15 @@ EvtScript N(EVS_NpcInit_Parakarry_Epilogue) = { EVT_END }; -StaticNpc N(NpcData_Lakilester_Epilogue)[] = { +NpcData N(NpcData_Lakilester_Epilogue)[] = { { .id = NPC_Lakilester_Epilogue, - .settings = &N(NpcSettings_Lakilester_Epilogue), .pos = { 144.0f, 0.0f, 374.0f }, .yaw = 90, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_Lakilester_Epilogue), - .drops = NPC_NO_DROPS, + .settings = &N(NpcSettings_Lakilester_Epilogue), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_800, + .drops = NO_DROPS, .animations = { .idle = ANIM_WorldLakilester_Idle, .walk = ANIM_WorldLakilester_Idle, @@ -105,12 +105,12 @@ StaticNpc N(NpcData_Lakilester_Epilogue)[] = { }, { .id = NPC_Lakilulu_Epilogue, - .settings = &N(NpcSettings_Lakilester_Epilogue), .pos = { 198.0f, 0.0f, 363.0f }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_Lakilulu_Epilogue), - .drops = NPC_NO_DROPS, + .settings = &N(NpcSettings_Lakilester_Epilogue), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_800, + .drops = NO_DROPS, .animations = { .idle = ANIM_Lakilulu_Idle, .walk = ANIM_Lakilulu_Idle, @@ -132,12 +132,12 @@ StaticNpc N(NpcData_Lakilester_Epilogue)[] = { }, { .id = NPC_Parakarry_Epilogue, - .settings = &N(NpcSettings_Parakarry), .pos = { 266.0f, 0.0f, 322.0f }, .yaw = 0, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_Parakarry_Epilogue), - .drops = NPC_NO_DROPS, + .settings = &N(NpcSettings_Parakarry), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_800, + .drops = NO_DROPS, .animations = PARAKARRY_ANIMS, }, }; diff --git a/src/world/dead/area_flo/flo_03/flo_03_3_npc.c b/src/world/dead/area_flo/flo_03/flo_03_3_npc.c index c6f1176beb..082454d5ef 100644 --- a/src/world/dead/area_flo/flo_03/flo_03_3_npc.c +++ b/src/world/dead/area_flo/flo_03/flo_03_3_npc.c @@ -780,18 +780,14 @@ EvtScript N(EVS_NpcInit_MontyMole_04) = { EVT_END }; -StaticNpc N(NpcData_Petunia) = { +NpcData N(NpcData_Petunia) = { .id = NPC_Petunia, - .settings = &N(NpcSettings_Petunia), .pos = { -30.0f, 0.0f, 100.0f }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_Petunia), - .drops = { - .dropFlags = NPC_DROP_FLAG_80, - .heartDrops = NO_DROPS, - .flowerDrops = NO_DROPS, - }, + .settings = &N(NpcSettings_Petunia), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = NO_DROPS, .animations = { .idle = ANIM_Petunia_Idle, .walk = ANIM_Petunia_Idle, @@ -813,18 +809,14 @@ StaticNpc N(NpcData_Petunia) = { .tattle = MSG_NpcTattle_Petunia, }; -StaticNpc N(NpcData_Dayzee) = { +NpcData N(NpcData_Dayzee) = { .id = NPC_Dayzee, - .settings = &N(NpcSettings_Dayzee), .pos = { -233.0f, 0.0f, -217.0f }, .yaw = 90, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_Dayzee), - .drops = { - .dropFlags = NPC_DROP_FLAG_80, - .heartDrops = NO_DROPS, - .flowerDrops = NO_DROPS, - }, + .settings = &N(NpcSettings_Dayzee), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = NO_DROPS, .animations = { .idle = ANIM_Dayzee_Anim01, .walk = ANIM_Dayzee_Anim02, @@ -845,18 +837,14 @@ StaticNpc N(NpcData_Dayzee) = { }, }; -StaticNpc N(NpcData_MontyMole_01) = { +NpcData N(NpcData_MontyMole_01) = { .id = NPC_MontyMole_01, - .settings = &N(NpcSettings_Dayzee), .pos = { -100.0f, 0.0f, 210.0f }, .yaw = 90, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_MontyMole_01), - .drops = { - .dropFlags = NPC_DROP_FLAG_80, - .heartDrops = NO_DROPS, - .flowerDrops = NO_DROPS, - }, + .settings = &N(NpcSettings_Dayzee), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = NO_DROPS, .animations = { .idle = ANIM_MontyMole_Dark_Anim01, .walk = ANIM_MontyMole_Dark_Anim02, @@ -877,18 +865,14 @@ StaticNpc N(NpcData_MontyMole_01) = { }, }; -StaticNpc N(NpcData_MontyMole_02) = { +NpcData N(NpcData_MontyMole_02) = { .id = NPC_MontyMole_02, - .settings = &N(NpcSettings_Dayzee), .pos = { -130.0f, 0.0f, 0.0f }, .yaw = 90, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_MontyMole_02), - .drops = { - .dropFlags = NPC_DROP_FLAG_80, - .heartDrops = NO_DROPS, - .flowerDrops = NO_DROPS, - }, + .settings = &N(NpcSettings_Dayzee), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = NO_DROPS, .animations = { .idle = ANIM_MontyMole_Dark_Anim01, .walk = ANIM_MontyMole_Dark_Anim02, @@ -909,18 +893,14 @@ StaticNpc N(NpcData_MontyMole_02) = { }, }; -StaticNpc N(NpcData_MontyMole_03) = { +NpcData N(NpcData_MontyMole_03) = { .id = NPC_MontyMole_03, - .settings = &N(NpcSettings_Dayzee), .pos = { 75.0f, 0.0f, 20.0f }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_MontyMole_03), - .drops = { - .dropFlags = NPC_DROP_FLAG_80, - .heartDrops = NO_DROPS, - .flowerDrops = NO_DROPS, - }, + .settings = &N(NpcSettings_Dayzee), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = NO_DROPS, .animations = { .idle = ANIM_MontyMole_Dark_Anim01, .walk = ANIM_MontyMole_Dark_Anim02, @@ -941,18 +921,14 @@ StaticNpc N(NpcData_MontyMole_03) = { }, }; -StaticNpc N(NpcData_MontyMole_04) = { +NpcData N(NpcData_MontyMole_04) = { .id = NPC_MontyMole_04, - .settings = &N(NpcSettings_Dayzee), .pos = { 71.0f, 0.0f, 200.0f }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_MontyMole_04), - .drops = { - .dropFlags = NPC_DROP_FLAG_80, - .heartDrops = NO_DROPS, - .flowerDrops = NO_DROPS, - }, + .settings = &N(NpcSettings_Dayzee), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = NO_DROPS, .animations = { .idle = ANIM_MontyMole_Dark_Anim01, .walk = ANIM_MontyMole_Dark_Anim02, diff --git a/src/world/dead/area_flo/flo_07/flo_07_2_main.c b/src/world/dead/area_flo/flo_07/flo_07_2_main.c index ed2c94d07e..6cd2bff8ab 100644 --- a/src/world/dead/area_flo/flo_07/flo_07_2_main.c +++ b/src/world/dead/area_flo/flo_07/flo_07_2_main.c @@ -1,7 +1,6 @@ #include "flo_07.h" #include "world/common/atomic/TexturePan.inc.c" -#include "world/common/atomic/TexturePan.data.inc.c" #include "world/area_flo/common/FlowerSpawnRegion.inc.c" diff --git a/src/world/dead/area_flo/flo_07/flo_07_3_npc.c b/src/world/dead/area_flo/flo_07/flo_07_3_npc.c index d37d74d060..894325b579 100644 --- a/src/world/dead/area_flo/flo_07/flo_07_3_npc.c +++ b/src/world/dead/area_flo/flo_07/flo_07_3_npc.c @@ -66,7 +66,7 @@ EvtScript N(EVS_MakeCrystalBerry) = { EVT_SET(GF_FLO07_CrystalBerryFellOnLeftSide, TRUE) EVT_END_IF EVT_CALL(PlaySound, SOUND_3BC | SOUND_ID_TRIGGER_CHANGE_SOUND) - EVT_CALL(func_802D62E4, 956) + EVT_CALL(func_802D62E4, SOUND_3BC) EVT_SET(AF_FLO_MadeCrystalBerry, TRUE) EVT_WAIT(20) EVT_CALL(SpeakToPlayer, NPC_Posie, ANIM_Posie_Talk, ANIM_Posie_Idle, 0, MSG_CH6_006A) @@ -231,14 +231,14 @@ EvtScript N(EVS_SetupFoliage) = { EVT_END }; -StaticNpc N(NpcData_Posie) = { +NpcData N(NpcData_Posie) = { .id = NPC_Posie, - .settings = &N(NpcSettings_Posie), .pos = { -260.0f, 0.0f, 0.0f }, .yaw = 90, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_Posie), - .drops = POSIE_DROPS, + .settings = &N(NpcSettings_Posie), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = NO_DROPS, .animations = POSIE_ANIMS, .tattle = MSG_NpcTattle_Posie, }; diff --git a/src/world/dead/area_flo/flo_08/flo_08_4_npc.c b/src/world/dead/area_flo/flo_08/flo_08_4_npc.c index 1113f52df2..c9df3d763c 100644 --- a/src/world/dead/area_flo/flo_08/flo_08_4_npc.c +++ b/src/world/dead/area_flo/flo_08/flo_08_4_npc.c @@ -1,8 +1,8 @@ #include "flo_08.h" -#include "world/common/enemy/complete/AmazyDayzee.inc.c" +#include "world/common/enemy/AmazyDayzee.inc.c" #include "world/common/npc/GateFlower.inc.c" -#include "world/common/enemy/complete/CrazyDayzee.inc.c" +#include "world/common/enemy/CrazyDayzee.inc.c" #include "world/common/complete/NormalItemChoice.inc.c" @@ -157,25 +157,22 @@ EvtScript N(EVS_NpcInit_GateFlower) = { EVT_END }; -StaticNpc N(NpcData_GateFlower) = { +NpcData N(NpcData_GateFlower) = { .id = NPC_GateFlower, - .settings = &N(NpcSettings_GateFlower), .pos = { -695.0f, 0.0f, -30.0f }, .yaw = 270, - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_GateFlower), - .drops = GATE_FLOWER_DROPS, + .settings = &N(NpcSettings_GateFlower), + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, + .drops = NO_DROPS, .animations = GATE_FLOWER_YELLOW_ANIMS, .tattle = MSG_NpcTattle_YellowGateFlower, }; -StaticNpc N(NpcData_Dayzee_01) = { +NpcData N(NpcData_Dayzee_01) = { .id = NPC_Dayzee_01, - .settings = &N(NpcSettings_CrazyDayzee), .pos = { 205.0f, 0.0f, -80.0f }, .yaw = 90, - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, - .drops = CRAZY_DAYZEE_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -188,17 +185,17 @@ StaticNpc N(NpcData_Dayzee_01) = { .detectSize = { 200 }, } }, + .settings = &N(NpcSettings_CrazyDayzee), + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = CRAZY_DAYZEE_DROPS, .animations = CRAZY_DAYZEE_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT | AI_DETECT_SENSITIVE_MOTION, }; -StaticNpc N(NpcData_Dayzee_02) = { +NpcData N(NpcData_Dayzee_02) = { .id = NPC_Dayzee_02, - .settings = &N(NpcSettings_CrazyDayzee), .pos = { 275.0f, 0.0f, -115.0f }, .yaw = 270, - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, - .drops = CRAZY_DAYZEE_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -211,17 +208,17 @@ StaticNpc N(NpcData_Dayzee_02) = { .detectSize = { 200 }, } }, + .settings = &N(NpcSettings_CrazyDayzee), + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = CRAZY_DAYZEE_DROPS, .animations = CRAZY_DAYZEE_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT | AI_DETECT_SENSITIVE_MOTION, }; -StaticNpc N(NpcData_Dayzee_03) = { +NpcData N(NpcData_Dayzee_03) = { .id = NPC_Dayzee_03, - .settings = &N(NpcSettings_CrazyDayzee), .pos = { -230.0f, 60.0f, -110.0f }, .yaw = 90, - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, - .drops = CRAZY_DAYZEE_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -234,17 +231,17 @@ StaticNpc N(NpcData_Dayzee_03) = { .detectSize = { 200 }, } }, + .settings = &N(NpcSettings_CrazyDayzee), + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .drops = CRAZY_DAYZEE_DROPS, .animations = CRAZY_DAYZEE_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT | AI_DETECT_SENSITIVE_MOTION, }; -StaticNpc N(NpcData_Dayzee_04) = { +NpcData N(NpcData_Dayzee_04) = { .id = NPC_Dayzee_04, - .settings = &N(NpcSettings_CrazyDayzee), .pos = { -330.0f, 60.0f, -110.0f }, .yaw = 270, - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, - .drops = CRAZY_DAYZEE_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -257,17 +254,17 @@ StaticNpc N(NpcData_Dayzee_04) = { .detectSize = { 200 }, } }, + .settings = &N(NpcSettings_CrazyDayzee), + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .drops = CRAZY_DAYZEE_DROPS, .animations = CRAZY_DAYZEE_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT | AI_DETECT_SENSITIVE_MOTION, }; -StaticNpc N(NpcData_Dayzee_05) = { +NpcData N(NpcData_Dayzee_05) = { .id = NPC_Dayzee_05, - .settings = &N(NpcSettings_CrazyDayzee), .pos = { -430.0f, 60.0f, -110.0f }, .yaw = 90, - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, - .drops = CRAZY_DAYZEE_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -280,17 +277,17 @@ StaticNpc N(NpcData_Dayzee_05) = { .detectSize = { 200 }, } }, + .settings = &N(NpcSettings_CrazyDayzee), + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .drops = CRAZY_DAYZEE_DROPS, .animations = CRAZY_DAYZEE_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT | AI_DETECT_SENSITIVE_MOTION, }; -StaticNpc N(NpcData_Dayzee_06) = { +NpcData N(NpcData_Dayzee_06) = { .id = NPC_Dayzee_06, - .settings = &N(NpcSettings_CrazyDayzee), .pos = { -530.0f, 60.0f, -110.0f }, .yaw = 270, - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, - .drops = CRAZY_DAYZEE_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -303,17 +300,17 @@ StaticNpc N(NpcData_Dayzee_06) = { .detectSize = { 200 }, } }, + .settings = &N(NpcSettings_CrazyDayzee), + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .drops = CRAZY_DAYZEE_DROPS, .animations = CRAZY_DAYZEE_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT | AI_DETECT_SENSITIVE_MOTION, }; -StaticNpc N(NpcData_Dayzee_07) = { +NpcData N(NpcData_Dayzee_07) = { .id = NPC_Dayzee_07, - .settings = &N(NpcSettings_CrazyDayzee), .pos = { -630.0f, 60.0f, -110.0f }, .yaw = 90, - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, - .drops = CRAZY_DAYZEE_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -326,6 +323,9 @@ StaticNpc N(NpcData_Dayzee_07) = { .detectSize = { 150 }, } }, + .settings = &N(NpcSettings_CrazyDayzee), + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .drops = CRAZY_DAYZEE_DROPS, .animations = CRAZY_DAYZEE_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT | AI_DETECT_SENSITIVE_MOTION, }; @@ -351,14 +351,10 @@ EvtScript N(EVS_NpcInit_AmazyDayzee) = { EVT_END }; -StaticNpc N(NpcData_AmazyDayzee) = { +NpcData N(NpcData_AmazyDayzee) = { .id = NPC_AmazyDayzee, - .settings = &N(NpcSettings_AmazyDayzee), .pos = { 240.0f, 0.0f, -90.0f }, .yaw = 270, - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, - .init = &N(EVS_NpcInit_AmazyDayzee), - .drops = AMAZY_DAYZEE_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -371,6 +367,10 @@ StaticNpc N(NpcData_AmazyDayzee) = { .detectSize = { 200 }, } }, + .init = &N(EVS_NpcInit_AmazyDayzee), + .settings = &N(NpcSettings_AmazyDayzee), + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .drops = AMAZY_DAYZEE_DROPS, .animations = AMAZY_DAYZEE_ANIMS, .aiDetectFlags = AI_DETECT_SENSITIVE_MOTION, }; diff --git a/src/world/dead/area_flo/flo_09/flo_09_5_npc.c b/src/world/dead/area_flo/flo_09/flo_09_5_npc.c index b7f90e075c..c18a555dba 100644 --- a/src/world/dead/area_flo/flo_09/flo_09_5_npc.c +++ b/src/world/dead/area_flo/flo_09/flo_09_5_npc.c @@ -1,8 +1,8 @@ #include "flo_09.h" -#include "world/common/enemy/complete/CrazyDayzee.inc.c" +#include "world/common/enemy/CrazyDayzee.inc.c" -#include "world/common/enemy/complete/Bzzap.inc.c" +#include "world/common/enemy/Bzzap.inc.c" NpcSettings N(NpcSettings_Bzzap_02) = { .height = 24, @@ -58,13 +58,10 @@ EvtScript N(EVS_NpcInit_Bzzap_02) = { EVT_END }; -StaticNpc N(NpcData_Dayzee_01) = { +NpcData N(NpcData_Dayzee_01) = { .id = NPC_Dayzee_01, - .settings = &N(NpcSettings_CrazyDayzee), .pos = { -350.0f, 0.0f, 40.0f }, .yaw = 90, - .flags = ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, - .drops = CRAZY_DAYZEE_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -77,17 +74,17 @@ StaticNpc N(NpcData_Dayzee_01) = { .detectSize = { 200 }, } }, + .settings = &N(NpcSettings_CrazyDayzee), + .flags = ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .drops = CRAZY_DAYZEE_DROPS, .animations = CRAZY_DAYZEE_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT | AI_DETECT_SENSITIVE_MOTION, }; -StaticNpc N(NpcData_Dayzee_02) = { +NpcData N(NpcData_Dayzee_02) = { .id = NPC_Dayzee_02, - .settings = &N(NpcSettings_CrazyDayzee), .pos = { 260.0f, 0.0f, 75.0f }, .yaw = 270, - .flags = ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, - .drops = CRAZY_DAYZEE_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -100,17 +97,17 @@ StaticNpc N(NpcData_Dayzee_02) = { .detectSize = { 200 }, } }, + .settings = &N(NpcSettings_CrazyDayzee), + .flags = ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .drops = CRAZY_DAYZEE_DROPS, .animations = CRAZY_DAYZEE_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT | AI_DETECT_SENSITIVE_MOTION, }; -StaticNpc N(NpcData_Bzzap_01) = { +NpcData N(NpcData_Bzzap_01) = { .id = NPC_Bzzap_01, - .settings = &N(NpcSettings_Bzzap), .pos = { -50.0f, 55.0f, 90.0f }, .yaw = 90, - .flags = ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, - .drops = BZZAP_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -123,18 +120,17 @@ StaticNpc N(NpcData_Bzzap_01) = { .detectSize = { 250 }, } }, + .settings = &N(NpcSettings_Bzzap), + .flags = ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .drops = BZZAP_DROPS, .animations = BZZAP_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT | AI_DETECT_SENSITIVE_MOTION, }; -StaticNpc N(NpcData_Bzzap_02) = { +NpcData N(NpcData_Bzzap_02) = { .id = NPC_Bzzap_02, - .settings = &N(NpcSettings_Bzzap_02), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 90, - .flags = ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, - .init = &N(EVS_NpcInit_Bzzap_02), - .drops = BZZAP_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -147,6 +143,10 @@ StaticNpc N(NpcData_Bzzap_02) = { .detectSize = { 250 }, } }, + .init = &N(EVS_NpcInit_Bzzap_02), + .settings = &N(NpcSettings_Bzzap_02), + .flags = ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .drops = BZZAP_DROPS, .animations = BZZAP_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT | AI_DETECT_SENSITIVE_MOTION, }; 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 0e5f778c57..93bf534f1e 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 @@ -4,7 +4,6 @@ #include "world/common/complete/GiveReward.inc.c" #include "world/common/atomic/TexturePan.inc.c" -#include "world/common/atomic/TexturePan.data.inc.c" EvtScript N(EVS_RaiseFountain) = { EVT_CALL(MakeLerp, -50, 170, 385, EASING_LINEAR) diff --git a/src/world/dead/area_flo/flo_10/flo_10_5_npc.c b/src/world/dead/area_flo/flo_10/flo_10_5_npc.c index d4f3c56d4e..f01ba866f0 100644 --- a/src/world/dead/area_flo/flo_10/flo_10_5_npc.c +++ b/src/world/dead/area_flo/flo_10/flo_10_5_npc.c @@ -198,14 +198,14 @@ EvtScript N(EVS_NpcInit_Lily) = { EVT_END }; -StaticNpc N(NpcData_Lily) = { +NpcData N(NpcData_Lily) = { .id = NPC_Lily, - .settings = &N(NpcSettings_Lily), .pos = { 80.0f, -60.0f, 0.0f }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_Lily), - .drops = LILY_DROPS, + .settings = &N(NpcSettings_Lily), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = NO_DROPS, .animations = LILY_ANIMS, .tattle = MSG_NpcTattle_Lily, }; diff --git a/src/world/dead/area_flo/flo_11/flo_11_3_npc.c b/src/world/dead/area_flo/flo_11/flo_11_3_npc.c index a70e40f23f..e17e67e427 100644 --- a/src/world/dead/area_flo/flo_11/flo_11_3_npc.c +++ b/src/world/dead/area_flo/flo_11/flo_11_3_npc.c @@ -1,6 +1,6 @@ #include "flo_11.h" -#include "world/common/enemy/complete/Lakitu_Stationary.inc.c" +#include "world/common/enemy/Lakitu_Stationary.inc.c" Vec3f N(FlightPath_Lakitu_01_Search)[] = { { 460.0, 200.0, -240.0 }, @@ -368,24 +368,24 @@ EvtScript N(EVS_NpcInit_Lakitu_02) = { EVT_END }; -StaticNpc N(NpcData_Lakitus)[] = { +NpcData N(NpcData_Lakitus)[] = { { .id = NPC_Lakitu_01, - .settings = &N(NpcSettings_Lakitu), .pos = { 553.0f, 60.0f, 52.0f }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000, .init = &N(EVS_NpcInit_Lakitu_01), + .settings = &N(NpcSettings_Lakitu), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000, .drops = LAKITU_DROPS, .animations = LAKITU_ANIMS, }, { .id = NPC_Lakitu_02, - .settings = &N(NpcSettings_Lakitu), .pos = { 553.0f, 60.0f, 52.0f }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000, .init = &N(EVS_NpcInit_Lakitu_02), + .settings = &N(NpcSettings_Lakitu), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000, .drops = LAKITU_DROPS, .animations = LAKITU_ANIMS, }, diff --git a/src/world/dead/area_flo/flo_12/flo_12_3_npc.c b/src/world/dead/area_flo/flo_12/flo_12_3_npc.c index 841a9296cc..9942a86641 100644 --- a/src/world/dead/area_flo/flo_12/flo_12_3_npc.c +++ b/src/world/dead/area_flo/flo_12/flo_12_3_npc.c @@ -188,25 +188,25 @@ EvtScript N(EVS_NpcInit_Rosie) = { EVT_END }; -StaticNpc N(NpcData_Rosie)[] = { +NpcData N(NpcData_Rosie)[] = { { .id = NPC_Rosie, - .settings = &N(NpcSettings_Rosie), .pos = { -70.0f, 0.0f, 20.0f }, .yaw = 90, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_Rosie), - .drops = ROSIE_DROPS, + .settings = &N(NpcSettings_Rosie), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_400000, + .drops = NO_DROPS, .animations = ROSIE_ANIMS, .tattle = MSG_NpcTattle_Rosie, }, { .id = NPC_Dummy, - .settings = &N(NpcSettings_Dummy), .pos = { -70.0f, 0.0f, 20.0f }, .yaw = 90, + .settings = &N(NpcSettings_Dummy), .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_200, - .drops = ROSIE_DROPS, + .drops = NO_DROPS, .animations = ROSIE_ANIMS, }, }; diff --git a/src/world/dead/area_flo/flo_13/flo_13_4_npc.c b/src/world/dead/area_flo/flo_13/flo_13_4_npc.c index 80a3a6db3a..ec8e740303 100644 --- a/src/world/dead/area_flo/flo_13/flo_13_4_npc.c +++ b/src/world/dead/area_flo/flo_13/flo_13_4_npc.c @@ -13,7 +13,7 @@ NpcSettings N(NpcSettings_Lakilester) = { #define AI_LAKITU_FIRST_SPINY_ID NPC_Spiny_01 #define AI_LAKITU_LAST_SPINY_ID NPC_Spiny_06 #define DEBUG_LAKITU -#include "world/common/enemy/complete/Lakitu_SpinySpawner.inc.c" +#include "world/common/enemy/Lakitu_SpinySpawner.inc.c" #include "world/common/todo/UnkFunc42.inc.c" @@ -593,18 +593,14 @@ EvtScript N(EVS_NpcInit_Spiny) = { EVT_END }; -StaticNpc N(NpcData_Lakilester) = { +NpcData N(NpcData_Lakilester) = { .id = NPC_Lakilester, - .settings = &N(NpcSettings_Lakilester), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 90, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000, .init = &N(EVS_NpcInit_Lakilester), - .drops = { - .dropFlags = NPC_DROP_FLAG_80, - .heartDrops = NO_DROPS, - .flowerDrops = NO_DROPS, - }, + .settings = &N(NpcSettings_Lakilester), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000, + .drops = NO_DROPS, .animations = { .idle = ANIM_WorldLakilester_Idle, .walk = ANIM_WorldLakilester_Idle, @@ -625,18 +621,14 @@ StaticNpc N(NpcData_Lakilester) = { }, }; -StaticNpc N(NpcData_Lakilulu) = { +NpcData N(NpcData_Lakilulu) = { .id = NPC_Lakilulu, - .settings = &N(NpcSettings_Lakilester), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 90, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_Lakilulu), - .drops = { - .dropFlags = NPC_DROP_FLAG_80, - .heartDrops = NO_DROPS, - .flowerDrops = NO_DROPS, - }, + .settings = &N(NpcSettings_Lakilester), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = NO_DROPS, .animations = { .idle = ANIM_Lakilulu_Idle, .walk = ANIM_Lakilulu_Idle, @@ -658,18 +650,14 @@ StaticNpc N(NpcData_Lakilulu) = { .tattle = MSG_NpcTattle_Lakilulu, }; -StaticNpc N(NpcData_Lakilulu_Spiny) = { +NpcData N(NpcData_Lakilulu_Spiny) = { .id = NPC_Lakilulu_Spiny, - .settings = &N(NpcSettings_Lakilester), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 90, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_Lakilulu_Spiny), - .drops = { - .dropFlags = NPC_DROP_FLAG_80, - .heartDrops = NO_DROPS, - .flowerDrops = NO_DROPS, - }, + .settings = &N(NpcSettings_Lakilester), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = NO_DROPS, .animations = { .idle = ANIM_Lakilulu_Idle, .walk = ANIM_Lakilulu_Idle, @@ -690,14 +678,10 @@ StaticNpc N(NpcData_Lakilulu_Spiny) = { }, }; -StaticNpc N(NpcData_Lakitu_01) = { +NpcData N(NpcData_Lakitu_01) = { .id = NPC_Lakitu_01, - .settings = &N(NpcSettings_Lakitu_SpinySpawner), .pos = { 335.0f, 90.0f, 45.0f }, .yaw = 270, - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, - .init = &N(EVS_NpcInit_Lakitu), - .drops = LAKITU_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -710,18 +694,18 @@ StaticNpc N(NpcData_Lakitu_01) = { .detectSize = { 250 }, } }, + .init = &N(EVS_NpcInit_Lakitu), + .settings = &N(NpcSettings_Lakitu_SpinySpawner), + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = LAKITU_DROPS, .animations = LAKITU_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT | AI_DETECT_SENSITIVE_MOTION, }; -StaticNpc N(NpcData_Lakitu_02) = { +NpcData N(NpcData_Lakitu_02) = { .id = NPC_Lakitu_02, - .settings = &N(NpcSettings_Lakitu_SpinySpawner), .pos = { -320.0f, 90.0f, 0.0f }, .yaw = 90, - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, - .init = &N(EVS_NpcInit_Lakitu), - .drops = LAKITU_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -734,18 +718,18 @@ StaticNpc N(NpcData_Lakitu_02) = { .detectSize = { 200 }, } }, + .init = &N(EVS_NpcInit_Lakitu), + .settings = &N(NpcSettings_Lakitu_SpinySpawner), + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = LAKITU_DROPS, .animations = LAKITU_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT | AI_DETECT_SENSITIVE_MOTION, }; -StaticNpc N(NpcData_Spiny_01) = { +NpcData N(NpcData_Spiny_01) = { .id = NPC_Spiny_01, - .settings = &N(NpcSettings_SpawnedSpiny), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAG_4 | ENEMY_FLAG_400, - .init = &N(EVS_NpcInit_Spiny), - .drops = SPINY_DROPS, .territory = { .wander = { .isFlying = FALSE, @@ -758,18 +742,18 @@ StaticNpc N(NpcData_Spiny_01) = { .detectSize = { 0 }, } }, + .init = &N(EVS_NpcInit_Spiny), + .settings = &N(NpcSettings_SpawnedSpiny), + .flags = ENEMY_FLAG_4 | ENEMY_FLAG_400, + .drops = SPINY_DROPS, .animations = SPINY_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT | AI_DETECT_SENSITIVE_MOTION, }; -StaticNpc N(NpcData_Spiny_02) = { +NpcData N(NpcData_Spiny_02) = { .id = NPC_Spiny_02, - .settings = &N(NpcSettings_SpawnedSpiny), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAG_4 | ENEMY_FLAG_400, - .init = &N(EVS_NpcInit_Spiny), - .drops = SPINY_DROPS, .territory = { .wander = { .isFlying = FALSE, @@ -782,18 +766,18 @@ StaticNpc N(NpcData_Spiny_02) = { .detectSize = { 0 }, } }, + .init = &N(EVS_NpcInit_Spiny), + .settings = &N(NpcSettings_SpawnedSpiny), + .flags = ENEMY_FLAG_4 | ENEMY_FLAG_400, + .drops = SPINY_DROPS, .animations = SPINY_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT | AI_DETECT_SENSITIVE_MOTION, }; -StaticNpc N(NpcData_Spiny_03) = { +NpcData N(NpcData_Spiny_03) = { .id = NPC_Spiny_03, - .settings = &N(NpcSettings_SpawnedSpiny), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAG_4 | ENEMY_FLAG_400, - .init = &N(EVS_NpcInit_Spiny), - .drops = SPINY_DROPS, .territory = { .wander = { .isFlying = FALSE, @@ -806,18 +790,18 @@ StaticNpc N(NpcData_Spiny_03) = { .detectSize = { 0 }, } }, + .init = &N(EVS_NpcInit_Spiny), + .settings = &N(NpcSettings_SpawnedSpiny), + .flags = ENEMY_FLAG_4 | ENEMY_FLAG_400, + .drops = SPINY_DROPS, .animations = SPINY_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT | AI_DETECT_SENSITIVE_MOTION, }; -StaticNpc N(NpcData_Spiny_04) = { +NpcData N(NpcData_Spiny_04) = { .id = NPC_Spiny_04, - .settings = &N(NpcSettings_SpawnedSpiny), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAG_4 | ENEMY_FLAG_400, - .init = &N(EVS_NpcInit_Spiny), - .drops = SPINY_DROPS, .territory = { .wander = { .isFlying = FALSE, @@ -830,18 +814,18 @@ StaticNpc N(NpcData_Spiny_04) = { .detectSize = { 0 }, } }, + .init = &N(EVS_NpcInit_Spiny), + .settings = &N(NpcSettings_SpawnedSpiny), + .flags = ENEMY_FLAG_4 | ENEMY_FLAG_400, + .drops = SPINY_DROPS, .animations = SPINY_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT | AI_DETECT_SENSITIVE_MOTION, }; -StaticNpc N(NpcData_Spiny_05) = { +NpcData N(NpcData_Spiny_05) = { .id = NPC_Spiny_05, - .settings = &N(NpcSettings_SpawnedSpiny), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAG_4 | ENEMY_FLAG_400, - .init = &N(EVS_NpcInit_Spiny), - .drops = SPINY_DROPS, .territory = { .wander = { .isFlying = FALSE, @@ -854,18 +838,18 @@ StaticNpc N(NpcData_Spiny_05) = { .detectSize = { 0 }, } }, + .init = &N(EVS_NpcInit_Spiny), + .settings = &N(NpcSettings_SpawnedSpiny), + .flags = ENEMY_FLAG_4 | ENEMY_FLAG_400, + .drops = SPINY_DROPS, .animations = SPINY_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT | AI_DETECT_SENSITIVE_MOTION, }; -StaticNpc N(NpcData_Spiny_06) = { +NpcData N(NpcData_Spiny_06) = { .id = NPC_Spiny_06, - .settings = &N(NpcSettings_SpawnedSpiny), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAG_4 | ENEMY_FLAG_400, - .init = &N(EVS_NpcInit_Spiny), - .drops = SPINY_DROPS, .territory = { .wander = { .isFlying = FALSE, @@ -878,6 +862,10 @@ StaticNpc N(NpcData_Spiny_06) = { .detectSize = { 0 }, } }, + .init = &N(EVS_NpcInit_Spiny), + .settings = &N(NpcSettings_SpawnedSpiny), + .flags = ENEMY_FLAG_4 | ENEMY_FLAG_400, + .drops = SPINY_DROPS, .animations = SPINY_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT | AI_DETECT_SENSITIVE_MOTION, }; diff --git a/src/world/dead/area_flo/flo_14/flo_14_2_main.c b/src/world/dead/area_flo/flo_14/flo_14_2_main.c index 0878862b25..a96c80b1e3 100644 --- a/src/world/dead/area_flo/flo_14/flo_14_2_main.c +++ b/src/world/dead/area_flo/flo_14/flo_14_2_main.c @@ -2,7 +2,6 @@ #include "effects.h" #include "world/common/atomic/TexturePan.inc.c" -#include "world/common/atomic/TexturePan.data.inc.c" API_CALLABLE(N(SpawnSunEffect)) { fx_sun_undeclared(FX_SUN_FROM_LEFT, 0, 0, 0, 0, 0); diff --git a/src/world/dead/area_flo/flo_14/flo_14_4_npc.c b/src/world/dead/area_flo/flo_14/flo_14_4_npc.c index d012bf2292..7b7b175364 100644 --- a/src/world/dead/area_flo/flo_14/flo_14_4_npc.c +++ b/src/world/dead/area_flo/flo_14/flo_14_4_npc.c @@ -1,6 +1,6 @@ #include "flo_14.h" -#include "world/common/enemy/complete/Bzzap.inc.c" +#include "world/common/enemy/Bzzap.inc.c" #include "world/common/npc/Bubulb.h" @@ -78,25 +78,22 @@ EvtScript N(EVS_NpcInit_BubbleFlower) = { }; // uses a dummy bubulb for collision -StaticNpc N(NpcData_BubbleFlower) = { +NpcData N(NpcData_BubbleFlower) = { .id = NPC_BubbleFlower, - .settings = &N(NpcSettings_BubbleFlower), .pos = { 617.0f, 0.0f, 108.0f }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_4000, .init = &N(EVS_NpcInit_BubbleFlower), - .drops = BUBULB_DROPS, + .settings = &N(NpcSettings_BubbleFlower), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_4000, + .drops = NO_DROPS, .animations = BUBULB_PINK_ANIMS, .tattle = MSG_NpcTattle_BubblePlant, }; -StaticNpc N(NpcData_Bzzap) = { +NpcData N(NpcData_Bzzap) = { .id = NPC_Bzzap, - .settings = &N(NpcSettings_Bzzap), .pos = { -175.0f, 55.0f, 15.0f }, .yaw = 90, - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, - .drops = BZZAP_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -109,6 +106,9 @@ StaticNpc N(NpcData_Bzzap) = { .detectSize = { 200 }, } }, + .settings = &N(NpcSettings_Bzzap), + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = BZZAP_DROPS, .animations = BZZAP_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT | AI_DETECT_SENSITIVE_MOTION, }; 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 86a9692696..9c35933a99 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 @@ -197,26 +197,26 @@ EvtScript N(EVS_NpcInit_Sun_02) = { EVT_END }; -StaticNpc N(NpcData_Sun)[] = { +NpcData N(NpcData_Sun)[] = { { .id = NPC_Sun_01, - .settings = &N(NpcSettings_Sun), .pos = { 0.0f, 250.0f, 0.0f }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_Sun_01), - .drops = SUN_DROPS, + .settings = &N(NpcSettings_Sun), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_400000, + .drops = NO_DROPS, .animations = SUN_ANIMS, .tattle = MSG_NpcTattle_TheSun, }, { .id = NPC_Sun_02, - .settings = &N(NpcSettings_Sun), .pos = { 0.0f, 250.0f, 0.0f }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_8000, .init = &N(EVS_NpcInit_Sun_02), - .drops = SUN_DROPS, + .settings = &N(NpcSettings_Sun), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_8000, + .drops = NO_DROPS, .animations = SUN_ANIMS, .tattle = MSG_NpcTattle_TheSun, }, diff --git a/src/world/dead/area_flo/flo_16/flo_16_5_npc.c b/src/world/dead/area_flo/flo_16/flo_16_5_npc.c index 3c71a63007..04709ed2fc 100644 --- a/src/world/dead/area_flo/flo_16/flo_16_5_npc.c +++ b/src/world/dead/area_flo/flo_16/flo_16_5_npc.c @@ -1,15 +1,12 @@ #include "flo_16.h" #include "entity.h" -#include "world/common/enemy/complete/TuffPuff.inc.c" +#include "world/common/enemy/TuffPuff.inc.c" -StaticNpc N(NpcData_TuffPuff_01) = { +NpcData N(NpcData_TuffPuff_01) = { .id = NPC_TuffPuff_01, - .settings = &N(NpcSettings_TuffPuff), .pos = { 440.0f, 145.0f, 15.0f }, .yaw = 90, - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, - .drops = TUFF_PUFF_DROPS, .territory = { .wander = { .isFlying = FALSE, @@ -22,17 +19,17 @@ StaticNpc N(NpcData_TuffPuff_01) = { .detectSize = { 225, 95 }, } }, + .settings = &N(NpcSettings_TuffPuff), + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = TUFF_PUFF_DROPS, .animations = TUFF_PUFF_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT | AI_DETECT_SENSITIVE_MOTION, }; -StaticNpc N(NpcData_TuffPuff_02) = { +NpcData N(NpcData_TuffPuff_02) = { .id = NPC_TuffPuff_02, - .settings = &N(NpcSettings_TuffPuff), .pos = { 600.0f, 145.0f, 15.0f }, .yaw = 270, - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, - .drops = TUFF_PUFF_DROPS, .territory = { .wander = { .isFlying = FALSE, @@ -45,6 +42,9 @@ StaticNpc N(NpcData_TuffPuff_02) = { .detectSize = { 225, 95 }, } }, + .settings = &N(NpcSettings_TuffPuff), + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = TUFF_PUFF_DROPS, .animations = TUFF_PUFF_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT | AI_DETECT_SENSITIVE_MOTION, }; diff --git a/src/world/dead/area_flo/flo_17/flo_17_4_npc.c b/src/world/dead/area_flo/flo_17/flo_17_4_npc.c index 71f238512c..195b67b9a7 100644 --- a/src/world/dead/area_flo/flo_17/flo_17_4_npc.c +++ b/src/world/dead/area_flo/flo_17/flo_17_4_npc.c @@ -4,15 +4,12 @@ #define AI_LAKITU_FIRST_SPINY_ID NPC_Spiny_01 #define AI_LAKITU_LAST_SPINY_ID NPC_Spiny_04 -#include "world/common/enemy/complete/Lakitu_SpinySpawner.inc.c" +#include "world/common/enemy/Lakitu_SpinySpawner.inc.c" -StaticNpc N(NpcData_Lakitu_01) = { +NpcData N(NpcData_Lakitu_01) = { .id = NPC_Lakitu_01, - .settings = &N(NpcSettings_Lakitu_SpinySpawner), .pos = { -185.0f, 90.0f, 10.0f }, .yaw = 270, - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, - .drops = LAKITU_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -25,17 +22,17 @@ StaticNpc N(NpcData_Lakitu_01) = { .detectSize = { 85, 120 }, } }, + .settings = &N(NpcSettings_Lakitu_SpinySpawner), + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = LAKITU_DROPS, .animations = LAKITU_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT | AI_DETECT_SENSITIVE_MOTION, }; -StaticNpc N(NpcData_Lakitu_02) = { +NpcData N(NpcData_Lakitu_02) = { .id = NPC_Lakitu_02, - .settings = &N(NpcSettings_Lakitu_SpinySpawner), .pos = { 200.0f, 90.0f, -25.0f }, .yaw = 90, - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, - .drops = LAKITU_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -48,17 +45,17 @@ StaticNpc N(NpcData_Lakitu_02) = { .detectSize = { 85, 120 }, } }, + .settings = &N(NpcSettings_Lakitu_SpinySpawner), + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = LAKITU_DROPS, .animations = LAKITU_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT | AI_DETECT_SENSITIVE_MOTION, }; -StaticNpc N(NpcData_Spiny_01) = { +NpcData N(NpcData_Spiny_01) = { .id = NPC_Spiny_01, - .settings = &N(NpcSettings_SpawnedSpiny), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAG_4 | ENEMY_FLAG_400 | ENEMY_FLAG_800, - .drops = SPINY_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -71,17 +68,17 @@ StaticNpc N(NpcData_Spiny_01) = { .detectSize = { 0 }, } }, + .settings = &N(NpcSettings_SpawnedSpiny), + .flags = ENEMY_FLAG_4 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = SPINY_DROPS, .animations = SPINY_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT | AI_DETECT_SENSITIVE_MOTION, }; -StaticNpc N(NpcData_Spiny_02) = { +NpcData N(NpcData_Spiny_02) = { .id = NPC_Spiny_02, - .settings = &N(NpcSettings_SpawnedSpiny), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAG_4 | ENEMY_FLAG_400 | ENEMY_FLAG_800, - .drops = SPINY_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -94,17 +91,17 @@ StaticNpc N(NpcData_Spiny_02) = { .detectSize = { 0 }, } }, + .settings = &N(NpcSettings_SpawnedSpiny), + .flags = ENEMY_FLAG_4 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = SPINY_DROPS, .animations = SPINY_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT | AI_DETECT_SENSITIVE_MOTION, }; -StaticNpc N(NpcData_Spiny_03) = { +NpcData N(NpcData_Spiny_03) = { .id = NPC_Spiny_03, - .settings = &N(NpcSettings_SpawnedSpiny), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAG_4 | ENEMY_FLAG_400 | ENEMY_FLAG_800, - .drops = SPINY_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -117,17 +114,17 @@ StaticNpc N(NpcData_Spiny_03) = { .detectSize = { 0 }, } }, + .settings = &N(NpcSettings_SpawnedSpiny), + .flags = ENEMY_FLAG_4 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = SPINY_DROPS, .animations = SPINY_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT | AI_DETECT_SENSITIVE_MOTION, }; -StaticNpc N(NpcData_Spiny_04) = { +NpcData N(NpcData_Spiny_04) = { .id = NPC_Spiny_04, - .settings = &N(NpcSettings_SpawnedSpiny), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAG_4 | ENEMY_FLAG_400 | ENEMY_FLAG_800, - .drops = SPINY_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -140,6 +137,9 @@ StaticNpc N(NpcData_Spiny_04) = { .detectSize = { 0 }, } }, + .settings = &N(NpcSettings_SpawnedSpiny), + .flags = ENEMY_FLAG_4 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = SPINY_DROPS, .animations = SPINY_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT | AI_DETECT_SENSITIVE_MOTION, }; diff --git a/src/world/dead/area_flo/flo_18/flo_18_2_main.c b/src/world/dead/area_flo/flo_18/flo_18_2_main.c index a52b73935a..4de072b0f9 100644 --- a/src/world/dead/area_flo/flo_18/flo_18_2_main.c +++ b/src/world/dead/area_flo/flo_18/flo_18_2_main.c @@ -2,7 +2,6 @@ #include "effects.h" #include "world/common/atomic/TexturePan.inc.c" -#include "world/common/atomic/TexturePan.data.inc.c" API_CALLABLE(N(SpawnSunEffect)) { fx_sun_undeclared(FX_SUN_FROM_RIGHT, 0, 0, 0, 0, 0); diff --git a/src/world/dead/area_flo/flo_18/flo_18_4_npc.c b/src/world/dead/area_flo/flo_18/flo_18_4_npc.c index 695dbf8004..39c0c9a947 100644 --- a/src/world/dead/area_flo/flo_18/flo_18_4_npc.c +++ b/src/world/dead/area_flo/flo_18/flo_18_4_npc.c @@ -2,8 +2,8 @@ #include "world/common/todo/UnkFunc42.inc.c" -#include "world/common/enemy/complete/Lakitu.h" -#include "world/common/enemy/complete/YMagikoopa.h" +#include "world/common/enemy/Lakitu.h" +#include "world/common/enemy/YMagikoopa.h" NpcSettings N(NpcSettings_Lakitu) = { .height = 32, @@ -597,59 +597,59 @@ EvtScript N(EVS_NpcInit_Lakitu_03) = { EVT_END }; -StaticNpc N(NpcData_MachineGang)[] = { +NpcData N(NpcData_MachineGang)[] = { { .id = NPC_Lakitu_01, - .settings = &N(NpcSettings_Lakitu), .pos = { 0.0f, 15.0f, 60.0f }, .yaw = 90, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_Lakitu_01), + .settings = &N(NpcSettings_Lakitu), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_400000, .drops = LAKITU_DROPS, .animations = LAKITU_ANIMS, .tattle = MSG_NpcTattle_PuffPuffOperator, }, { .id = NPC_Lakitu_02, - .settings = &N(NpcSettings_Lakitu), .pos = { 65.0f, 15.0f, 60.0f }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_Lakitu_02), + .settings = &N(NpcSettings_Lakitu), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_400000, .drops = LAKITU_DROPS, .animations = LAKITU_ANIMS, .tattle = MSG_NpcTattle_PuffPuffOperator, }, { .id = NPC_Lakitu_03, - .settings = &N(NpcSettings_Lakitu), .pos = { 135.0f, 15.0f, 35.0f }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_Lakitu_03), + .settings = &N(NpcSettings_Lakitu), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_400000, .drops = LAKITU_DROPS, .animations = LAKITU_ANIMS, .tattle = MSG_NpcTattle_PuffPuffOperator, }, { .id = NPC_Magikoopa, - .settings = &N(NpcSettings_Magikoopa), .pos = { -60.0f, 0.0f, 50.0f }, .yaw = 90, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_Magikoopa), - .drops = MAGIKOOPA_DROPS, + .settings = &N(NpcSettings_Magikoopa), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_400000, + .drops = MAGINO_DROPS, .animations = MAGIKOOPA_YELLOW_ANIMS, .tattle = MSG_NpcTattle_PuffPuffOperator, }, { .id = NPC_FlyingMagikoopa, - .settings = &N(NpcSettings_Magikoopa), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_FlyingMagikoopa), - .drops = MAGIKOOPA_DROPS, + .settings = &N(NpcSettings_Magikoopa), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_400000, + .drops = MAGINO_DROPS, .animations = FLYING_MAGIKOOPA_YELLOW_ANIMS, .tattle = MSG_NpcTattle_PuffPuffOperator, }, diff --git a/src/world/dead/area_flo/flo_19/flo_19_3_main.c b/src/world/dead/area_flo/flo_19/flo_19_3_main.c index d2bcbe3a29..07e32fea50 100644 --- a/src/world/dead/area_flo/flo_19/flo_19_3_main.c +++ b/src/world/dead/area_flo/flo_19/flo_19_3_main.c @@ -2,14 +2,21 @@ #include "effects.h" #include "world/common/atomic/TexturePan.inc.c" -#include "world/common/atomic/TexturePan.data.inc.c" API_CALLABLE(N(SpawnSunEffect)) { fx_sun_undeclared(FX_SUN_FROM_RIGHT, 0, 0, 0, 0, 0); return ApiStatus_DONE2; } -EvtScript N(EVS_ExitWalk_flo_21_0) = EVT_EXIT_WALK(60, flo_19_ENTRY_1, "flo_21", flo_21_ENTRY_0); +EvtScript N(EVS_ExitWalk_flo_21_0) = { + EVT_SET_GROUP(EVT_GROUP_1B) + EVT_CALL(UseExitHeading, 60, flo_19_ENTRY_1) + EVT_EXEC(ExitWalk) + EVT_CALL(GotoMap, 0x80243000, flo_21_ENTRY_0) // raw pointer to missing string "flo_21" + EVT_WAIT(100) + EVT_RETURN + EVT_END +}; EvtScript N(EVS_BindExitTriggers) = { EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_flo_21_0)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilie, 1, 0) @@ -26,8 +33,8 @@ EvtScript N(EVS_Main) = { EVT_EXEC_WAIT(N(EVS_MakeEntities)) EVT_CALL(ParentColliderToModel, COLLIDER_o117, MODEL_o142) EVT_CALL(HidePlayerShadow, TRUE) - EVT_EXEC(N(EVS_SetupBeanstalk)) - EVT_EXEC(N(EVS_SetupClouds)) + EVT_EXEC(0x80242FD0) // raw pointer to missing N(EVS_SetupBeanstalk) + EVT_EXEC(0x80241780) // raw pointer to missing N(EVS_SetupClouds) EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_SURFACE, COLLIDER_o122, SURFACE_TYPE_CLOUD) EVT_CALL(EnableTexPanning, MODEL_o59, TRUE) EVT_CALL(EnableTexPanning, MODEL_o60, TRUE) @@ -57,10 +64,10 @@ EvtScript N(EVS_Main) = { EVT_SET(LVar0, EVT_PTR(N(EVS_BindExitTriggers))) EVT_EXEC(EnterWalk) EVT_CASE_EQ(flo_19_ENTRY_2) - EVT_EXEC(N(EVS_Scene_BeanstalkGrowing)) + EVT_EXEC(0x80242A2C) // raw pointer to missing N(EVS_Scene_BeanstalkGrowing) EVT_EXEC(N(EVS_BindExitTriggers)) EVT_CASE_EQ(flo_19_ENTRY_3) - EVT_EXEC(N(EVS_Enter_Beanstalk)) + EVT_EXEC(0x80241CC4) // raw pointer to missing N(EVS_Enter_Beanstalk) EVT_EXEC(N(EVS_BindExitTriggers)) EVT_END_SWITCH EVT_EXEC_WAIT(N(EVS_SetupMusic)) 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 e11a9ce67b..befe61628d 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 @@ -87,6 +87,8 @@ EvtScript N(EVS_AnimatePlatforms) = { EVT_SET(LVarF, 0) EVT_END_IF EVT_SETF(LVar0, LVarA) + // the rest of the script is cut off halfway through the next EVT_SETF cmd + /* EVT_SETF(LVar1, LVarB) EVT_SETF(LVar2, LVarC) EVT_SETF(LVar3, LVarD) @@ -110,8 +112,16 @@ EvtScript N(EVS_AnimatePlatforms) = { EVT_GOTO(0) EVT_RETURN EVT_END + */ }; +// half of EVT_SETF(LVar1, LVarB) +s32 N(EVS_AnimatePlatforms_Fragment)[] = { + EVT_OP_SETF, 2, +}; + +// remaining data is truncated +/* EvtScript N(EVS_AddPlayerWeight_Platform_01) = { EVT_THREAD EVT_ADDF(MV_Distortion_Platform_01, EVT_FLOAT(-1.5)) @@ -189,3 +199,4 @@ EvtScript N(EVS_SetupClouds) = { EVT_RETURN EVT_END }; +*/ 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 2ed998de2a..86fd0aa3bf 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 @@ -50,6 +50,8 @@ API_CALLABLE(N(SetScreenFadeAmount)) { #include "common/CosInterpMinMax.inc.c" +// all data in this file is truncated +/* EvtScript N(EVS_FadeOutToBlack) = { EVT_SET(LVar0, 0) EVT_LABEL(10) @@ -390,3 +392,4 @@ EvtScript N(EVS_SetupBeanstalk) = { EVT_RETURN EVT_END }; +*/ diff --git a/src/world/dead/area_kzn/kzn_11/kzn_11_3_npc.c b/src/world/dead/area_kzn/kzn_11/kzn_11_3_npc.c index bc2a36d29c..624d127030 100644 --- a/src/world/dead/area_kzn/kzn_11/kzn_11_3_npc.c +++ b/src/world/dead/area_kzn/kzn_11/kzn_11_3_npc.c @@ -1,6 +1,6 @@ #include "kzn_11.h" -#include "world/common/enemy/complete/LavaBubble.inc.c" +#include "world/common/enemy/LavaBubble.inc.c" #include "sprite/npc/Fire.h" #include "world/common/enemy/ai/FireBarAI.inc.c" @@ -143,142 +143,139 @@ NpcSettings N(NpcSettings_FireBar_Extra) = { .flags = ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, }; -StaticNpc N(NpcData_FireBar_01)[] = { +NpcData N(NpcData_FireBar_01)[] = { { .id = NPC_FireBar_1A, - .settings = &N(NpcSettings_FireBar_01), .pos = { 0.0f, 0.0f, 0.0f }, .yaw = 0, - .flags = ENEMY_FLAG_PASSIVE, .init = (void*) 0x00004003, + .settings = &N(NpcSettings_FireBar_01), + .flags = ENEMY_FLAG_PASSIVE, .animations = { }, }, { .id = NPC_FireBar_1B, - .settings = &N(NpcSettings_FireBar_Extra), .pos = { 0.0f, 0.0f, 0.0f }, .yaw = 0, - .flags = ENEMY_FLAG_PASSIVE, .init = (void*) 0x00004003, + .settings = &N(NpcSettings_FireBar_Extra), + .flags = ENEMY_FLAG_PASSIVE, .animations = { }, }, { .id = NPC_FireBar_1C, - .settings = &N(NpcSettings_FireBar_Extra), .pos = { 0.0f, 0.0f, 0.0f }, .yaw = 0, - .flags = ENEMY_FLAG_PASSIVE, .init = (void*) 0x00004003, + .settings = &N(NpcSettings_FireBar_Extra), + .flags = ENEMY_FLAG_PASSIVE, .animations = { }, }, { .id = NPC_FireBar_1D, - .settings = &N(NpcSettings_FireBar_Extra), .pos = { 0.0f, 0.0f, 0.0f }, .yaw = 0, - .flags = ENEMY_FLAG_PASSIVE, .init = (void*) 0x00004003, + .settings = &N(NpcSettings_FireBar_Extra), + .flags = ENEMY_FLAG_PASSIVE, .animations = { }, }, }; -StaticNpc N(NpcData_FireBar_02)[] = { +NpcData N(NpcData_FireBar_02)[] = { { .id = NPC_FireBar_2A, - .settings = &N(NpcSettings_FireBar_02), .pos = { 0.0f, 0.0f, 0.0f }, .yaw = 0, - .flags = ENEMY_FLAG_PASSIVE, .init = (void*) 0x00004003, + .settings = &N(NpcSettings_FireBar_02), + .flags = ENEMY_FLAG_PASSIVE, .animations = { }, }, { .id = NPC_FireBar_2B, - .settings = &N(NpcSettings_FireBar_Extra), .pos = { 0.0f, 0.0f, 0.0f }, .yaw = 0, - .flags = ENEMY_FLAG_PASSIVE, .init = (void*) 0x00004003, + .settings = &N(NpcSettings_FireBar_Extra), + .flags = ENEMY_FLAG_PASSIVE, .animations = { }, }, { .id = NPC_FireBar_2C, - .settings = &N(NpcSettings_FireBar_Extra), .pos = { 0.0f, 0.0f, 0.0f }, .yaw = 0, - .flags = ENEMY_FLAG_PASSIVE, .init = (void*) 0x00004003, + .settings = &N(NpcSettings_FireBar_Extra), + .flags = ENEMY_FLAG_PASSIVE, .animations = { }, }, { .id = NPC_FireBar_2D, - .settings = &N(NpcSettings_FireBar_Extra), .pos = { 0.0f, 0.0f, 0.0f }, .yaw = 0, - .flags = ENEMY_FLAG_PASSIVE, .init = (void*) 0x00004003, + .settings = &N(NpcSettings_FireBar_Extra), + .flags = ENEMY_FLAG_PASSIVE, .animations = { }, }, }; -StaticNpc N(NpcData_FireBar_03)[] = { +NpcData N(NpcData_FireBar_03)[] = { { .id = NPC_FireBar_3A, - .settings = &N(NpcSettings_FireBar_03), .pos = { 0.0f, 0.0f, 0.0f }, .yaw = 0, - .flags = ENEMY_FLAG_PASSIVE, .init = (void*) 0x00004003, + .settings = &N(NpcSettings_FireBar_03), + .flags = ENEMY_FLAG_PASSIVE, .animations = { }, }, { .id = NPC_FireBar_3B, - .settings = &N(NpcSettings_FireBar_Extra), .pos = { 0.0f, 0.0f, 0.0f }, .yaw = 0, - .flags = ENEMY_FLAG_PASSIVE, .init = (void*) 0x00004003, + .settings = &N(NpcSettings_FireBar_Extra), + .flags = ENEMY_FLAG_PASSIVE, .animations = { }, }, { .id = NPC_FireBar_3C, - .settings = &N(NpcSettings_FireBar_Extra), .pos = { 0.0f, 0.0f, 0.0f }, .yaw = 0, - .flags = ENEMY_FLAG_PASSIVE, .init = (void*) 0x00004003, + .settings = &N(NpcSettings_FireBar_Extra), + .flags = ENEMY_FLAG_PASSIVE, .animations = { }, }, { .id = NPC_FireBar_3D, - .settings = &N(NpcSettings_FireBar_Extra), .pos = { 0.0f, 0.0f, 0.0f }, .yaw = 0, - .flags = ENEMY_FLAG_PASSIVE, .init = (void*) 0x00004003, + .settings = &N(NpcSettings_FireBar_Extra), + .flags = ENEMY_FLAG_PASSIVE, .animations = { }, }, }; -StaticNpc N(NpcData_Bubble_01) = { +NpcData N(NpcData_Bubble_01) = { .id = NPC_Bubble_01, - .settings = &N(NpcSettings_LavaBubble), .pos = { -150.0f, 50.0f, 10.0f }, .yaw = 90, - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, - .drops = LAVA_BUBBLE_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -291,17 +288,17 @@ StaticNpc N(NpcData_Bubble_01) = { .detectSize = { 150 }, } }, + .settings = &N(NpcSettings_LavaBubble), + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = LAVA_BUBBLE_DROPS, .animations = LAVA_BUBBLE_ANIMS, .aiDetectFlags = AI_DETECT_SENSITIVE_MOTION, }; -StaticNpc N(NpcData_Bubble_02) = { +NpcData N(NpcData_Bubble_02) = { .id = NPC_Bubble_02, - .settings = &N(NpcSettings_LavaBubble), .pos = { 150.0f, 50.0f, 10.0f }, .yaw = 270, - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, - .drops = LAVA_BUBBLE_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -314,6 +311,9 @@ StaticNpc N(NpcData_Bubble_02) = { .detectSize = { 150 }, } }, + .settings = &N(NpcSettings_LavaBubble), + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = LAVA_BUBBLE_DROPS, .animations = LAVA_BUBBLE_ANIMS, .aiDetectFlags = AI_DETECT_SENSITIVE_MOTION, }; 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 909b33292d..ef3235e002 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 @@ -2,8 +2,8 @@ #include "world/common/npc/Kolorado.inc.c" -#include "world/common/enemy/complete/PutridPiranha.inc.c" -#include "world/common/enemy/complete/SpikeTop.inc.c" +#include "world/common/enemy/PutridPiranha.inc.c" +#include "world/common/enemy/SpikeTop.inc.c" #include "world/common/complete/LetterDelivery.inc.c" @@ -133,26 +133,23 @@ EvtScript N(EVS_NpcInit_Kolorado) = { EVT_END }; -StaticNpc N(NpcData_Kolorado) = { +NpcData N(NpcData_Kolorado) = { .id = NPC_Kolorado, - .settings = &N(NpcSettings_Kolorado), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 90, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_10000 | ENEMY_FLAG_100000 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_Kolorado), - .drops = KOLORADO_DROPS, + .settings = &N(NpcSettings_Kolorado), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_10000 | ENEMY_FLAG_100000 | ENEMY_FLAG_400000, + .drops = NO_DROPS, .animations = KOLORADO_ANIMS, .tattle = MSG_NpcTattle_Kolorado, }; -StaticNpc N(NpcData_Piranha)[] = { +NpcData N(NpcData_Piranha)[] = { { .id = NPC_Piranha, - .settings = &N(NpcSettings_PutridPiranha), .pos = { -325.0f, 0.0f, 150.0f }, .yaw = 270, - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, - .drops = PUTRID_PIRANHA_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -165,19 +162,19 @@ StaticNpc N(NpcData_Piranha)[] = { .detectSize = { 270, 130 }, } }, + .settings = &N(NpcSettings_PutridPiranha), + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = PUTRID_PIRANHA_DROPS, .animations = PUTRID_PIRANHA_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT | AI_DETECT_SENSITIVE_MOTION, }, PUTRID_PIRANHA_HITBOX(NPC_Piranha_Hitbox) }; -StaticNpc N(NpcData_SpikeTop) = { +NpcData N(NpcData_SpikeTop) = { .id = NPC_SpikeTop, - .settings = &N(NpcSettings_SpikeTop), .pos = { -450.0f, 0.0f, 100.0f }, .yaw = 270, - .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, - .drops = SPIKE_TOP_DROPS, .territory = { .wander = { .isFlying = FALSE, @@ -190,6 +187,9 @@ StaticNpc N(NpcData_SpikeTop) = { .detectSize = { 270, 130 }, } }, + .settings = &N(NpcSettings_SpikeTop), + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = SPIKE_TOP_DROPS, .animations = SPIKE_TOP_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT | AI_DETECT_SENSITIVE_MOTION, }; diff --git a/src/world/dead/area_kzn/kzn_18/kzn_18_2_npc.c b/src/world/dead/area_kzn/kzn_18/kzn_18_2_npc.c index 0b0a426e36..b5a7ff6431 100644 --- a/src/world/dead/area_kzn/kzn_18/kzn_18_2_npc.c +++ b/src/world/dead/area_kzn/kzn_18/kzn_18_2_npc.c @@ -1,7 +1,7 @@ #include "kzn_18.h" #include "world/common/npc/Kolorado.inc.c" -#include "world/common/enemy/complete/PutridPiranhaSentinel.inc.c" +#include "world/common/enemy/PutridPiranhaSentinel.inc.c" #include "world/common/todo/SetCamera0Flag1000.inc.c" #include "world/common/todo/UnsetCamera0Flag1000.inc.c" @@ -143,26 +143,26 @@ EvtScript N(EVS_NpcInit_Piranha) = { EVT_END }; -StaticNpc N(NpcData_Kolorado) = { +NpcData N(NpcData_Kolorado) = { .id = NPC_Kolorado, - .settings = &N(NpcSettings_Kolorado), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 90, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_10000 | ENEMY_FLAG_100000, .init = &N(EVS_NpcInit_Kolorado), - .drops = KOLORADO_DROPS, + .settings = &N(NpcSettings_Kolorado), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_10000 | ENEMY_FLAG_100000, + .drops = NO_DROPS, .animations = KOLORADO_ANIMS, .tattle = MSG_NpcTattle_Kolorado, }; -StaticNpc N(NpcData_Piranha) = { +NpcData N(NpcData_Piranha) = { .id = NPC_PutridPiranha, - .settings = &N(NpcSettings_PutridPiranhaSentinel), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 270, - .flags = ENEMY_FLAG_4 | ENEMY_FLAG_200000, .init = &N(EVS_NpcInit_Piranha), - .drops = PIRANHA_SENTINEL_DROPS, + .settings = &N(NpcSettings_PutridPiranhaSentinel), + .flags = ENEMY_FLAG_4 | ENEMY_FLAG_200000, + .drops = PIRANHA_NO_DROPS, .animations = PIRANHA_SENTINEL_ANIMS, }; diff --git a/src/world/dead/area_kzn/kzn_19/kzn_19.h b/src/world/dead/area_kzn/kzn_19/kzn_19.h index a72e03607d..57ab6ebb14 100644 --- a/src/world/dead/area_kzn/kzn_19/kzn_19.h +++ b/src/world/dead/area_kzn/kzn_19/kzn_19.h @@ -21,6 +21,7 @@ enum { enum { MV_VinesData = MapVar(0), + MV_Unk_01 = MapVar(1), MV_BossDefeated = MapVar(10), }; diff --git a/src/world/dead/area_kzn/kzn_19/kzn_19_2_main.c b/src/world/dead/area_kzn/kzn_19/kzn_19_2_main.c index 2c492f0145..9c5a05b73c 100644 --- a/src/world/dead/area_kzn/kzn_19/kzn_19_2_main.c +++ b/src/world/dead/area_kzn/kzn_19/kzn_19_2_main.c @@ -2,6 +2,7 @@ #include "world/area_kzn/common/SmokeTexPanners.inc.c" +#define STAR_SPIRIT_DATA_VAR MV_Unk_01 #include "world/common/todo/StarSpiritEffectFunc.inc.c" EvtScript N(EVS_TrySpawningStarCard) = { diff --git a/src/world/dead/area_kzn/kzn_19/kzn_19_3_npc_settings.c b/src/world/dead/area_kzn/kzn_19/kzn_19_3_npc_settings.c index 60312805ff..c2488db38d 100644 --- a/src/world/dead/area_kzn/kzn_19/kzn_19_3_npc_settings.c +++ b/src/world/dead/area_kzn/kzn_19/kzn_19_3_npc_settings.c @@ -2,4 +2,4 @@ #include "world/common/npc/Kolorado.inc.c" #include "world/common/npc/StarSpirit.inc.c" -#include "world/common/enemy/complete/LavaPiranha.inc.c" +#include "world/common/enemy/LavaPiranha.inc.c" 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 93eae65557..2a563d5ef6 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 @@ -3,7 +3,7 @@ #include "world/common/npc/Kolorado.h" #include "world/common/npc/StarSpirit.h" -#include "world/common/enemy/complete/LavaPiranha.h" +#include "world/common/enemy/LavaPiranha.h" enum { VINE_0 = 0, @@ -978,48 +978,48 @@ EvtScript N(EVS_NpcInit_LavaBud) = { EVT_END }; -StaticNpc N(NpcData_Kolorado) = { +NpcData N(NpcData_Kolorado) = { .id = NPC_Kolorado, - .settings = &N(NpcSettings_Kolorado), .pos = { 380.0f, 250.0f, -330.0f }, .yaw = 90, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_10000 | ENEMY_FLAG_100000 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_Kolorado), - .drops = KOLORADO_DROPS, + .settings = &N(NpcSettings_Kolorado), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_10000 | ENEMY_FLAG_100000 | ENEMY_FLAG_400000, + .drops = NO_DROPS, .animations = KOLORADO_ANIMS, .tattle = MSG_NpcTattle_Kolorado, }; -StaticNpc N(NpcData_Misstar) = { +NpcData N(NpcData_Misstar) = { .id = NPC_Misstar, - .settings = &N(NpcSettings_StarSpirit), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 270, + .settings = &N(NpcSettings_StarSpirit), .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_400000, - .drops = MISSTAR_DROPS, + .drops = NO_DROPS, .animations = MISSTAR_ANIMS, .tattle = MSG_NpcTattle_Misstar, }; -s32 N(ExtraAnims_LavaPiranha)[] = { +AnimID N(ExtraAnims_LavaPiranha)[] = { ANIM_LavaPiranha_Anim03, ANIM_LavaPiranha_Anim0E, - -1 + ANIM_LIST_END }; -s32 N(ExtraAnims_LavaBud)[] = { +AnimID N(ExtraAnims_LavaBud)[] = { ANIM_LavaBud_Anim03, - -1 + ANIM_LIST_END }; -StaticNpc N(NpcData_LavaPiranha)[] = { +NpcData N(NpcData_LavaPiranha)[] = { { .id = NPC_LavaPiranhaHead, - .settings = &N(NpcSettings_LavaPiranhaHead), .pos = { 400.0f, 25.0f, -30.0f }, .yaw = 270, - .flags = ENEMY_FLAG_4 | ENEMY_FLAG_800 | ENEMY_FLAG_40000, .init = &N(EVS_NpcInit_LavaPiranha), + .settings = &N(NpcSettings_LavaPiranhaHead), + .flags = ENEMY_FLAG_4 | ENEMY_FLAG_800 | ENEMY_FLAG_40000, .drops = LAVA_PIRANHA_DROPS, .animations = LAVA_PIRANHA_HEAD_ANIMS, .extraAnimations = N(ExtraAnims_LavaPiranha), @@ -1027,11 +1027,11 @@ StaticNpc N(NpcData_LavaPiranha)[] = { }, { .id = NPC_LavaBud_01, - .settings = &N(NpcSettings_LavaPiranhaHead), .pos = { 400.0f, 25.0f, -30.0f }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_40000, .init = &N(EVS_NpcInit_LavaBud), + .settings = &N(NpcSettings_LavaPiranhaHead), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_40000, .drops = LAVA_PIRANHA_DROPS, .animations = LAVA_PIRANHA_BUD_ANIMS, .extraAnimations = N(ExtraAnims_LavaBud), @@ -1039,11 +1039,11 @@ StaticNpc N(NpcData_LavaPiranha)[] = { }, { .id = NPC_LavaBud_02, - .settings = &N(NpcSettings_LavaPiranhaHead), .pos = { 400.0f, 25.0f, -30.0f }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_40000, .init = &N(EVS_NpcInit_LavaBud), + .settings = &N(NpcSettings_LavaPiranhaHead), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_40000, .drops = LAVA_PIRANHA_DROPS, .animations = LAVA_PIRANHA_BUD_ANIMS, .extraAnimations = N(ExtraAnims_LavaBud), diff --git a/src/world/dead/area_kzn/kzn_20/kzn_20_2_main.c b/src/world/dead/area_kzn/kzn_20/kzn_20_2_main.c index 9ed28b2f99..00150c5d61 100644 --- a/src/world/dead/area_kzn/kzn_20/kzn_20_2_main.c +++ b/src/world/dead/area_kzn/kzn_20/kzn_20_2_main.c @@ -2,7 +2,6 @@ #include "effects.h" #include "world/common/atomic/TexturePan.inc.c" -#include "world/common/atomic/TexturePan.data.inc.c" EvtScript N(EVS_ExitWalk_kzn_19_2) = EVT_EXIT_WALK(60, kzn_20_ENTRY_0, "kzn_19", kzn_19_ENTRY_2); EvtScript N(EVS_ExitWalk_kzn_22_0) = EVT_EXIT_WALK(60, kzn_20_ENTRY_1, "kzn_22", kzn_22_ENTRY_0); diff --git a/src/world/dead/area_kzn/kzn_20/kzn_20_3_npc.c b/src/world/dead/area_kzn/kzn_20/kzn_20_3_npc.c index 935a7915e7..280140364d 100644 --- a/src/world/dead/area_kzn/kzn_20/kzn_20_3_npc.c +++ b/src/world/dead/area_kzn/kzn_20/kzn_20_3_npc.c @@ -525,26 +525,26 @@ EvtScript N(EVS_NpcInit_Misstar) = { EVT_END }; -StaticNpc N(NpcData_Kolorado) = { +NpcData N(NpcData_Kolorado) = { .id = NPC_Kolorado, - .settings = &N(NpcSettings_Kolorado), .pos = { -65.0f, 0.0f, 190.0f }, .yaw = 90, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_10000 | ENEMY_FLAG_100000 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_Kolorado), - .drops = KOLORADO_DROPS, + .settings = &N(NpcSettings_Kolorado), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_10000 | ENEMY_FLAG_100000 | ENEMY_FLAG_400000, + .drops = NO_DROPS, .animations = KOLORADO_ANIMS, .tattle = MSG_NpcTattle_Kolorado, }; -StaticNpc N(NpcData_Misstar) = { +NpcData N(NpcData_Misstar) = { .id = NPC_Misstar, - .settings = &N(NpcSettings_StarSpirit), .pos = { 100.0f, 160.0f, 0.0f }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_Misstar), - .drops = MISSTAR_DROPS, + .settings = &N(NpcSettings_StarSpirit), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_400000, + .drops = NO_DROPS, .animations = MISSTAR_ANIMS, .tattle = MSG_NpcTattle_Misstar, }; 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 92b6540f30..581701e325 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 @@ -262,26 +262,26 @@ EvtScript N(EVS_NpcInit_Misstar) = { EVT_END }; -StaticNpc N(NpcData_Kolorado) = { +NpcData N(NpcData_Kolorado) = { .id = NPC_Kolorado, - .settings = &N(NpcSettings_Kolorado), .pos = { 445.0f, 150.0f, 175.0f }, .yaw = 90, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_10000 | ENEMY_FLAG_100000, .init = &N(EVS_NpcInit_Kolorado), - .drops = KOLORADO_DROPS, + .settings = &N(NpcSettings_Kolorado), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_10000 | ENEMY_FLAG_100000, + .drops = NO_DROPS, .animations = KOLORADO_ANIMS, .tattle = MSG_NpcTattle_Kolorado, }; -StaticNpc N(NpcData_Misstar) = { +NpcData N(NpcData_Misstar) = { .id = NPC_Misstar, - .settings = &N(NpcSettings_StarSpirit), .pos = { 285.0f, 160.0f, 80.0f }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_10000 | ENEMY_FLAG_100000, .init = &N(EVS_NpcInit_Misstar), - .drops = MISSTAR_DROPS, + .settings = &N(NpcSettings_StarSpirit), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_10000 | ENEMY_FLAG_100000, + .drops = NO_DROPS, .animations = MISSTAR_ANIMS, .tattle = MSG_NpcTattle_Misstar, }; 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 c82a8b2e96..424628835f 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 @@ -275,26 +275,26 @@ EvtScript N(EVS_NpcInit_Misstar) = { EVT_END }; -StaticNpc N(NpcData_Kolorado) = { +NpcData N(NpcData_Kolorado) = { .id = NPC_Kolorado, - .settings = &N(NpcSettings_Kolorado), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 90, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_10000 | ENEMY_FLAG_100000, .init = &N(EVS_NpcInit_Kolorado), - .drops = KOLORADO_DROPS, + .settings = &N(NpcSettings_Kolorado), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_10000 | ENEMY_FLAG_100000, + .drops = NO_DROPS, .animations = KOLORADO_ANIMS, .tattle = MSG_NpcTattle_Kolorado, }; -StaticNpc N(NpcData_Misstar) = { +NpcData N(NpcData_Misstar) = { .id = NPC_Misstar, - .settings = &N(NpcSettings_StarSpirit), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 270, - .flags = ENEMY_FLAG_4 | ENEMY_FLAG_100000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_8000000 | ENEMY_FLAG_10000000, .init = &N(EVS_NpcInit_Misstar), - .drops = MISSTAR_DROPS, + .settings = &N(NpcSettings_StarSpirit), + .flags = ENEMY_FLAG_4 | ENEMY_FLAG_100000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_8000000 | ENEMY_FLAG_10000000, + .drops = NO_DROPS, .animations = MISSTAR_ANIMS, }; diff --git a/src/world/entrances.h b/src/world/entrances.h index eea95a15f3..03185f91dc 100644 --- a/src/world/entrances.h +++ b/src/world/entrances.h @@ -258,6 +258,8 @@ enum { kkj_24_ENTRY_0 = 0, kkj_24_ENTRY_1 = 1, kkj_25_ENTRY_0 = 0, + kkj_25_ENTRY_1 = 1, + kkj_25_ENTRY_2 = 2, kkj_26_ENTRY_0 = 0, kkj_26_ENTRY_1 = 1, kkj_26_ENTRY_2 = 2, diff --git a/src/world/partners.c b/src/world/partners.c index 7606e85c73..1a1e24fe80 100644 --- a/src/world/partners.c +++ b/src/world/partners.c @@ -607,9 +607,9 @@ void partner_create_npc(void) { { Npc* npc = *partnerNpcPtr; - npc->pos.x = 0.0f; - npc->pos.y = -1000.0f; - npc->pos.z = 0.0f; + npc->pos.x = NPC_DISPOSE_POS_X; + npc->pos.y = NPC_DISPOSE_POS_Y; + npc->pos.z = NPC_DISPOSE_POS_Z; npc->scale.x = 0.0f; npc->scale.y = 0.0f; npc->scale.z = 0.0f; diff --git a/src/world/script_api/enter_exit.c b/src/world/script_api/enter_exit.c index cf1c3feb78..4a5c891688 100644 --- a/src/world/script_api/enter_exit.c +++ b/src/world/script_api/enter_exit.c @@ -113,10 +113,10 @@ API_CALLABLE(PlayerMoveToDoor) { script->functionTemp[0]--; if (script->functionTemp[0] < 0) { - return ApiStatus_DONE1; - } else { - return ApiStatus_BLOCK; - } + return ApiStatus_DONE1; + } else { + return ApiStatus_BLOCK; + } } API_CALLABLE(GetEntryCoords) { @@ -198,273 +198,273 @@ API_CALLABLE(SetupSplitDoubleDoors) { } EvtScript EnterWalk = { - EVT_CALL(ShortenPartnerTetherDistance) - EVT_CALL(CheckRideScriptForEnterExit) - EVT_CALL(UseEntryHeading, 60, 15) - EVT_IF_EQ(LVarA, 0) - EVT_CALL(TeleportPartnerToPlayer) - EVT_CALL(PlayerMoveTo, LVar1, LVar3, 15) - EVT_ELSE - EVT_SET(LVarF, LVar0) - EVT_SET(LVar0, 0) - EVT_SET(LVarC, 1) - EVT_SET(LVar4, 15) - EVT_EXEC_WAIT(LVarB) - EVT_SET(LVar0, LVarF) - EVT_END_IF - EVT_EXEC(LVar0) - EVT_CALL(func_802D2148) - EVT_CALL(ResetPartnerTetherDistance) - EVT_RETURN - EVT_END + EVT_CALL(ShortenPartnerTetherDistance) + EVT_CALL(CheckRideScriptForEnterExit) + EVT_CALL(UseEntryHeading, 60, 15) + EVT_IF_EQ(LVarA, 0) + EVT_CALL(TeleportPartnerToPlayer) + EVT_CALL(PlayerMoveTo, LVar1, LVar3, 15) + EVT_ELSE + EVT_SET(LVarF, LVar0) + EVT_SET(LVar0, 0) + EVT_SET(LVarC, 1) + EVT_SET(LVar4, 15) + EVT_EXEC_WAIT(LVarB) + EVT_SET(LVar0, LVarF) + EVT_END_IF + EVT_EXEC(LVar0) + EVT_CALL(func_802D2148) + EVT_CALL(ResetPartnerTetherDistance) + EVT_RETURN + EVT_END }; EvtScript EnterWalkShort = { - EVT_CALL(ShortenPartnerTetherDistance) - EVT_CALL(CheckRideScriptForEnterExit) - EVT_CALL(UseEntryHeading, 40, 15) - EVT_IF_EQ(LVarA, 0) - EVT_CALL(TeleportPartnerToPlayer) - EVT_CALL(PlayerMoveTo, LVar1, LVar3, 15) - EVT_ELSE - EVT_SET(LVarF, LVar0) - EVT_SET(LVar0, 0) - EVT_SET(LVarC, 1) - EVT_SET(LVar4, 15) - EVT_EXEC_WAIT(LVarB) - EVT_SET(LVar0, LVarF) - EVT_END_IF - EVT_EXEC(LVar0) - EVT_CALL(func_802D2148) - EVT_CALL(ResetPartnerTetherDistance) - EVT_RETURN - EVT_END + EVT_CALL(ShortenPartnerTetherDistance) + EVT_CALL(CheckRideScriptForEnterExit) + EVT_CALL(UseEntryHeading, 40, 15) + EVT_IF_EQ(LVarA, 0) + EVT_CALL(TeleportPartnerToPlayer) + EVT_CALL(PlayerMoveTo, LVar1, LVar3, 15) + EVT_ELSE + EVT_SET(LVarF, LVar0) + EVT_SET(LVar0, 0) + EVT_SET(LVarC, 1) + EVT_SET(LVar4, 15) + EVT_EXEC_WAIT(LVarB) + EVT_SET(LVar0, LVarF) + EVT_END_IF + EVT_EXEC(LVar0) + EVT_CALL(func_802D2148) + EVT_CALL(ResetPartnerTetherDistance) + EVT_RETURN + EVT_END }; EvtScript EnterWalkCustom = { - EVT_CALL(ShortenPartnerTetherDistance) - EVT_CALL(CheckRideScriptForEnterExit) - EVT_CALL(UseEntryHeading, LVar1, LVar4) - EVT_IF_EQ(LVarA, 0) - EVT_CALL(TeleportPartnerToPlayer) - EVT_CALL(PlayerMoveTo, LVar1, LVar3, LVar4) - EVT_ELSE - EVT_SET(LVarF, LVar0) - EVT_SET(LVar0, 0) - EVT_SET(LVarC, 1) - EVT_EXEC_WAIT(LVarB) - EVT_SET(LVar0, LVarF) - EVT_END_IF - EVT_EXEC(LVar0) - EVT_CALL(func_802D2148) - EVT_CALL(ResetPartnerTetherDistance) - EVT_RETURN - EVT_END + EVT_CALL(ShortenPartnerTetherDistance) + EVT_CALL(CheckRideScriptForEnterExit) + EVT_CALL(UseEntryHeading, LVar1, LVar4) + EVT_IF_EQ(LVarA, 0) + EVT_CALL(TeleportPartnerToPlayer) + EVT_CALL(PlayerMoveTo, LVar1, LVar3, LVar4) + EVT_ELSE + EVT_SET(LVarF, LVar0) + EVT_SET(LVar0, 0) + EVT_SET(LVarC, 1) + EVT_EXEC_WAIT(LVarB) + EVT_SET(LVar0, LVarF) + EVT_END_IF + EVT_EXEC(LVar0) + EVT_CALL(func_802D2148) + EVT_CALL(ResetPartnerTetherDistance) + EVT_RETURN + EVT_END }; EvtScript EnterPostPipe = { - EVT_CALL(DisablePlayerPhysics, TRUE) - EVT_CALL(ShortenPartnerTetherDistance) - EVT_CALL(CheckRideScriptForEnterExit) - EVT_CALL(EnterPlayerPostPipe) - EVT_CALL(ResetPartnerTetherDistance) - EVT_CALL(DisablePlayerPhysics, FALSE) - EVT_RETURN - EVT_END + EVT_CALL(DisablePlayerPhysics, TRUE) + EVT_CALL(ShortenPartnerTetherDistance) + EVT_CALL(CheckRideScriptForEnterExit) + EVT_CALL(EnterPlayerPostPipe) + EVT_CALL(ResetPartnerTetherDistance) + EVT_CALL(DisablePlayerPhysics, FALSE) + EVT_RETURN + EVT_END }; EvtScript EnterSavePoint = { - EVT_CALL(ShortenPartnerTetherDistance) - EVT_CALL(SetPlayerPositionFromSaveData) - EVT_CALL(ClearPartnerMoveHistory, NPC_PARTNER) - EVT_CALL(ResetPartnerTetherDistance) - EVT_RETURN - EVT_END + EVT_CALL(ShortenPartnerTetherDistance) + EVT_CALL(SetPlayerPositionFromSaveData) + EVT_CALL(ClearPartnerMoveHistory, NPC_PARTNER) + EVT_CALL(ResetPartnerTetherDistance) + EVT_RETURN + EVT_END }; EvtScript ExitWalk = { - EVT_CALL(DisablePlayerInput, TRUE) - EVT_CALL(ShortenPartnerTetherDistance) - EVT_CALL(CheckRideScriptForEnterExit) - EVT_IF_EQ(LVarA, 0) - EVT_CALL(PlayerMoveTo, LVar1, LVar3, 15) - EVT_ELSE - EVT_SET(LVar0, 0) - EVT_SET(LVarC, 0) - EVT_SET(LVar4, 15) - EVT_EXEC_WAIT(LVarB) - EVT_END_IF - EVT_CALL(ResetPartnerTetherDistance) - EVT_RETURN - EVT_END + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(ShortenPartnerTetherDistance) + EVT_CALL(CheckRideScriptForEnterExit) + EVT_IF_EQ(LVarA, 0) + EVT_CALL(PlayerMoveTo, LVar1, LVar3, 15) + EVT_ELSE + EVT_SET(LVar0, 0) + EVT_SET(LVarC, 0) + EVT_SET(LVar4, 15) + EVT_EXEC_WAIT(LVarB) + EVT_END_IF + EVT_CALL(ResetPartnerTetherDistance) + EVT_RETURN + EVT_END }; EvtScript ExitSingleDoor = { - EVT_CALL(SetupSingleDoor) - EVT_EXEC_WAIT(BaseExitDoor) - EVT_RETURN - EVT_END + EVT_CALL(SetupSingleDoor) + EVT_EXEC_WAIT(BaseExitDoor) + EVT_RETURN + EVT_END }; EvtScript EnterSingleDoor = { - EVT_CALL(SetupSingleDoor) - EVT_EXEC_WAIT(BaseEnterDoor) - EVT_RETURN - EVT_END + EVT_CALL(SetupSingleDoor) + EVT_EXEC_WAIT(BaseEnterDoor) + EVT_RETURN + EVT_END }; EvtScript ExitSplitSingleDoor = { - EVT_CALL(SetupSplitSingleDoor) - EVT_EXEC_WAIT(BaseExitDoor) - EVT_RETURN - EVT_END + EVT_CALL(SetupSplitSingleDoor) + EVT_EXEC_WAIT(BaseExitDoor) + EVT_RETURN + EVT_END }; EvtScript EnterSplitSingleDoor = { - EVT_CALL(SetupSplitSingleDoor) - EVT_EXEC_WAIT(BaseEnterDoor) - EVT_RETURN - EVT_END + EVT_CALL(SetupSplitSingleDoor) + EVT_EXEC_WAIT(BaseEnterDoor) + EVT_RETURN + EVT_END }; EvtScript ExitDoubleDoor = { - EVT_CALL(SetupDoubleDoors) - EVT_EXEC_WAIT(BaseExitDoor) - EVT_RETURN - EVT_END + EVT_CALL(SetupDoubleDoors) + EVT_EXEC_WAIT(BaseExitDoor) + EVT_RETURN + EVT_END }; EvtScript EnterDoubleDoor = { - EVT_CALL(SetupDoubleDoors) - EVT_EXEC_WAIT(BaseEnterDoor) - EVT_RETURN - EVT_END + EVT_CALL(SetupDoubleDoors) + EVT_EXEC_WAIT(BaseEnterDoor) + EVT_RETURN + EVT_END }; EvtScript ExitSplitDoubleDoor = { - EVT_CALL(SetupSplitDoubleDoors) - EVT_EXEC_WAIT(BaseExitDoor) - EVT_RETURN - EVT_END + EVT_CALL(SetupSplitDoubleDoors) + EVT_EXEC_WAIT(BaseExitDoor) + EVT_RETURN + EVT_END }; EvtScript EnterSplitDoubleDoor = { - EVT_CALL(SetupSplitDoubleDoors) - EVT_EXEC_WAIT(BaseEnterDoor) - EVT_RETURN - EVT_END + EVT_CALL(SetupSplitDoubleDoors) + EVT_EXEC_WAIT(BaseEnterDoor) + EVT_RETURN + EVT_END }; EvtScript BaseExitDoor = { - EVT_CALL(DisablePlayerInput, TRUE) - EVT_CALL(DisablePlayerPhysics, TRUE) - EVT_CALL(ShortenPartnerTetherDistance) - EVT_SET(LVar9, LVar0) - EVT_CALL(GetEntryCoords, LVar0, LVarC, LVarD, LVarE, LVarB) - EVT_ADD(LVarB, 180) - EVT_CALL(InterpPlayerYaw, LVarB, 2) - EVT_CALL(ModifyColliderFlags, 0, LVar1, COLLIDER_FLAGS_UPPER_MASK) - EVT_CALL(PlaySoundAt, 0x90000000, 0, LVarC, LVarD, LVarE) - EVT_CALL(MakeLerp, 0, 80, 10, EASING_LINEAR) - EVT_LABEL(0) - EVT_CALL(UpdateLerp) - EVT_USE_BUF(LVar2) - EVT_LOOP(0) - EVT_BUF_READ1(LVarA) - EVT_IF_EQ(LVarA, -1) - EVT_BREAK_LOOP - EVT_END_IF - EVT_CALL(RotateModel, LVarA, LVar0, 0, 1, 0) - EVT_END_LOOP - EVT_USE_BUF(LVar3) - EVT_LOOP(0) - EVT_BUF_READ1(LVarA) - EVT_IF_EQ(LVarA, -1) - EVT_BREAK_LOOP - EVT_END_IF - EVT_CALL(RotateModel, LVarA, LVar0, 0, -1, 0) - EVT_END_LOOP - EVT_WAIT(1) - EVT_IF_NE(LVar1, 0) - EVT_GOTO(0) - EVT_END_IF - EVT_CALL(UseExitHeading, 40, LVar9) - EVT_CALL(CheckRideScriptForEnterExit) - EVT_IF_EQ(LVarA, 0) - EVT_CALL(PlayerMoveTo, LVar1, LVar3, 15) - EVT_ELSE - EVT_SET(LVar0, 0) - EVT_SET(LVarC, 0) - EVT_SET(LVar4, 15) - EVT_EXEC_WAIT(LVarB) - EVT_END_IF - EVT_CALL(ResetPartnerTetherDistance) - EVT_CALL(DisablePlayerPhysics, FALSE) - EVT_CALL(DisablePlayerInput, FALSE) - EVT_RETURN - EVT_END + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(DisablePlayerPhysics, TRUE) + EVT_CALL(ShortenPartnerTetherDistance) + EVT_SET(LVar9, LVar0) + EVT_CALL(GetEntryCoords, LVar0, LVarC, LVarD, LVarE, LVarB) + EVT_ADD(LVarB, 180) + EVT_CALL(InterpPlayerYaw, LVarB, 2) + EVT_CALL(ModifyColliderFlags, 0, LVar1, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(PlaySoundAt, 0x90000000, 0, LVarC, LVarD, LVarE) + EVT_CALL(MakeLerp, 0, 80, 10, EASING_LINEAR) + EVT_LABEL(0) + EVT_CALL(UpdateLerp) + EVT_USE_BUF(LVar2) + EVT_LOOP(0) + EVT_BUF_READ1(LVarA) + EVT_IF_EQ(LVarA, -1) + EVT_BREAK_LOOP + EVT_END_IF + EVT_CALL(RotateModel, LVarA, LVar0, 0, 1, 0) + EVT_END_LOOP + EVT_USE_BUF(LVar3) + EVT_LOOP(0) + EVT_BUF_READ1(LVarA) + EVT_IF_EQ(LVarA, -1) + EVT_BREAK_LOOP + EVT_END_IF + EVT_CALL(RotateModel, LVarA, LVar0, 0, -1, 0) + EVT_END_LOOP + EVT_WAIT(1) + EVT_IF_NE(LVar1, 0) + EVT_GOTO(0) + EVT_END_IF + EVT_CALL(UseExitHeading, 40, LVar9) + EVT_CALL(CheckRideScriptForEnterExit) + EVT_IF_EQ(LVarA, 0) + EVT_CALL(PlayerMoveTo, LVar1, LVar3, 15) + EVT_ELSE + EVT_SET(LVar0, 0) + EVT_SET(LVarC, 0) + EVT_SET(LVar4, 15) + EVT_EXEC_WAIT(LVarB) + EVT_END_IF + EVT_CALL(ResetPartnerTetherDistance) + EVT_CALL(DisablePlayerPhysics, FALSE) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_RETURN + EVT_END }; EvtScript BaseEnterDoor = { - EVT_CALL(DisablePlayerInput, TRUE) - EVT_CALL(ShortenPartnerTetherDistance) - EVT_USE_BUF(LVar2) - EVT_LOOP(0) - EVT_BUF_READ1(LVarA) - EVT_IF_EQ(LVarA, -1) - EVT_BREAK_LOOP - EVT_END_IF - EVT_CALL(RotateModel, LVarA, -80, 0, 1, 0) - EVT_END_LOOP - EVT_USE_BUF(LVar3) - EVT_LOOP(0) - EVT_BUF_READ1(LVarA) - EVT_IF_EQ(LVarA, -1) - EVT_BREAK_LOOP - EVT_END_IF - EVT_CALL(RotateModel, LVarA, -80, 0, -1, 0) - EVT_END_LOOP - EVT_CALL(GetEntryCoords, LVar0, LVar7, LVar8, LVar9, LVarB) - EVT_CALL(InterpPlayerYaw, LVarB, 2) - EVT_CALL(CheckRideScriptForEnterExit) - EVT_IF_EQ(LVarA, 0) - EVT_CALL(TeleportPartnerToPlayer) - EVT_CALL(PlayerMoveToDoor, 10) - EVT_ELSE - EVT_SET(LVar0, 1) - EVT_SET(LVarC, 1) - EVT_SET(LVar4, 15) - EVT_EXEC_WAIT(LVarB) - EVT_END_IF - EVT_THREAD - EVT_WAIT(8) - EVT_CALL(PlaySoundAt, 0x90000001, 0, LVar7, LVar8, LVar9) - EVT_END_THREAD - EVT_CALL(MakeLerp, -80, 0, 10, EASING_LINEAR) - EVT_LABEL(0) - EVT_CALL(UpdateLerp) - EVT_USE_BUF(LVar2) - EVT_LOOP(0) - EVT_BUF_READ1(LVarA) - EVT_IF_EQ(LVarA, -1) - EVT_BREAK_LOOP - EVT_END_IF - EVT_CALL(RotateModel, LVarA, LVar0, 0, 1, 0) - EVT_END_LOOP - EVT_USE_BUF(LVar3) - EVT_LOOP(0) - EVT_BUF_READ1(LVarA) - EVT_IF_EQ(LVarA, -1) - EVT_BREAK_LOOP - EVT_END_IF - EVT_CALL(RotateModel, LVarA, LVar0, 0, -1, 0) - EVT_END_LOOP - EVT_WAIT(1) - EVT_IF_NE(LVar1, 0) - EVT_GOTO(0) - EVT_END_IF - EVT_CALL(ResetPartnerTetherDistance) - EVT_CALL(DisablePlayerInput, FALSE) - EVT_RETURN - EVT_END + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(ShortenPartnerTetherDistance) + EVT_USE_BUF(LVar2) + EVT_LOOP(0) + EVT_BUF_READ1(LVarA) + EVT_IF_EQ(LVarA, -1) + EVT_BREAK_LOOP + EVT_END_IF + EVT_CALL(RotateModel, LVarA, -80, 0, 1, 0) + EVT_END_LOOP + EVT_USE_BUF(LVar3) + EVT_LOOP(0) + EVT_BUF_READ1(LVarA) + EVT_IF_EQ(LVarA, -1) + EVT_BREAK_LOOP + EVT_END_IF + EVT_CALL(RotateModel, LVarA, -80, 0, -1, 0) + EVT_END_LOOP + EVT_CALL(GetEntryCoords, LVar0, LVar7, LVar8, LVar9, LVarB) + EVT_CALL(InterpPlayerYaw, LVarB, 2) + EVT_CALL(CheckRideScriptForEnterExit) + EVT_IF_EQ(LVarA, 0) + EVT_CALL(TeleportPartnerToPlayer) + EVT_CALL(PlayerMoveToDoor, 10) + EVT_ELSE + EVT_SET(LVar0, 1) + EVT_SET(LVarC, 1) + EVT_SET(LVar4, 15) + EVT_EXEC_WAIT(LVarB) + EVT_END_IF + EVT_THREAD + EVT_WAIT(8) + EVT_CALL(PlaySoundAt, 0x90000001, 0, LVar7, LVar8, LVar9) + EVT_END_THREAD + EVT_CALL(MakeLerp, -80, 0, 10, EASING_LINEAR) + EVT_LABEL(0) + EVT_CALL(UpdateLerp) + EVT_USE_BUF(LVar2) + EVT_LOOP(0) + EVT_BUF_READ1(LVarA) + EVT_IF_EQ(LVarA, -1) + EVT_BREAK_LOOP + EVT_END_IF + EVT_CALL(RotateModel, LVarA, LVar0, 0, 1, 0) + EVT_END_LOOP + EVT_USE_BUF(LVar3) + EVT_LOOP(0) + EVT_BUF_READ1(LVarA) + EVT_IF_EQ(LVarA, -1) + EVT_BREAK_LOOP + EVT_END_IF + EVT_CALL(RotateModel, LVarA, LVar0, 0, -1, 0) + EVT_END_LOOP + EVT_WAIT(1) + EVT_IF_NE(LVar1, 0) + EVT_GOTO(0) + EVT_END_IF + EVT_CALL(ResetPartnerTetherDistance) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_RETURN + EVT_END }; diff --git a/src/world/script_api/push_blocks.c b/src/world/script_api/push_blocks.c index 0c2b7c09d2..a4c46c933b 100644 --- a/src/world/script_api/push_blocks.c +++ b/src/world/script_api/push_blocks.c @@ -293,31 +293,31 @@ API_CALLABLE(IsEventForSourceRunning) { } EvtScript EVS_PushWall_PushBlock = { - EVT_SET(LVarA, LVar0) // grid system - EVT_SET(LVarB, LVar1) // block entity ID + EVT_SET(LVarA, LVar0) // grid system + EVT_SET(LVarB, LVar1) // block entity ID // check cell where the block will move to - EVT_CALL(func_80282E30) - EVT_CALL(FacePlayerTowardPoint, BLOCK_PROP_I, BLOCK_PROP_K, 0) - EVT_IF_NE(LVar9, PUSH_BLOCK_INVALID) - EVT_CALL(MovePlayerTowardBlock) - EVT_END_IF + EVT_CALL(func_80282E30) + EVT_CALL(FacePlayerTowardPoint, BLOCK_PROP_I, BLOCK_PROP_K, 0) + EVT_IF_NE(LVar9, PUSH_BLOCK_INVALID) + EVT_CALL(MovePlayerTowardBlock) + EVT_END_IF // try setting the player action state - EVT_SET(LVarC, 0) - EVT_CALL(CheckPlayerActionState, LVarD, ACTION_STATE_RUN) - EVT_IF_EQ(LVarD, FALSE) - EVT_CALL(CheckPlayerActionState, LVarD, ACTION_STATE_PUSHING_BLOCK) - EVT_IF_EQ(LVarD, FALSE) - EVT_RETURN - EVT_END_IF - EVT_END_IF + EVT_SET(LVarC, 0) + EVT_CALL(CheckPlayerActionState, LVarD, ACTION_STATE_RUN) + EVT_IF_EQ(LVarD, FALSE) + EVT_CALL(CheckPlayerActionState, LVarD, ACTION_STATE_PUSHING_BLOCK) + EVT_IF_EQ(LVarD, FALSE) + EVT_RETURN + EVT_END_IF + EVT_END_IF // cancel state change if the block can't be pushed - EVT_IF_NE(LVar9, PUSH_BLOCK_READY) - EVT_CALL(SetPlayerActionState, ACTION_STATE_IDLE) - EVT_RETURN - EVT_END_IF + EVT_IF_NE(LVar9, PUSH_BLOCK_READY) + EVT_CALL(SetPlayerActionState, ACTION_STATE_IDLE) + EVT_RETURN + EVT_END_IF // wait for 8 frames of pushing - EVT_SET(LVarC, 0) - EVT_LABEL(0) + EVT_SET(LVarC, 0) + EVT_LABEL(0) EVT_ADD(LVarC, 1) EVT_CALL(CanPlayerPushBlock) EVT_IF_EQ(LVarD, TRUE) @@ -337,24 +337,24 @@ EvtScript EVS_PushWall_PushBlock = { EVT_GOTO(0) EVT_END_IF // perform the push - EVT_CALL(ClearPushedBlockFromGrid) - EVT_CALL(PlaySound, SOUND_2088) - EVT_CALL(DisablePlayerPhysics, TRUE) - EVT_CALL(UpdatePushBlockMotion) - EVT_CALL(FinishPushBlockMotion) - EVT_THREAD - EVT_WAIT(2) - EVT_CALL(CheckPlayerActionState, LVarD, ACTION_STATE_PUSHING_BLOCK) - EVT_IF_NE(LVarD, FALSE) - EVT_CALL(IsEventForSourceRunning, LVarD, EVT_PTR(EVS_PushWall_PushBlock)) - EVT_IF_EQ(LVarD, FALSE) - EVT_CALL(SetPlayerActionState, ACTION_STATE_IDLE) - EVT_END_IF - EVT_END_IF - EVT_END_THREAD - EVT_CALL(DisablePlayerPhysics, FALSE) - EVT_RETURN - EVT_END + EVT_CALL(ClearPushedBlockFromGrid) + EVT_CALL(PlaySound, SOUND_2088) + EVT_CALL(DisablePlayerPhysics, TRUE) + EVT_CALL(UpdatePushBlockMotion) + EVT_CALL(FinishPushBlockMotion) + EVT_THREAD + EVT_WAIT(2) + EVT_CALL(CheckPlayerActionState, LVarD, ACTION_STATE_PUSHING_BLOCK) + EVT_IF_NE(LVarD, FALSE) + EVT_CALL(IsEventForSourceRunning, LVarD, EVT_PTR(EVS_PushWall_PushBlock)) + EVT_IF_EQ(LVarD, FALSE) + EVT_CALL(SetPlayerActionState, ACTION_STATE_IDLE) + EVT_END_IF + EVT_END_IF + EVT_END_THREAD + EVT_CALL(DisablePlayerPhysics, FALSE) + EVT_RETURN + EVT_END }; API_CALLABLE(CreatePushBlockGrid) { diff --git a/src/world/script_api/shops.c b/src/world/script_api/shops.c index bf3f0d14b9..4d4a5460e9 100644 --- a/src/world/script_api/shops.c +++ b/src/world/script_api/shops.c @@ -805,11 +805,11 @@ void draw_shop_items(void) { ShopItemEntity* shopItemEntities; if (shop->flags & SHOP_FLAG_1) { - set_window_update(WINDOW_ID_10, (s32) basic_window_update); - set_window_update(WINDOW_ID_11, (s32) basic_window_update); + set_window_update(WINDOW_ID_ITEM_INFO_NAME, (s32) basic_window_update); + set_window_update(WINDOW_ID_ITEM_INFO_DESC, (s32) basic_window_update); } else { - set_window_update(WINDOW_ID_10, (s32) basic_hidden_window_update); - set_window_update(WINDOW_ID_11, (s32) basic_hidden_window_update); + set_window_update(WINDOW_ID_ITEM_INFO_NAME, (s32) basic_hidden_window_update); + set_window_update(WINDOW_ID_ITEM_INFO_DESC, (s32) basic_hidden_window_update); } if (shop->flags & SHOP_FLAG_1) { diff --git a/src/world/world.c b/src/world/world.c index 1e1c207b44..855a80e466 100644 --- a/src/world/world.c +++ b/src/world/world.c @@ -6,6 +6,31 @@ #include "sprite.h" #include "model.h" +s32 WorldReverbModeMapping[] = { 0, 1, 2, 3 }; + +//TODO possible data split here + +Vec3s gEntityColliderFaces[] = { + { 4, 6, 5 }, { 4, 7, 6 }, + { 0, 3, 4 }, { 3, 7, 4 }, + { 3, 2, 7 }, { 2, 6, 7 }, + { 2, 1, 6 }, { 1, 5, 6 }, + { 1, 0, 5 }, { 0, 4, 5 }, + { 0, 1, 2 }, { 0, 2, 3 }, +}; + +Vec3f gEntityColliderNormals[] = { + { 0.0f, 1.0f, 0.0f }, { 0.0f, 1.0f, 0.0f }, + { 1.0f, 0.0f, 0.0f }, { 1.0f, 0.0f, 0.0f }, + { 0.0f, 0.0f, -1.0f }, { 0.0f, 0.0f, -1.0f }, + { -1.0f, 0.0f, 0.0f }, { -1.0f, 0.0f, 0.0f }, + { 0.0f, 0.0f, 1.0f }, { 0.0f, 0.0f, 1.0f }, + { 0.0f, -1.0f, 0.0f }, { 0.0f, -1.0f, 0.0f }, +}; + +//TODO data split here! +s32 pad_map_table[] = { 0, 0 }; + #ifdef SHIFT #define ASSET_TABLE_ROM_START mapfs_ROM_START #else @@ -15,8 +40,6 @@ #define ASSET_TABLE_HEADER_SIZE 0x20 #define ASSET_TABLE_FIRST_ENTRY (ASSET_TABLE_ROM_START + ASSET_TABLE_HEADER_SIZE) -s32 WorldReverbModeMapping[] = { 0, 1, 2, 3 }; - // bss MapSettings gMapSettings; MapConfig* gMapConfig; @@ -271,22 +294,6 @@ INCLUDE_ASM_SHIFT(s32, "world/world", get_asset_offset); MAP(map), \ .init = &map##_map_init \ -// Should be removed once the data section containing .init and .settings of all maps have been disassembled -#define MAP_UNSPLIT(map, settingsVRAM) \ - .id = #map, \ - .settings = (MapSettings*)(settingsVRAM), \ - .dmaStart = map##_ROM_START, \ - .dmaEnd = map##_ROM_END, \ - .dmaDest = map##_VRAM \ - -// these, along with all the *_maps, almost certainly belong in the next file -s16 gEntityColliderFaces[] = { 4, 6, 5, 4, 7, 6, 0, 3, 4, 3, 7, 4, 3, 2, 7, 2, 6, 7, 2, 1, 6, 1, 5, 6, 1, 0, 5, - 0, 4, 5, 0, 1, 2, 0, 2, 3}; - -f32 gEntityColliderNormals[] = { 0.0f, 1.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f, 0.0f, 0.0f, 1.0f, 0.0f, 0.0f, 0.0f, - 0.0f, -1.0f, 0.0f, 0.0f, -1.0f, -1.0f, 0.0f, 0.0f, -1.0f, 0.0f, 0.0f, 0.0f, 0.0f, - 1.0f, 0.0f, 0.0f, 1.0f, 0.0f, -1.0f, 0.0f, 0.0f, -1.0f, 0.0f, 0.0f, 0.0f}; - /// Toad Town #include "area_mac/mac.h" MapConfig mac_maps[] = { @@ -565,31 +572,31 @@ MapConfig osr_maps[] = { /// @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 }, - { MAP_UNSPLIT(kkj_02, 0x80240030), .bgName = "nok_bg", .sfxReverb = 2 }, - { MAP_UNSPLIT(kkj_03, 0x80240360), .bgName = "nok_bg", .sfxReverb = 3, .init = (MapInit)0x80240000 }, - { MAP_UNSPLIT(kkj_10, 0x80241120), .songVariation = 1, .sfxReverb = 3 }, - { MAP_UNSPLIT(kkj_11, 0x80241160), .songVariation = 1, .sfxReverb = 3 }, - { MAP_UNSPLIT(kkj_12, 0x802408D0), .songVariation = 1, .sfxReverb = 2 }, - { MAP_UNSPLIT(kkj_13, 0x802407A0), .bgName = "kpa_bg", .songVariation = 1, .sfxReverb = 3, .init = (MapInit)0x80240000 }, - { MAP_UNSPLIT(kkj_14, 0x80240580), .bgName = "kpa_bg", .init = (MapInit)0x80240000 }, - { MAP_UNSPLIT(kkj_15, 0x80240640) }, - { MAP_UNSPLIT(kkj_16, 0x80241090), .sfxReverb = 1 }, - { MAP_UNSPLIT(kkj_17, 0x802405B0) }, - { MAP_UNSPLIT(kkj_18, 0x80240830), .bgName = "kpa_bg" }, - { MAP_UNSPLIT(kkj_19, 0x80240D20) }, - { MAP_UNSPLIT(kkj_20, 0x80240600) }, - { MAP_UNSPLIT(kkj_21, 0x80240010), .sfxReverb = 1 }, - { MAP_UNSPLIT(kkj_22, 0x80240020), .bgName = "kpa_bg", .songVariation = 1, .sfxReverb = 2 }, - { MAP_UNSPLIT(kkj_23, 0x802409F0), .bgName = "kpa_bg", .init = (MapInit)0x80240000 }, - { MAP_UNSPLIT(kkj_24, 0x80240040), .bgName = "kpa_bg", .songVariation = 1, .sfxReverb = 2 }, - { MAP_UNSPLIT(kkj_25, 0x80240F50), .bgName = "kpa_bg", .init = (MapInit)0x80240000 }, - { MAP_UNSPLIT(kkj_26, 0x80240070), .bgName = "kpa_bg" }, - { MAP_UNSPLIT(kkj_26, 0x80240070), .sfxReverb = 2 }, - { MAP_UNSPLIT(kkj_27, 0x802404C0), .sfxReverb = 1 }, - { MAP_UNSPLIT(kkj_28, 0x80240010), .sfxReverb = 1 }, - { MAP_UNSPLIT(kkj_29, 0x80240080), .sfxReverb = 1 }, + { MAP_WITH_INIT(kkj_00), .bgName = "nok_bg", .songVariation = 1, .sfxReverb = 3 }, + { MAP(kkj_01), .bgName = "nok_bg", .songVariation = 1, .sfxReverb = 3 }, + { MAP(kkj_02), .bgName = "nok_bg", .sfxReverb = 2 }, + { MAP_WITH_INIT(kkj_03), .bgName = "nok_bg", .sfxReverb = 3 }, + { MAP(kkj_10), .songVariation = 1, .sfxReverb = 3 }, + { MAP(kkj_11), .songVariation = 1, .sfxReverb = 3 }, + { MAP(kkj_12), .songVariation = 1, .sfxReverb = 2 }, + { MAP_WITH_INIT(kkj_13), .bgName = "kpa_bg", .songVariation = 1, .sfxReverb = 3}, + { MAP_WITH_INIT(kkj_14), .bgName = "kpa_bg" }, + { MAP(kkj_15) }, + { MAP(kkj_16), .sfxReverb = 1 }, + { MAP(kkj_17) }, + { MAP(kkj_18), .bgName = "kpa_bg" }, + { MAP(kkj_19) }, + { MAP(kkj_20) }, + { MAP(kkj_21), .sfxReverb = 1 }, + { MAP(kkj_22), .bgName = "kpa_bg", .songVariation = 1, .sfxReverb = 2 }, + { MAP_WITH_INIT(kkj_23), .bgName = "kpa_bg" }, + { MAP(kkj_24), .bgName = "kpa_bg", .songVariation = 1, .sfxReverb = 2 }, + { MAP_WITH_INIT(kkj_25), .bgName = "kpa_bg" }, + { MAP(kkj_26), .bgName = "kpa_bg" }, + { MAP(kkj_26), .sfxReverb = 2 }, + { MAP(kkj_27), .sfxReverb = 1 }, + { MAP(kkj_28), .sfxReverb = 1 }, + { MAP(kkj_29), .sfxReverb = 1 }, }; /// Jade Jungle @@ -880,5 +887,3 @@ AreaConfig gAreas[] = { AREA(tst, "テストマップ"), // tesuto mappu [Test map] {}, }; - -const f32 world_rodata_alignment = 0.0f; diff --git a/tools/disasm_script.py b/tools/disasm_script.py index dafb49e0b1..4070fb7f1b 100755 --- a/tools/disasm_script.py +++ b/tools/disasm_script.py @@ -722,7 +722,7 @@ class ScriptDisassembler: elif name.startswith("N(npcSettings_"): prefix = "NpcSettings " elif name.startswith("N(npcGroup_"): - prefix = "StaticNpc " + prefix = "NpcData " elif name.startswith("N(entryList_"): prefix = "EntryList " elif name.startswith("N(npcGroupList_"): @@ -1057,7 +1057,7 @@ if __name__ == "__main__": script_text = script.disassemble() if script.instructions > 1 and "_EVT_CMD" not in script_text: if gap and first_print: - potential_struct_sizes = { "StaticNpc": 0x1F0, "MobileAISettings":0x30, "NpcSettings":0x2C, "NpcGroupList":0xC } + potential_struct_sizes = { "NpcData": 0x1F0, "MobileAISettings":0x30, "NpcSettings":0x2C, "NpcGroupList":0xC } gap_size = offset - gap_start potential_struct = "Unknown data" potential_count = 1 diff --git a/tools/star_rod_idx_to_c.py b/tools/star_rod_idx_to_c.py index 980edad63b..384cb8ceec 100755 --- a/tools/star_rod_idx_to_c.py +++ b/tools/star_rod_idx_to_c.py @@ -290,7 +290,7 @@ def disassemble(bytes, midx, symbol_map={}, comments=True, romstart=0, namespace staticNpc = bytes.read(struct["length"]) curr_base = 0 numNpcs = struct['length'] // 0x1F0 - tmp_out = f"StaticNpc {name}" + ("[]" if numNpcs > 1 else "") + f" = {{\n" + tmp_out = f"NpcData {name}" + ("[]" if numNpcs > 1 else "") + f" = {{\n" for z in range(numNpcs): i = 0 diff --git a/ver/us/asm/data/world/area_kkj/kkj_00/ABC250.data.s b/ver/us/asm/data/world/area_kkj/kkj_00/ABC250.data.s deleted file mode 100644 index 94c9815f22..0000000000 --- a/ver/us/asm/data/world/area_kkj/kkj_00/ABC250.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240FC0_ABC250 -.word 0x00000000, 0x00000000, 0x43F00000, 0x00000000, 0x00000000, 0x42C80000, 0xC3B68000, 0x43340000, 0xC3D20000, 0x42200000, 0xC3820000, 0x43070000, 0x43660000, 0x00000000, 0xC3520000, 0x43340000, 0x43D20000, 0x42200000, 0xC3820000, 0x43610000, 0x00000000, 0x00000000, 0x43F00000, 0x00000000, 0x00000000, 0x00000000, 0x43F00000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x8024168C, D_80240FC0_ABC250, 0x00000007, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000000A, 0x00000002, 0xF5DE0180, 0xFFFFFF80, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000003, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x0000003F, 0x00000001, 0x00000007, 0x00000008, 0x00000001, 0x00000003, 0x00000013, 0x00000000, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x0000003F, 0x00000001, 0x00000008, 0x00000012, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000005A, 0x00000043, 0x00000003, FadeOutMusic, 0x00000000, 0x00000BB8, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kkj/kkj_00/ABC3D0.data.s b/ver/us/asm/data/world/area_kkj/kkj_00/ABC3D0.data.s deleted file mode 100644 index 76e3e546b8..0000000000 --- a/ver/us/asm/data/world/area_kkj/kkj_00/ABC3D0.data.s +++ /dev/null @@ -1,132 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80241140_ABC3D0 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, UseDoorSounds, 0x00000002, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000024, 0x00000002, 0xFE363C81, 0x00000005, 0x00000024, 0x00000002, 0xFE363C82, 0x00000008, 0x00000024, 0x00000002, 0xFE363C83, 0x0000000A, 0x00000044, 0x00000001, ExitDoubleDoor, 0x00000008, 0x00000001, 0x00000011, 0x00000043, 0x00000003, GotoMap, 0x80249D20, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802411F4_ABC484 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, UseDoorSounds, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000003, 0x00000024, 0x00000002, 0xFE363C81, 0x00000014, 0x00000024, 0x00000002, 0xFE363C82, 0x00000014, 0x00000024, 0x00000002, 0xFE363C83, 0x00000001, 0x00000044, 0x00000001, ExitSingleDoor, 0x00000008, 0x00000001, 0x00000011, 0x00000043, 0x00000003, GotoMap, 0x80249D28, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802412A8_ABC538 -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D0163, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802412F0_ABC580 -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000003, EnableNpcAI, 0x00000000, 0x00000000, 0x00000043, 0x00000003, EnableNpcAI, 0x00000001, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00820004, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00830001, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00820014, 0x00820004, 0x00000010, 0x00000026, 0x00000043, 0x00000003, EnableNpcAI, 0x00000000, 0x00000001, 0x00000043, 0x00000003, EnableNpcAI, 0x00000001, 0x00000001, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802413C4_ABC654 -.word 0x00000047, 0x00000005, D_802412F0_ABC580, 0x00000100, 0x00000000, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_802412A8_ABC538, 0x00000100, 0x0000000A, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_802412A8_ABC538, 0x00000100, 0x00000019, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80241140_ABC3D0, 0x00000100, 0x00000005, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_802411F4_ABC484, 0x00000100, 0x00000014, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241460_ABC6F0 -.word 0x00000043, 0x00000002, UseDoorSounds, 0x00000000, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000002, UseDoorSounds, 0x00000002, 0x00000024, 0x00000002, 0xFE363C82, 0x0000000F, 0x00000024, 0x00000002, 0xFE363C83, 0x0000000D, 0x00000046, 0x00000001, EnterDoubleDoor, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000002, UseDoorSounds, 0x00000002, 0x00000024, 0x00000002, 0xFE363C82, 0x00000008, 0x00000024, 0x00000002, 0xFE363C83, 0x0000000A, 0x00000046, 0x00000001, EnterDoubleDoor, 0x00000016, 0x00000001, 0x00000002, 0x00000024, 0x00000002, 0xFE363C82, 0x00000012, 0x00000024, 0x00000002, 0xFE363C83, 0x00000001, 0x00000046, 0x00000001, EnterSingleDoor, 0x00000016, 0x00000001, 0x00000003, 0x00000024, 0x00000002, 0xFE363C82, 0x00000014, 0x00000024, 0x00000002, 0xFE363C83, 0x00000001, 0x00000046, 0x00000001, EnterSingleDoor, 0x00000016, 0x00000001, 0x00000004, 0x00000024, 0x00000002, 0xFE363C82, 0x00000016, 0x00000024, 0x00000002, 0xFE363C83, 0x00000001, 0x00000046, 0x00000001, EnterSingleDoor, 0x00000016, 0x00000001, 0x00000005, 0x00000044, 0x00000001, 0x80243B7C, 0x00000016, 0x00000001, 0x00000006, 0x00000044, 0x00000001, 0x80249178, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024160C_ABC89C -.word 0x43B34000, 0x3F000000, 0x41A00000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_8024162C_ABC8BC -.word 0x3FC00000, 0x3F000000, 0x41A00000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_8024164C_ABC8DC -.word 0x00000043, 0x00000002, func_80240040_ABB2D0, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_80240040_ABB2D0, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0329, 0x00000019, 0x00000043, 0x00000002, SetSpriteShading, 0xFFFFFFFF, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000043, 0x00000003, SetCamLeadPlayer, 0x00000000, 0x00000000, 0x0000000A, 0x00000002, 0xF5DE0180, 0xFFFFFF80, 0x00000043, 0x00000003, MakeNpcs, 0x00000000, D_802439C4_ABEC54, 0x00000012, 0x00000000, 0x00000043, 0x00000003, MakeNpcs, 0x00000000, 0x80248DC4, 0x00000013, 0x00000000, 0x00000043, 0x00000003, EnableGroup, 0x00000001, 0x00000000, 0x00000043, 0x00000003, EnableGroup, 0x00000006, 0x00000000, 0x0000000A, 0x00000002, 0xF5DE0180, 0xFFFFFF80, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x0000003F, 0x00000001, 0x00000008, 0x00000012, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000005A, 0x00000043, 0x00000003, FadeOutMusic, 0x00000000, 0x00000BB8, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000044, 0x00000001, D_802413C4_ABC654, 0x00000044, 0x00000001, D_80241460_ABC6F0, 0x00000008, 0x00000001, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241820_ABCAB0 -.word 0x00000000, 0x00180018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000 - -dlabel D_8024184C_ABCADC -.word 0x3FC00000, 0x0000001E, 0x0000001E, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001 - -dlabel D_8024187C_ABCB0C -.word 0x00000043, 0x00000002, kkj_00_PatrolNoAttackAI_Main, D_8024184C_ABCADC, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024189C_ABCB2C -.word 0x00000000, 0x001E0018, 0x00000000, 0x00000000, D_8024187C_ABCB0C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630010, 0x00000000, 0x00170013, 0x00000000, 0x00000000, D_8024187C_ABCB0C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630010 - -dlabel D_802418F4_ABCB84 -.word 0x00000000, 0x001E0018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000, 0x00000000, 0x00170013, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000 - -dlabel D_8024194C_ABCBDC -.word 0x00000000, 0x00180018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000 - -dlabel D_80241978_ABCC08 -.word 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000003, GetSelfVar, 0x00000001, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000006, 0x00A90004, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000007, 0x009B0104, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, RandInt, 0x0000003C, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C80, 0x0000001E, 0x00000008, 0x00000001, 0xFE363C80, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000006, 0x00A90001, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000007, 0x009B0101, 0x00000008, 0x00000001, 0x0000000A, 0x00000006, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241A7C_ABCD0C -.word 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000003, GetSelfVar, 0x00000001, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000004, 0x00840104, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000005, 0x00840204, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, RandInt, 0x0000003C, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C80, 0x0000001E, 0x00000008, 0x00000001, 0xFE363C80, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000004, 0x00840101, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000005, 0x00840201, 0x00000008, 0x00000001, 0x0000000A, 0x00000006, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241B80_ABCE10 -.word 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000005, 0x00000043, 0x00000001, WaitForPlayerInputEnabled, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, AwaitPlayerLeave, 0xFE363C80, 0xFE363C82, 0x00000064, 0x00000008, 0x00000001, 0x00000032, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000001, 0xF24A8280, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00830002, 0x00000043, 0x00000005, NpcMoveTo, 0x00000001, 0x0000003C, 0x00000140, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00830001, 0x00000013, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000003, GetSelfVar, 0x00000001, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00830004, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00820014, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, RandInt, 0x0000003C, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C80, 0x0000001E, 0x00000008, 0x00000001, 0xFE363C80, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00820004, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00830001, 0x00000008, 0x00000001, 0x0000000A, 0x00000006, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241D4C_ABCFDC -.word 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000096, 0x00000005, 0x00000001, 0x00000002, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFF, 0x0000005A, 0x00000007, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFF, 0x0000010E, 0x00000007, 0x00000008, 0x00000001, 0x00000014, 0x00000006, 0x00000000, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241DD8_ABD068 -.word 0x00000043, 0x00000003, EnableNpcAI, 0x00000001, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00820004, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00830001, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00820014, 0x00820004, 0x00000010, 0x00000025, 0x00000043, 0x00000003, EnableNpcAI, 0x00000001, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241E64_ABD0F4 -.word 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00830001, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00820004, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00830004, 0x00830001, 0x00000010, 0x00000029, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241EC8_ABD158 -.word 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00830004, 0x00830001, 0x00000010, 0x0000002A, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241EF8_ABD188 -.word 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00830304, 0x00830301, 0x00000000, 0x0000002B, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241F28_ABD1B8 -.word 0x00000043, 0x00000003, SetNpcAnimation, 0x00000004, 0x00840101, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000005, 0x00840201, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00840104, 0x00840101, 0x00000010, 0x0000002C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241F8C_ABD21C -.word 0x00000043, 0x00000003, EnableNpcAI, 0x00000004, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000005, 0x00840201, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000004, 0x00840101, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00840204, 0x00840201, 0x00000010, 0x0000002D, 0x00000043, 0x00000003, EnableNpcAI, 0x00000004, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242018_ABD2A8 -.word 0x00000043, 0x00000003, SetNpcAnimation, 0x00000007, 0x009B0101, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000006, 0x00A90001, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00A90004, 0x00A90001, 0x00000010, 0x00000027, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024207C_ABD30C -.word 0x00000043, 0x00000003, EnableNpcAI, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000006, 0x00A90001, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000007, 0x009B0101, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x009B0104, 0x009B0101, 0x00000010, 0x00000028, 0x00000043, 0x00000003, EnableNpcAI, 0x00000006, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242108_ABD398 -.word 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x009A0004, 0x009A0001, 0x00000000, 0x00000030, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242138_ABD3C8 -.word 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00870004, 0x00870001, 0x00000010, 0x0000002E, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242168_ABD3F8 -.word 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00870204, 0x00870201, 0x00000010, 0x0000002F, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242198_ABD428 -.word 0x00000043, 0x00000004, SetNpcCollisionSize, 0xFFFFFFFF, 0x0000002E, 0x0000001A, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000005, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000244, 0x00000043, 0x00000003, SetNpcYaw, 0xFFFFFFFF, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000014, 0x00000000, 0x00000140, 0x00000043, 0x00000003, SetNpcYaw, 0xFFFFFFFF, 0x0000005A, 0x00000013, 0x00000000, 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, D_80241DD8_ABD068, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242264_ABD4F4 -.word 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000005, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x0000003C, 0x00000000, 0x00000140, 0x00000043, 0x00000003, SetNpcYaw, 0xFFFFFFFF, 0x0000010E, 0x00000013, 0x00000000, 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, D_80241B80_ABCE10, 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, D_80241E64_ABD0F4, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802422F4_ABD584 -.word 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, D_80241EC8_ABD158, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242318_ABD5A8 -.word 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, D_80241D4C_ABCFDC, 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, D_80241EF8_ABD188, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242350_ABD5E0 -.word 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, D_80241A7C_ABCD0C, 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, D_80241F28_ABD1B8, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242388_ABD618 -.word 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, D_80241F8C_ABD21C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802423AC_ABD63C -.word 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, D_80241978_ABCC08, 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, D_80242018_ABD2A8, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802423E4_ABD674 -.word 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, D_8024207C_ABD30C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242408_ABD698 -.word 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, D_80242108_ABD398, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024242C_ABD6BC -.word 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, D_80242138_ABD3C8, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242450_ABD6E0 -.word 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, D_80242168_ABD3F8, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242474_ABD704 -.word 0x00000000, D_80241820_ABCAB0, 0x00000000, 0xC47A0000, 0x00000000, 0x00400D0D, D_80242198_ABD428, 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, 0x00820000, 0x00820000, 0x00820000, 0x00820000, 0x00820000, 0x00820000, 0x00820000, 0x00820000, 0x00820000, 0x00820000, 0x00820000, 0x00820000, 0x00820000, 0x00820000, 0x00820000, 0x00820000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, D_802418F4_ABCB84, 0x43360000, 0x00000000, 0x43A00000, 0x00400D0D, D_80242264_ABD4F4, 0x00000000, 0x00000000, 0x0000010E, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00830001, 0x00830002, 0x00830003, 0x00830003, 0x00830001, 0x00830001, 0x00830006, 0x00830006, 0x00830003, 0x00830003, 0x00830003, 0x00830003, 0x00830003, 0x00830003, 0x00830003, 0x00830003, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, D_8024189C_ABCB2C, 0xC37A0000, 0x00000000, 0x437A0000, 0x00000D0D, D_802422F4_ABD584, 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, 0x00000002, 0xFFFFFF06, 0x00000000, 0x000000FA, 0x000000FA, 0x00000000, 0x000000FA, 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, 0xFFFFFF06, 0x00000000, 0x000000FA, 0x000000C8, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00830001, 0x00830002, 0x00830003, 0x00830003, 0x00830001, 0x00830001, 0x00830006, 0x00830006, 0x00830003, 0x00830003, 0x00830003, 0x00830003, 0x00830003, 0x00830003, 0x00830003, 0x00830003, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000003, D_802418F4_ABCB84, 0x43160000, 0x00000000, 0x00000000, 0x00000D0D, D_80242318_ABD5A8, 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, 0x00830301, 0x00830302, 0x00830303, 0x00830303, 0x00830301, 0x00830301, 0x00830306, 0x00830306, 0x00830303, 0x00830303, 0x00830303, 0x00830303, 0x00830303, 0x00830303, 0x00830303, 0x00830303, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000004, D_802418F4_ABCB84, 0xC3960000, 0x00000000, 0x42C80000, 0x00400D0D, D_80242350_ABD5E0, 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, 0x00840101, 0x00840102, 0x00840103, 0x00840103, 0x00840101, 0x00840101, 0x00840106, 0x00840106, 0x00840103, 0x00840103, 0x00840103, 0x00840103, 0x00840103, 0x00840103, 0x00840103, 0x00840103, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000005, D_802418F4_ABCB84, 0xC3870000, 0x00000000, 0x42AA0000, 0x00400D0D, D_80242388_ABD618, 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, 0x00840201, 0x00840202, 0x00840203, 0x00840203, 0x00840201, 0x00840201, 0x00840206, 0x00840206, 0x00840203, 0x00840203, 0x00840203, 0x00840203, 0x00840203, 0x00840203, 0x00840203, 0x00840203, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000006, D_802418F4_ABCB84, 0x43960000, 0x00000000, 0x43160000, 0x00400D0D, D_802423AC_ABD63C, 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, 0x00A90001, 0x00A90001, 0x00A90001, 0x00A90001, 0x00A90001, 0x00A90001, 0x00A90001, 0x00A90001, 0x00A90001, 0x00A90001, 0x00A90001, 0x00A90001, 0x00A90001, 0x00A90001, 0x00A90001, 0x00A90001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000007, D_802418F4_ABCB84, 0x43A50000, 0x00000000, 0x43070000, 0x00400D0D, D_802423E4_ABD674, 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, 0x009B0101, 0x009B0102, 0x009B0101, 0x009B0101, 0x009B0101, 0x009B0101, 0x009B0101, 0x009B0101, 0x009B0101, 0x009B0101, 0x009B0101, 0x009B0101, 0x009B0101, 0x009B0101, 0x009B0101, 0x009B0101, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, D_8024194C_ABCBDC, 0xC2F00000, 0x42C80000, 0xC3988000, 0x00000D0D, D_80242408_ABD698, 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, 0x009A0001, 0x009A0002, 0x009A0003, 0x009A0003, 0x009A0001, 0x009A0001, 0x009A0001, 0x009A0001, 0x009A0001, 0x009A0001, 0x009A0001, 0x009A0001, 0x009A0001, 0x009A0001, 0x009A0001, 0x009A0001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000009, D_802418F4_ABCB84, 0x42C80000, 0x00000000, 0x43160000, 0x00400D0D, D_8024242C_ABD6BC, 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, 0x00870001, 0x00870001, 0x00870001, 0x00870001, 0x00870001, 0x00870001, 0x00870001, 0x00870001, 0x00870001, 0x00870001, 0x00870001, 0x00870001, 0x00870001, 0x00870001, 0x00870001, 0x00870001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000000A, D_802418F4_ABCB84, 0xC2480000, 0x42C80000, 0xC3B68000, 0x00400D0D, D_80242450_ABD6E0, 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, 0x00870201, 0x00870201, 0x00870201, 0x00870201, 0x00870201, 0x00870201, 0x00870201, 0x00870201, 0x00870201, 0x00870201, 0x00870201, 0x00870201, 0x00870201, 0x00870201, 0x00870201, 0x00870201, 0x00000000, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_802439C4_ABEC54 -.word 0x0000000B, D_80242474_ABD704, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kkj/kkj_00/ABEC70.data.s b/ver/us/asm/data/world/area_kkj/kkj_00/ABEC70.data.s deleted file mode 100644 index 116bf75cdf..0000000000 --- a/ver/us/asm/data/world/area_kkj/kkj_00/ABEC70.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802439E0_ABEC70 -.word 0x00000043, 0x00000004, PlaySoundAtCollider, 0x00000000, 0x000001C5, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x00000050, 0x0000000E, 0x00000004, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateModel, 0x0000000F, 0xFE363C80, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x0000000D, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000005, MakeLerp, 0x00000050, 0x00000000, 0x00000008, 0x00000004, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateModel, 0x0000000F, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x0000000D, 0xFE363C80, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x00000000, 0x000001C6, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000044, 0x00000001, D_802439E0_ABEC70, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000000, 0xF24A8A80, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x0082001E, 0x00000043, 0x00000005, NpcMoveTo, 0x00000000, 0x00000014, 0x00000140, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00820004, 0x00000057, 0x00000000, 0x00000043, 0x00000004, func_802D1270, 0x00000050, 0x0000012C, 0xF24A8A80, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000010E, 0x00000005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00820014, 0x00820004, 0x00000000, 0x00000024, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kkj/kkj_00/ABEF20.data.s b/ver/us/asm/data/world/area_kkj/kkj_00/ABEF20.data.s deleted file mode 100644 index b2fdf99f6c..0000000000 --- a/ver/us/asm/data/world/area_kkj/kkj_00/ABEF20.data.s +++ /dev/null @@ -1,141 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80243C90_ABEF20 -.word 0x00000000, 0x001E0018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000, 0x00000000, 0x00170013, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000 - -dlabel D_80243CE8_ABEF78 -.word 0x00000000, 0x002E0024, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000 - -dlabel D_80243D14_ABEFA4 -.word 0x00000000, 0x00180018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000 - -dlabel D_80243D40_ABEFD0 -.word 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0xFFFFFED4, 0x00000000, 0x00000127, 0x00000043, 0x00000003, SetNpcYaw, 0xFFFFFFFF, 0x0000005A, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80243D80_ABF010 -.word 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0xFFFFFF51, 0x00000000, 0xFFFFFFB5, 0x00000043, 0x00000003, SetNpcYaw, 0xFFFFFFFF, 0x0000005A, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0xFFFFFE48, 0x00000000, 0x000000DC, 0x00000043, 0x00000003, SetNpcYaw, 0xFFFFFFFF, 0x0000005A, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80243E00_ABF090 -.word 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000127, 0x00000000, 0xFFFFFFF1, 0x00000043, 0x00000003, SetNpcYaw, 0xFFFFFFFF, 0x0000010E, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80243E40_ABF0D0 -.word 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000145, 0x00000000, 0xFFFFFFF6, 0x00000043, 0x00000003, SetNpcYaw, 0xFFFFFFFF, 0x0000010E, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80243E80_ABF110 -.word 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000032, 0x00000064, 0xFFFFFE93, 0x00000043, 0x00000003, SetNpcYaw, 0xFFFFFFFF, 0x0000010E, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80243EC0_ABF150 -.word 0x000A0000, 0x000A0001, 0x000C0026, 0x000C0000, 0x000C0001, 0x000C0002, 0x000A0002, 0x000C0010, 0x000D000F, 0xFFFFFFFF - -dlabel D_80243EE8_ABF178 -.word 0x00890000, 0x00890001, 0x00890002, 0x00890004, 0xFFFFFFFF - -dlabel D_80243EFC_ABF18C -.word 0x00AA0000, 0x00AA0001, 0xFFFFFFFF - -dlabel D_80243F08_ABF198 -.word 0x00A90000, 0x00A90001, 0xFFFFFFFF - -dlabel D_80243F14_ABF1A4 -.word 0x009B0000, 0x009B0001, 0xFFFFFFFF - -dlabel D_80243F20_ABF1B0 -.word 0x00830000, 0x00830001, 0xFFFFFFFF - -dlabel D_80243F2C_ABF1BC -.word 0x00840000, 0x00840001, 0xFFFFFFFF - -dlabel D_80243F38_ABF1C8 -.word 0x00870000, 0x00870001, 0x00870004, 0xFFFFFFFF - -dlabel D_80243F48_ABF1D8 -.word 0x00010000, 0x00010001, 0xFFFFFFFF - -dlabel D_80243F54_ABF1E4 -.word 0x00020000, 0x00020003, 0xFFFFFFFF - -dlabel D_80243F60_ABF1F0 -.word 0x00030000, 0x00030003, 0xFFFFFFFF - -dlabel D_80243F6C_ABF1FC -.word 0x00040000, 0x00040001, 0xFFFFFFFF - -dlabel D_80243F78_ABF208 -.word 0x00050000, 0x00050001, 0xFFFFFFFF - -dlabel D_80243F84_ABF214 -.word 0x00060000, 0x00060001, 0xFFFFFFFF - -dlabel D_80243F90_ABF220 -.word 0x00070000, 0x00070001, 0xFFFFFFFF - -dlabel D_80243F9C_ABF22C -.word 0x00080000, 0x00080001, 0xFFFFFFFF - -dlabel D_80243FA8_ABF238 -.word 0x00A50000, 0x00A50001, 0xFFFFFFFF - -dlabel D_80243FB4_ABF244 -.word 0x00B00000, 0x00B00001, 0xFFFFFFFF - -dlabel D_80243FC0_ABF250 -.word 0x00B20000, 0x00B20001, 0xFFFFFFFF - -dlabel D_80243FCC_ABF25C -.word 0x00BA0000, 0x00BA0004, 0xFFFFFFFF - -dlabel D_80243FD8_ABF268 -.word 0x00D20000, 0x00D20001, 0xFFFFFFFF - -dlabel D_80243FE4_ABF274 -.word 0x00CC0000, 0x00CC0001, 0xFFFFFFFF - -dlabel D_80243FF0_ABF280 -.word 0x00BF0000, 0x00BF0001, 0xFFFFFFFF - -dlabel D_80243FFC_ABF28C -.word 0x009D0000, 0x009D0001, 0xFFFFFFFF - -dlabel D_80244008_ABF298 -.word 0x009E0000, 0x009E0001, 0xFFFFFFFF - -dlabel D_80244014_ABF2A4 -.word 0x00960000, 0x00960001, 0xFFFFFFFF - -dlabel D_80244020_ABF2B0 -.word 0x009A0000, 0x009A0001, 0xFFFFFFFF - -dlabel D_8024402C_ABF2BC -.word 0x00930000, 0x00930001, 0xFFFFFFFF - -dlabel D_80244038_ABF2C8 -.word 0x00CD0000, 0x00CD0001, 0xFFFFFFFF - -dlabel D_80244044_ABF2D4 -.word 0x00000000, D_80243CE8_ABEF78, 0x00000000, 0x42C80000, 0xC3DC0000, 0x00020F0D, 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, 0x000A0000, 0x000A0000, 0x000A0000, 0x000A0000, 0x000A0000, 0x000A0000, 0x000A0000, 0x000A0000, 0x000A0000, 0x000A0000, 0x000A0000, 0x000A0000, 0x000A0000, 0x000A0000, 0x000A0000, 0x000A0000, 0x00000000, 0x00000000, D_80243EC0_ABF150, 0x00000000 - -dlabel D_80244234_ABF4C4 -.word 0x00000001, D_80243C90_ABEF20, 0x42C80000, 0x00000000, 0x437A0000, 0x3F002F0D, 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, 0x00890001, 0x00890001, 0x00890001, 0x00890001, 0x00890001, 0x00890001, 0x00890001, 0x00890001, 0x00890001, 0x00890001, 0x00890001, 0x00890001, 0x00890001, 0x00890001, 0x00890001, 0x00890001, 0x00000000, 0x00000000, D_80243EE8_ABF178, 0x00000000, 0x00000002, D_80243C90_ABEF20, 0xC3480000, 0x00000000, 0x43820000, 0x3F002F0D, 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, 0x00AA0001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80243EFC_ABF18C, 0x00000000, 0x00000003, D_80243C90_ABEF20, 0x43960000, 0x00000000, 0x43160000, 0x3F002F0D, D_80243D40_ABEFD0, 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, 0x00A90001, 0x00A90001, 0x00A90001, 0x00A90001, 0x00A90001, 0x00A90001, 0x00A90001, 0x00A90001, 0x00A90001, 0x00A90001, 0x00A90001, 0x00A90001, 0x00A90001, 0x00A90001, 0x00A90001, 0x00A90001, 0x00000000, 0x00000000, D_80243F08_ABF198, 0x00000000, 0x00000004, D_80243C90_ABEF20, 0x43A50000, 0x00000000, 0x43070000, 0x3F002F0D, D_80243D80_ABF010, 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, 0x009B0101, 0x009B0102, 0x009B0101, 0x009B0101, 0x009B0101, 0x009B0101, 0x009B0101, 0x009B0101, 0x009B0101, 0x009B0101, 0x009B0101, 0x009B0101, 0x009B0101, 0x009B0101, 0x009B0101, 0x009B0101, 0x00000000, 0x00000000, D_80243F14_ABF1A4, 0x00000000 - -dlabel D_802449F4_ABFC84 -.word 0x00000005, D_80243D14_ABEFA4, 0x43340000, 0x00000000, 0x42A00000, 0x3F002F0D, 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, 0x00010001, 0x00010002, 0x00010003, 0x00010003, 0x00010001, 0x00010001, 0x00010000, 0x00010000, 0x00010003, 0x00010003, 0x00010003, 0x00010003, 0x00010003, 0x00010003, 0x00010003, 0x00010003, 0x00000000, 0x00000000, D_80243F48_ABF1D8, 0x00000000, 0x00000006, D_80243D14_ABEFA4, 0x43610000, 0x00000000, 0x43610000, 0x3F002F0D, 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, 0x00020003, 0x00020004, 0x00020004, 0x00020004, 0x00020004, 0x00020004, 0x00020000, 0x00020000, 0x00020000, 0x00020000, 0x00020000, 0x00020000, 0x00020000, 0x00020000, 0x00020000, 0x00020000, 0x00000000, 0x00000000, D_80243F54_ABF1E4, 0x00000000, 0x00000007, D_80243D14_ABEFA4, 0x43870000, 0x00000000, 0x42E60000, 0x3F002F0D, 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, 0x00030003, 0x00030005, 0x00030005, 0x00030005, 0x00030005, 0x00030005, 0x00030000, 0x00030000, 0x00030000, 0x00030000, 0x00030000, 0x00030000, 0x00030000, 0x00030000, 0x00030000, 0x00030000, 0x00000000, 0x00000000, D_80243F60_ABF1F0, 0x00000000, 0x00000008, D_80243D14_ABEFA4, 0x43A28000, 0x41200000, 0x432F0000, 0x3F000F0D, 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, 0x00040001, 0x00040002, 0x00040003, 0x00040003, 0x00040001, 0x00040001, 0x00040000, 0x00040000, 0x00040001, 0x00040001, 0x00040001, 0x00040001, 0x00040001, 0x00040001, 0x00040001, 0x00040001, 0x00000000, 0x00000000, D_80243F6C_ABF1FC, 0x00000000, 0x00000009, D_80243D14_ABEFA4, 0xC3870000, 0x00000000, 0x43110000, 0x3F002F0D, 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, 0x00050001, 0x00050002, 0x00050003, 0x00050003, 0x00050001, 0x00050001, 0x00050000, 0x00050000, 0x00050003, 0x00050003, 0x00050003, 0x00050003, 0x00050003, 0x00050003, 0x00050003, 0x00050003, 0x00000000, 0x00000000, D_80243F78_ABF208, 0x00000000, 0x0000000A, D_80243D14_ABEFA4, 0xC36B0000, 0x00000000, 0x42AA0000, 0x3F002F0D, 0x00000000, 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, 0x00060001, 0x00060001, 0x00060001, 0x00060001, 0x00060001, 0x00060001, 0x00060001, 0x00060001, 0x00060001, 0x00060001, 0x00060001, 0x00060001, 0x00060001, 0x00060001, 0x00060001, 0x00060001, 0x00000000, 0x00000000, D_80243F84_ABF214, 0x00000000, 0x0000000B, D_80243D14_ABEFA4, 0xC33E0000, 0x00000000, 0x42480000, 0x3F002F0D, 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, 0x00070001, 0x00070001, 0x00070001, 0x00070001, 0x00070001, 0x00070001, 0x00070001, 0x00070001, 0x00070001, 0x00070001, 0x00070001, 0x00070001, 0x00070001, 0x00070001, 0x00070001, 0x00070001, 0x00000000, 0x00000000, D_80243F90_ABF220, 0x00000000, 0x0000000C, D_80243D14_ABEFA4, 0xC3A00000, 0x00000000, 0xC2700000, 0x3F002F0D, 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, 0x00080001, 0x00080001, 0x00080001, 0x00080001, 0x00080001, 0x00080001, 0x00080001, 0x00080001, 0x00080001, 0x00080001, 0x00080001, 0x00080001, 0x00080001, 0x00080001, 0x00080001, 0x00080001, 0x00000000, 0x00000000, D_80243F9C_ABF22C, 0x00000000 - -dlabel D_80245974_AC0C04 -.word 0x0000000D, D_80243D14_ABEFA4, 0xC3110000, 0x00000000, 0x43CF8000, 0x3F002F0D, 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, 0x00A50001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80243FA8_ABF238, 0x00000000, 0x0000000E, D_80243D14_ABEFA4, 0xC3610000, 0x00000000, 0x43BE0000, 0x3F002F0D, 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, 0x00B00001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80243FB4_ABF244, 0x00000000, 0x0000000F, D_80243D14_ABEFA4, 0xC32F0000, 0x00000000, 0x43A50000, 0x3F002F0D, 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, 0x00B20001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80243FC0_ABF250, 0x00000000, 0x00000010, D_80243D14_ABEFA4, 0xC37A0000, 0x00000000, 0x43AF0000, 0x3F002F0D, 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, 0x00BA0004, 0x00BA0005, 0x00BA0006, 0x00BA0006, 0x00BA0004, 0x00BA0004, 0x00BA0004, 0x00BA0004, 0x00BA0004, 0x00BA0004, 0x00BA0004, 0x00BA0004, 0x00BA0004, 0x00BA0004, 0x00BA0004, 0x00BA0004, 0x00000000, 0x00000000, D_80243FCC_ABF25C, 0x00000000, 0x00000011, D_80243D14_ABEFA4, 0xC35C0000, 0x00000000, 0x43E10000, 0x3F002F0D, 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, 0x00D20001, 0x00D20001, 0x00D20001, 0x00D20001, 0x00D20001, 0x00D20001, 0x00D20001, 0x00D20001, 0x00D20001, 0x00D20001, 0x00D20001, 0x00D20001, 0x00D20001, 0x00D20001, 0x00D20001, 0x00D20001, 0x00000000, 0x00000000, D_80243FD8_ABF268, 0x00000000 - -dlabel D_80246324_AC15B4 -.word 0x00000012, D_80243D14_ABEFA4, 0xC3B68000, 0x00000000, 0xC2700000, 0x3F002F0D, 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, 0x00CC0001, 0x00CC0001, 0x00CC0001, 0x00CC0001, 0x00CC0001, 0x00CC0001, 0x00CC0001, 0x00CC0001, 0x00CC0001, 0x00CC0001, 0x00CC0001, 0x00CC0001, 0x00CC0001, 0x00CC0001, 0x00CC0001, 0x00CC0001, 0x00000000, 0x00000000, D_80243FE4_ABF274, 0x00000000, 0x00000013, D_80243D14_ABEFA4, 0xC3AA0000, 0x00000000, 0x42C80000, 0x3F002F0D, 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, 0x00BF0001, 0x00BF0002, 0x00BF0003, 0x00BF0003, 0x00BF0001, 0x00BF0001, 0x00BF0000, 0x00BF0000, 0x00BF0005, 0x00BF0006, 0x00BF0007, 0x00BF0008, 0x00BF0005, 0x00BF0006, 0x00BF0007, 0x00BF0008, 0x00000000, 0x00000000, D_80243FF0_ABF280, 0x00000000, 0x00000014, D_80243D14_ABEFA4, 0x432A0000, 0x00000000, 0x00000000, 0x3F002F0D, 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, 0x009D0001, 0x009D0002, 0x009D0003, 0x009D0003, 0x009D0001, 0x009D0001, 0x009D0000, 0x009D0000, 0x009D0003, 0x009D0003, 0x009D0003, 0x009D0003, 0x009D0003, 0x009D0003, 0x009D0003, 0x009D0003, 0x00000000, 0x00000000, D_80243FFC_ABF28C, 0x00000000, 0x00000015, D_80243D14_ABEFA4, 0x430C0000, 0x00000000, 0x42480000, 0x3F002F0D, 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, 0x009E0001, 0x009E0005, 0x009E0007, 0x009E0007, 0x009E0001, 0x009E0001, 0x009E0000, 0x009E0000, 0x009E0007, 0x009E0007, 0x009E0007, 0x009E0007, 0x009E0007, 0x009E0007, 0x009E0007, 0x009E0007, 0x00000000, 0x00000000, D_80244008_ABF298, 0x00000000 - -dlabel D_80246AE4_AC1D74 -.word 0x00000016, D_80243D14_ABEFA4, 0xC3AA0000, 0x00000000, 0x439B0000, 0x3F002F0D, 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, 0x00960101, 0x00960102, 0x00960101, 0x00960101, 0x00960101, 0x00960101, 0x00960101, 0x00960101, 0x00960101, 0x00960101, 0x00960101, 0x00960101, 0x00960101, 0x00960101, 0x00960101, 0x00960101, 0x00000000, 0x00000000, D_80244014_ABF2A4, 0x00000000, 0x00000018, D_80243D14_ABEFA4, 0x43610000, 0x00000000, 0xC2A00000, 0x3F002F0D, 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, 0x009A0001, 0x009A0002, 0x009A0003, 0x009A0003, 0x009A0001, 0x009A0001, 0x009A0001, 0x009A0001, 0x009A0001, 0x009A0001, 0x009A0001, 0x009A0001, 0x009A0001, 0x009A0001, 0x009A0001, 0x009A0001, 0x00000000, 0x00000000, D_80244020_ABF2B0, 0x00000000, 0x00000019, D_80243D14_ABEFA4, 0xC37A0000, 0x00000000, 0xC3160000, 0x3F002F0D, 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, 0x009A0001, 0x009A0002, 0x009A0003, 0x009A0003, 0x009A0001, 0x009A0001, 0x009A0001, 0x009A0001, 0x009A0001, 0x009A0001, 0x009A0001, 0x009A0001, 0x009A0001, 0x009A0001, 0x009A0001, 0x009A0001, 0x00000000, 0x00000000, D_80244020_ABF2B0, 0x00000000, 0x0000001A, D_80243D14_ABEFA4, 0xC3A00000, 0x00000000, 0x43750000, 0x3F002F0D, 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, 0x00930301, 0x00930302, 0x00930303, 0x00930303, 0x00930301, 0x00930301, 0x00930300, 0x00930300, 0x00930301, 0x00930301, 0x00930301, 0x00930301, 0x00930301, 0x00930301, 0x00930301, 0x00930301, 0x00000000, 0x00000000, D_8024402C_ABF2BC, 0x00000000, 0x0000001C, D_80243D14_ABEFA4, 0xC3C58000, 0x42880000, 0x42480000, 0x3F002F0D, 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, 0x00CD0001, 0x00CD0002, 0x00CD0001, 0x00CD0001, 0x00CD0001, 0x00CD0001, 0x00CD0001, 0x00CD0001, 0x00CD0001, 0x00CD0001, 0x00CD0001, 0x00CD0001, 0x00CD0001, 0x00CD0001, 0x00CD0001, 0x00CD0001, 0x00000000, 0x00000000, D_80244038_ABF2C8, 0x00000000 - -dlabel D_80247494_AC2724 -.word 0x0000001F, D_80243C90_ABEF20, 0x43480000, 0x00000000, 0x43D20000, 0x3F002F0D, 0x00000000, 0x00000000, 0x00000000, 0x0000010E, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00830001, 0x00830002, 0x00830003, 0x00830003, 0x00830001, 0x00830001, 0x00830006, 0x00830006, 0x00830003, 0x00830003, 0x00830003, 0x00830003, 0x00830003, 0x00830003, 0x00830003, 0x00830003, 0x00000000, 0x00000000, D_80243F20_ABF1B0, 0x00000000, 0x00000020, D_80243C90_ABEF20, 0xC2F00000, 0x00000000, 0x434D0000, 0x3F002F0D, 0x00000000, 0x00000000, 0x00000000, 0x0000005A, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00830301, 0x00830302, 0x00830303, 0x00830303, 0x00830301, 0x00830301, 0x00830306, 0x00830306, 0x00830303, 0x00830303, 0x00830303, 0x00830303, 0x00830303, 0x00830303, 0x00830303, 0x00830303, 0x00000000, 0x00000000, D_80243F20_ABF1B0, 0x00000000, 0x00000021, D_80243C90_ABEF20, 0xC3DC0000, 0x00000000, 0x435C0000, 0x3F002F0D, 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, 0x00830101, 0x00830102, 0x00830103, 0x00830103, 0x00830101, 0x00830101, 0x00830106, 0x00830106, 0x00830103, 0x00830103, 0x00830103, 0x00830103, 0x00830103, 0x00830103, 0x00830103, 0x00830103, 0x00000000, 0x00000000, D_80243F20_ABF1B0, 0x00000000, 0x00000022, D_80243C90_ABEF20, 0x438E8000, 0x00000000, 0x43910000, 0x3F002F0D, 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, 0x00830201, 0x00830202, 0x00830203, 0x00830203, 0x00830201, 0x00830201, 0x00830206, 0x00830206, 0x00830203, 0x00830203, 0x00830203, 0x00830203, 0x00830203, 0x00830203, 0x00830203, 0x00830203, 0x00000000, 0x00000000, D_80243F20_ABF1B0, 0x00000000 - -dlabel D_80247C54_AC2EE4 -.word 0x00000024, D_80243C90_ABEF20, 0xC3960000, 0x00000000, 0x42C80000, 0x3F002F0D, D_80243E00_ABF090, 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, 0x00840101, 0x00840102, 0x00840103, 0x00840103, 0x00840101, 0x00840101, 0x00840106, 0x00840106, 0x00840103, 0x00840103, 0x00840103, 0x00840103, 0x00840103, 0x00840103, 0x00840103, 0x00840103, 0x00000000, 0x00000000, D_80243F2C_ABF1BC, 0x00000000, 0x00000025, D_80243C90_ABEF20, 0xC3870000, 0x00000000, 0x42AA0000, 0x3F002F0D, D_80243E40_ABF0D0, 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, 0x00840201, 0x00840202, 0x00840203, 0x00840203, 0x00840201, 0x00840201, 0x00840206, 0x00840206, 0x00840203, 0x00840203, 0x00840203, 0x00840203, 0x00840203, 0x00840203, 0x00840203, 0x00840203, 0x00000000, 0x00000000, D_80243F2C_ABF1BC, 0x00000000, 0x00000026, D_80243C90_ABEF20, 0xC33E0000, 0x00000000, 0x43200000, 0x3F002F0D, 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, 0x00840001, 0x00840002, 0x00840003, 0x00840003, 0x00840001, 0x00840001, 0x00840006, 0x00840006, 0x00840003, 0x00840003, 0x00840003, 0x00840003, 0x00840003, 0x00840003, 0x00840003, 0x00840003, 0x00000000, 0x00000000, D_80243F2C_ABF1BC, 0x00000000, 0x00000027, D_80243C90_ABEF20, 0x433E0000, 0x00000000, 0x43960000, 0x3F002F0D, 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, 0x00840301, 0x00840302, 0x00840303, 0x00840303, 0x00840301, 0x00840301, 0x00840306, 0x00840306, 0x00840303, 0x00840303, 0x00840303, 0x00840303, 0x00840303, 0x00840303, 0x00840303, 0x00840303, 0x00000000, 0x00000000, D_80243F2C_ABF1BC, 0x00000000 - -dlabel D_80248414_AC36A4 -.word 0x00000028, D_80243C90_ABEF20, 0x42C80000, 0x00000000, 0x43160000, 0x3F002F0D, D_80243E80_ABF110, 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, 0x00870001, 0x00870001, 0x00870001, 0x00870001, 0x00870001, 0x00870001, 0x00870001, 0x00870001, 0x00870001, 0x00870001, 0x00870001, 0x00870001, 0x00870001, 0x00870001, 0x00870001, 0x00870001, 0x00000000, 0x00000000, D_80243F38_ABF1C8, 0x00000000, 0x00000029, D_80243C90_ABEF20, 0xC2480000, 0x42C80000, 0xC3B68000, 0x3F002F0D, 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, 0x00870201, 0x00870201, 0x00870201, 0x00870201, 0x00870201, 0x00870201, 0x00870201, 0x00870201, 0x00870201, 0x00870201, 0x00870201, 0x00870201, 0x00870201, 0x00870201, 0x00870201, 0x00870201, 0x00000000, 0x00000000, D_80243F38_ABF1C8, 0x00000000, 0x0000002A, D_80243C90_ABEF20, 0x43610000, 0x00000000, 0x42FA0000, 0x3F002F0D, 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, 0x00870001, 0x00870001, 0x00870001, 0x00870001, 0x00870001, 0x00870001, 0x00870001, 0x00870001, 0x00870001, 0x00870001, 0x00870001, 0x00870001, 0x00870001, 0x00870001, 0x00870001, 0x00870001, 0x00000000, 0x00000000, D_80243F38_ABF1C8, 0x00000000, 0x0000002C, D_80243C90_ABEF20, 0xC3C40000, 0x42200000, 0xC3660000, 0x3F002F0D, 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, 0x00870101, 0x00870101, 0x00870101, 0x00870101, 0x00870101, 0x00870101, 0x00870101, 0x00870101, 0x00870101, 0x00870101, 0x00870101, 0x00870101, 0x00870101, 0x00870101, 0x00870101, 0x00870101, 0x00000000, 0x00000000, D_80243F38_ABF1C8, 0x00000000, 0x0000002E, D_80243C90_ABEF20, 0xC3C40000, 0x42200000, 0xC3660000, 0x3F002F0D, 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, 0x00870301, 0x00870301, 0x00870301, 0x00870301, 0x00870301, 0x00870301, 0x00870301, 0x00870301, 0x00870301, 0x00870301, 0x00870301, 0x00870301, 0x00870301, 0x00870301, 0x00870301, 0x00870301, 0x00000000, 0x00000000, D_80243F38_ABF1C8, 0x00000000, 0x00000001, D_80244044_ABF2D4, 0x00000000, 0x00000004, D_80244234_ABF4C4, 0x00000000, 0x00000008, D_802449F4_ABFC84, 0x00000000, 0x00000005, D_80245974_AC0C04, 0x00000000, 0x00000004, D_80246324_AC15B4, 0x00000000, 0x00000005, D_80246AE4_AC1D74, 0x00000000, 0x00000004, D_80247494_AC2724, 0x00000000, 0x00000004, D_80247C54_AC2EE4, 0x00000000, 0x00000005, D_80248414_AC36A4, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kkj/kkj_00/AC40D0.data.s b/ver/us/asm/data/world/area_kkj/kkj_00/AC40D0.data.s deleted file mode 100644 index d3299043c4..0000000000 --- a/ver/us/asm/data/world/area_kkj/kkj_00/AC40D0.data.s +++ /dev/null @@ -1,9 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80248E40_AC40D0 -.word 0x00000043, 0x00000004, PlaySoundAtCollider, 0x00000000, 0x000001C5, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x00000050, 0x0000000E, 0x00000004, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateModel, 0x0000000F, 0xFE363C80, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x0000000D, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000005, MakeLerp, 0x00000050, 0x00000000, 0x00000008, 0x00000004, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateModel, 0x0000000F, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x0000000D, 0xFE363C80, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x00000000, 0x000001C6, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80248FDC_AC426C -.word 0x00000043, 0x00000004, PlaySoundAtCollider, 0x00000005, 0x000001C5, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x00000050, 0x0000000E, 0x00000004, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateModel, 0x00000008, 0xFE363C80, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x0000000A, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000005, MakeLerp, 0x00000050, 0x00000000, 0x00000008, 0x00000004, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateModel, 0x0000000A, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000008, 0xFE363C80, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x00000005, 0x000001C6, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x00000032, 0x00000000, 0x000000FA, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x00000032, 0x00000000, 0x000000FA, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x0000000A, 0x00000044, 0x00000001, D_80248E40_AC40D0, 0x00000043, 0x00000004, func_802D1270, 0x00000000, 0x0000012C, 0xF24A8A80, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00890002, 0x00000043, 0x00000005, NpcMoveTo, 0x00000001, 0x0000004A, 0x000000F3, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00890001, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x00890004, 0x00890001, 0x00000000, 0x00010064, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x00000000, 0x00000064, 0xFFFFFEDE, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x00000000, 0x00000064, 0xFFFFFEDE, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x00000190, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0x0000000A, 0xFFFFFFF9, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000028, 0x00870004, 0x00870001, 0x00000005, 0x00010065, 0x00000043, 0x00000003, InterpPlayerYaw, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x0000006D, 0x00000000, 0x00000008, 0x00000044, 0x00000001, D_80248FDC_AC426C, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x000A0002, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000000, 0xF24A8280, 0x00000043, 0x00000005, NpcMoveTo, 0x00000000, 0x00000000, 0xFFFFFF38, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x000A0001, 0x00000057, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000D, 0x00000002, 0xFE363C80, 0xFFFFFEA2, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x00000000, 0x00000064, 0xFFFFFF38, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x00000000, 0x00000064, 0xFFFFFF38, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x00000226, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0x0000000A, 0xFFFFFFF9, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A7CE7, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x00000000, 0x00000064, 0xFFFFFF38, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x00000000, 0x00000064, 0xFFFFFF38, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x000000FA, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0x00000003, 0xFFFFFFF5, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x0000006D, 0x00000001, 0x00000008, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x000C0000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x000C0026, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x000C0001, 0x000C0026, 0x00000005, 0x00010066, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x00000032, 0x00000000, 0x000000FA, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x00000032, 0x00000000, 0x000000FA, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x000001F4, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0x00000003, 0xFFFFFFF6, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x000C0001, 0x000C0026, 0x00000005, 0x00010067, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x00000000, 0x00000064, 0xFFFFFF38, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x00000000, 0x00000064, 0xFFFFFF38, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x0000012C, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0x00000019, 0xF24A5480, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000005A, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x000C0001, 0x000C0026, 0x00000005, 0x00010068, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x000C0002, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x000A0001, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x00000000, 0x00000000, 0x0000012C, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x00000000, 0x00000000, 0x0000012C, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF24E6D4D, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0x00000005, 0xF24A5480, 0x00000043, 0x00000004, SetCamPosA, 0x00000000, 0x000001F4, 0x00000064, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000005, ShowMessageAtWorldPos, 0x00010069, 0x00000000, 0x00000064, 0xFFFFFF38, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x000000FA, 0x00000000, 0x00000064, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x000000FA, 0x00000000, 0x00000064, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x00000190, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0x0000000F, 0xFFFFFFFF, 0x00000043, 0x00000004, SetCamPosA, 0x00000000, 0xFFFFFF9C, 0x00000064, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, ShowMessageAtWorldPos, 0x0001006A, 0x00000000, 0x00000064, 0xFFFFFF38, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFFFFFF06, 0x00000000, 0x00000032, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFFFFFF06, 0x00000000, 0x00000032, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x000001C2, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0x0000000F, 0xFFFFFFF9, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, ShowMessageAtWorldPos, 0x0001006B, 0x00000000, 0x00000064, 0xFFFFFF38, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFFFFFF6A, 0x00000000, 0x00000168, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFFFFFF6A, 0x00000000, 0x00000168, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x0000012C, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0x00000019, 0xFFFFFFF3, 0x00000043, 0x00000004, SetCamPosA, 0x00000000, 0x00000334, 0xFFFFFF9C, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, ShowMessageAtWorldPos, 0x0001006C, 0x00000000, 0x00000064, 0xFFFFFF38, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x00000000, 0x00000064, 0xFFFFFF38, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x00000000, 0x00000064, 0xFFFFFF38, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x000000FA, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0x00000005, 0xFFFFFFF6, 0x00000043, 0x00000004, SetCamPosA, 0x00000000, 0xFFFFFE0C, 0xFFFFFA88, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x000C0000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x000C0026, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x000C0001, 0x000C0026, 0x00000000, 0x0001006D, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x000C0002, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x000D000F, 0x00000008, 0x00000001, 0x0000003C, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x000C0026, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x000C0001, 0x000C0026, 0x00000000, 0x0001006E, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x000C0010, 0x00000043, 0x00000003, EnableGroup, 0x00000022, 0x00000000, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x00000000, 0x00000000, 0x00000078, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000078, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x00000514, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0x0000001E, 0xFFFFFFF9, 0x00000043, 0x00000004, SetCamPosA, 0x00000000, 0xFFFFFF88, 0x0000004B, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A7C80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x00000078, 0x00000043, 0x00000001, func_80240F40_ABC1D0, 0x00000008, 0x00000001, 0x0000003C, 0x00000043, 0x00000003, FadeOutMusic, 0x00000000, 0x000007D0, 0x00000043, 0x00000004, GotoMapSpecial, 0x80249ED0, 0x00000000, 0x00000005, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kkj/kkj_01/AC6000.data.s b/ver/us/asm/data/world/area_kkj/kkj_01/AC6000.data.s deleted file mode 100644 index 6e32b8a232..0000000000 --- a/ver/us/asm/data/world/area_kkj/kkj_01/AC6000.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240E90_AC6000 -.word 0x00000000, 0x00000000, 0x43F00000, 0x00000000, 0x00000000, 0x42C80000, 0xC3B40000, 0x43340000, 0xC3A28000, 0x00000000, 0x43B40000, 0x42340000, 0xC3F00000, 0x00000000, 0x42480000, 0x42B40000, 0x00000000, 0x00000000, 0xC37F0000, 0x43340000, 0x43F00000, 0x00000000, 0x42480000, 0x43870000, 0x43960000, 0x00000000, 0x43BE0000, 0x439D8000, 0x43B10000, 0x00000000, 0x43930000, 0x42EA0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x8024150C, D_80240E90_AC6000, 0x00000008, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x0000003F, 0x00000001, 0x00000007, 0x00000008, 0x00000001, 0x00000003, 0x00000013, 0x00000000, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x0000003F, 0x00000001, 0x00000008, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kkj/kkj_01/AC6140.data.s b/ver/us/asm/data/world/area_kkj/kkj_01/AC6140.data.s deleted file mode 100644 index ec4e1183bd..0000000000 --- a/ver/us/asm/data/world/area_kkj/kkj_01/AC6140.data.s +++ /dev/null @@ -1,21 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240FD0_AC6140 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, UseDoorSounds, 0x00000002, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x00000007, 0x00000024, 0x00000002, 0xFE363C83, 0x00000005, 0x00000044, 0x00000001, ExitDoubleDoor, 0x00000008, 0x00000001, 0x00000011, 0x00000043, 0x00000003, GotoMap, 0x802439F0, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241084_AC61F4 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, UseDoorSounds, 0x00000002, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000024, 0x00000002, 0xFE363C81, 0x00000005, 0x00000024, 0x00000002, 0xFE363C82, 0x0000000A, 0x00000024, 0x00000002, 0xFE363C83, 0x0000000C, 0x00000044, 0x00000001, ExitDoubleDoor, 0x00000008, 0x00000001, 0x00000011, 0x00000043, 0x00000003, GotoMap, 0x802439F8, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241138_AC62A8 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, UseDoorSounds, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000004, 0x00000024, 0x00000002, 0xFE363C81, 0x0000000A, 0x00000024, 0x00000002, 0xFE363C82, 0x00000013, 0x00000024, 0x00000002, 0xFE363C83, 0x00000001, 0x00000044, 0x00000001, ExitSingleDoor, 0x00000008, 0x00000001, 0x00000011, 0x00000043, 0x00000003, GotoMap, 0x80243A00, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802411EC_AC635C -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D0163, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241234_AC63A4 -.word 0x0000000A, 0x00000002, 0xF9718881, 0x00000001, 0x00000047, 0x00000005, D_80241138_AC62A8, 0x00000100, 0x0000000A, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000047, 0x00000005, D_802411EC_AC635C, 0x00000100, 0x0000001E, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_802411EC_AC635C, 0x00000100, 0x0000000F, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_802411EC_AC635C, 0x00000100, 0x00000014, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_802411EC_AC635C, 0x00000100, 0x00000019, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80240FD0_AC6140, 0x00000100, 0x00000000, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80241084_AC61F4, 0x00000100, 0x00000005, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241320_AC6490 -.word 0x00000043, 0x00000002, UseDoorSounds, 0x00000000, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000002, UseDoorSounds, 0x00000002, 0x00000024, 0x00000002, 0xFE363C82, 0x00000007, 0x00000024, 0x00000002, 0xFE363C83, 0x00000005, 0x00000046, 0x00000001, EnterDoubleDoor, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000002, UseDoorSounds, 0x00000002, 0x00000024, 0x00000002, 0xFE363C82, 0x0000000A, 0x00000024, 0x00000002, 0xFE363C83, 0x0000000C, 0x00000046, 0x00000001, EnterDoubleDoor, 0x00000016, 0x00000001, 0x00000002, 0x00000024, 0x00000002, 0xFE363C82, 0x0000000F, 0x00000024, 0x00000002, 0xFE363C83, 0x00000001, 0x00000046, 0x00000001, EnterSingleDoor, 0x00000016, 0x00000001, 0x00000003, 0x00000024, 0x00000002, 0xFE363C82, 0x00000011, 0x00000024, 0x00000002, 0xFE363C83, 0x00000001, 0x00000046, 0x00000001, EnterSingleDoor, 0x00000016, 0x00000001, 0x00000004, 0x00000024, 0x00000002, 0xFE363C82, 0x00000013, 0x00000024, 0x00000002, 0xFE363C83, 0x00000001, 0x00000046, 0x00000001, EnterSingleDoor, 0x00000016, 0x00000001, 0x00000005, 0x00000024, 0x00000002, 0xFE363C82, 0x00000015, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFFFF, 0x00000046, 0x00000001, EnterSingleDoor, 0x00000016, 0x00000001, 0x00000006, 0x00000024, 0x00000002, 0xFE363C82, 0x00000017, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFFFF, 0x00000046, 0x00000001, EnterSingleDoor, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0329, 0x00000019, 0x00000043, 0x00000002, SetSpriteShading, 0xFFFFFFFF, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000043, 0x00000003, SetCamLeadPlayer, 0x00000000, 0x00000000, 0x00000043, 0x00000003, MakeNpcs, 0x00000000, 0x802439D4, 0x0000000B, 0x00000002, 0xF5DE0180, 0xFFFFFF80, 0x00000043, 0x00000003, EnableModel, 0x000000AD, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x0000005E, 0x7FFFFE00, 0x00000012, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000001, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000002, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000003, 0x00000000, 0x00000013, 0x00000000, 0x00000044, 0x00000001, 0x80240F50, 0x00000044, 0x00000001, D_80241234_AC63A4, 0x00000044, 0x00000001, D_80241320_AC6490, 0x00000008, 0x00000001, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kkj/kkj_01/AC67E0.data.s b/ver/us/asm/data/world/area_kkj/kkj_01/AC67E0.data.s deleted file mode 100644 index a2a9a430f6..0000000000 --- a/ver/us/asm/data/world/area_kkj/kkj_01/AC67E0.data.s +++ /dev/null @@ -1,120 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80241670_AC67E0 -.word 0x3FC00000, 0x0000003C, 0x0000001E, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001 - -dlabel D_802416A0_AC6810 -.word 0x00000043, 0x00000002, BasicAI_Main, D_80241670_AC67E0, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802416C0_AC6830 -.word 0x00000000, 0x001E0018, 0x00000000, 0x00000000, D_802416A0_AC6810, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630010, 0x00000000, 0x00170013, 0x00000000, 0x00000000, D_802416A0_AC6810, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630010 - -dlabel D_80241718_AC6888 -.word 0x3FC00000, 0x0000001E, 0x0000001E, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001 - -dlabel D_80241748_AC68B8 -.word 0x00000043, 0x00000002, kkj_01_PatrolNoAttackAI_Main, D_80241718_AC6888, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241768_AC68D8 -.word 0x00000000, 0x001E0018, 0x00000000, 0x00000000, D_80241748_AC68B8, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630010, 0x00000000, 0x00170013, 0x00000000, 0x00000000, D_80241748_AC68B8, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630010 - -dlabel D_802417C0_AC6930 -.word 0x00000000, 0x001E0018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000, 0x00000000, 0x00170013, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000 - -dlabel D_80241818_AC6988 -.word 0x00000000, 0x001A0017, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000 - -dlabel D_80241844_AC69B4 -.word 0x00000000, 0x00160019, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000 - -dlabel D_80241870_AC69E0 -.word 0x00000000, 0x00180018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000 - -dlabel D_8024189C_AC6A0C -.word 0x00000000, 0x00230018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630010 - -dlabel D_802418C8_AC6A38 -.word 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000003, GetSelfVar, 0x00000001, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000007, 0x00930304, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000008, 0x00940005, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, RandInt, 0x0000003C, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C80, 0x0000001E, 0x00000008, 0x00000001, 0xFE363C80, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000007, 0x00930301, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000008, 0x00940001, 0x00000008, 0x00000001, 0x0000000A, 0x00000006, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802419CC_AC6B3C -.word 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000003, GetSelfVar, 0x00000001, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000009, 0x00CE0004, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000A, 0x008F0007, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, RandInt, 0x0000003C, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C80, 0x0000001E, 0x00000008, 0x00000001, 0xFE363C80, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000009, 0x00CE0001, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000A, 0x008F0002, 0x00000008, 0x00000001, 0x0000000A, 0x00000006, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241AD0_AC6C40 -.word 0x00000008, 0x00000001, 0x0000001E, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000096, 0x00000005, 0x00000001, 0x00000002, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFF, 0x0000005A, 0x00000007, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFF, 0x0000010E, 0x00000007, 0x00000008, 0x00000001, 0x00000014, 0x00000006, 0x00000000, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241B68_AC6CD8 -.word 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000096, 0x00000005, 0x00000001, 0x00000002, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFF, 0x0000005A, 0x00000007, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFF, 0x0000010E, 0x00000007, 0x00000008, 0x00000001, 0x0000000F, 0x00000006, 0x00000000, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241BF4_AC6D64 -.word 0x0000000A, 0x00000002, 0xF9718882, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000004, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, WaitForPlayerInputEnabled, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00870304, 0x00870301, 0x00000010, 0x00000042, 0x00000024, 0x00000002, 0xF9718882, 0x00000001, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241CB0_AC6E20 -.word 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00890004, 0x00890001, 0x00000000, 0x00000033, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241CE0_AC6E50 -.word 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00830204, 0x00830201, 0x00000010, 0x00000038, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241D10_AC6E80 -.word 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00830104, 0x00830101, 0x00000010, 0x00000039, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241D40_AC6EB0 -.word 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00830004, 0x00830001, 0x00000010, 0x0000003A, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241D70_AC6EE0 -.word 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00840004, 0x00840001, 0x00000010, 0x0000003B, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241DA0_AC6F10 -.word 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00870004, 0x00870001, 0x00000010, 0x0000003C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241DD0_AC6F40 -.word 0x00000043, 0x00000003, GetSelfVar, 0x00000000, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00870304, 0x00870301, 0x00000010, 0x0000003D, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00870304, 0x00870301, 0x00000010, 0x0000003E, 0x0000001D, 0x00000001, 0x00000002, 0x0000001D, 0x00000001, 0x00000003, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00870304, 0x00870301, 0x00000010, 0x0000003F, 0x00000020, 0x00000000, 0x00000016, 0x00000001, 0x00000004, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00870304, 0x00870301, 0x00000010, 0x00000040, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000006, 0x00870302, 0x0000000D, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFFCE, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x00000032, 0x00000013, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000100, 0x00000001, 0x00000043, 0x00000003, SetNpcSpeed, 0xFFFFFFFF, 0xF24A8280, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0xFE363C83, 0xFFFFFF0B, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000100, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000006, 0x00870301, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFF, 0x000000B4, 0x00000005, 0x00000024, 0x00000002, 0xF9718881, 0x00000001, 0x00000047, 0x00000005, D_80241138_AC62A8, 0x00000100, 0x0000000A, 0x00000001, 0x00000000, 0x0000001C, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00870304, 0x00870301, 0x00000010, 0x00000041, 0x00000023, 0x00000000, 0x00000027, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242048_AC71B8 -.word 0x00000043, 0x00000003, SetNpcAnimation, 0x00000008, 0x00940001, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000007, 0x00930301, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00930304, 0x00930301, 0x00000010, 0x00000034, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802420AC_AC721C -.word 0x00000043, 0x00000003, EnableNpcAI, 0x00000007, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000008, 0x00940001, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000007, 0x00930301, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00940005, 0x00940001, 0x00000010, 0x00000035, 0x00000043, 0x00000003, EnableNpcAI, 0x00000007, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242138_AC72A8 -.word 0x00000043, 0x00000003, SetNpcAnimation, 0x00000009, 0x00CE0001, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000A, 0x008F0002, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00CE0004, 0x00CE0001, 0x00000010, 0x00000036, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024219C_AC730C -.word 0x00000043, 0x00000003, EnableNpcAI, 0x00000009, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000009, 0x00CE0001, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000A, 0x008F0002, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x008F0007, 0x008F0002, 0x00000010, 0x00000037, 0x00000043, 0x00000003, EnableNpcAI, 0x00000009, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242228_AC7398 -.word 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, D_80241AD0_AC6C40, 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, D_80241CB0_AC6E20, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242260_AC73D0 -.word 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, D_80241B68_AC6CD8, 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, D_80241CE0_AC6E50, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242298_AC7408 -.word 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, D_80241D10_AC6E80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802422BC_AC742C -.word 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, D_80241D40_AC6EB0, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802422E0_AC7450 -.word 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, D_80241D70_AC6EE0, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242304_AC7474 -.word 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, D_80241DA0_AC6F10, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242328_AC7498 -.word 0x0000000A, 0x00000002, 0xF9718881, 0x00000001, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0xFFFFFFCE, 0x00000000, 0xFFFFFF0B, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000005, 0x00000012, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0x00000000, 0xFFFFFEFC, 0x00000013, 0x00000000, 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, D_80241BF4_AC6D64, 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, D_80241DD0_AC6F40, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802423CC_AC753C -.word 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, D_802418C8_AC6A38, 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, D_80242048_AC71B8, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242404_AC7574 -.word 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, D_802420AC_AC721C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242428_AC7598 -.word 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, D_802419CC_AC6B3C, 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, D_80242138_AC72A8, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242460_AC75D0 -.word 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, D_8024219C_AC730C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242484_AC75F4 -.word 0x00000000, D_802417C0_AC6930, 0x00000000, 0x00000000, 0x43AF0000, 0x00000D09, D_80242228_AC7398, 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, 0x00890001, 0x00890001, 0x00890001, 0x00890001, 0x00890001, 0x00890001, 0x00890001, 0x00890001, 0x00890001, 0x00890001, 0x00890001, 0x00890001, 0x00890001, 0x00890001, 0x00890001, 0x00890001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, D_802417C0_AC6930, 0x42C80000, 0x00000000, 0x432F0000, 0x00000D09, D_80242260_AC73D0, 0x00000000, 0x00000000, 0x0000010E, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00830201, 0x00830202, 0x00830203, 0x00830203, 0x00830201, 0x00830201, 0x00830206, 0x00830206, 0x00830203, 0x00830203, 0x00830203, 0x00830203, 0x00830203, 0x00830203, 0x00830203, 0x00830203, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, D_802416C0_AC6830, 0x43480000, 0x00000000, 0x42DC0000, 0x00000D09, D_80242298_AC7408, 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, 0x000000C8, 0x00000000, 0x0000006E, 0x00000046, 0x00000000, 0xFFFF8001, 0x00000000, 0x000000C8, 0x00000000, 0x0000006E, 0x00000046, 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, 0x00830101, 0x00830102, 0x00830103, 0x00830103, 0x00830101, 0x00830101, 0x00830106, 0x00830106, 0x00830103, 0x00830103, 0x00830103, 0x00830103, 0x00830103, 0x00830103, 0x00830103, 0x00830103, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000003, D_80241768_AC68D8, 0xC37A0000, 0x00000000, 0x43610000, 0x00000D09, D_802422BC_AC742C, 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, 0x00000002, 0xFFFFFF06, 0x00000000, 0x000000E1, 0x0000012C, 0x00000000, 0xFFFFFFCE, 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, 0xFFFFFF06, 0x00000000, 0x000000E1, 0x000000C8, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00830001, 0x00830002, 0x00830003, 0x00830003, 0x00830001, 0x00830001, 0x00830006, 0x00830006, 0x00830003, 0x00830003, 0x00830003, 0x00830003, 0x00830003, 0x00830003, 0x00830003, 0x00830003, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000004, D_802416C0_AC6830, 0xC32A0000, 0x00000000, 0x42C80000, 0x00000D09, D_802422E0_AC7450, 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, 0xFFFFFF56, 0x00000000, 0x00000064, 0x00000046, 0x00000000, 0xFFFF8001, 0x00000000, 0xFFFFFF56, 0x00000000, 0x00000064, 0x00000046, 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, 0x00840001, 0x00840002, 0x00840003, 0x00840003, 0x00840001, 0x00840001, 0x00840006, 0x00840006, 0x00840003, 0x00840003, 0x00840003, 0x00840003, 0x00840003, 0x00840003, 0x00840003, 0x00840003, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000005, D_802417C0_AC6930, 0xC25C0000, 0x42C80000, 0xC3B40000, 0x00000D09, D_80242304_AC7474, 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, 0x00870001, 0x00870001, 0x00870001, 0x00870001, 0x00870001, 0x00870001, 0x00870001, 0x00870001, 0x00870001, 0x00870001, 0x00870001, 0x00870001, 0x00870001, 0x00870001, 0x00870001, 0x00870001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000006, D_802417C0_AC6930, 0x00000000, 0xC47A0000, 0x00000000, 0x00000D09, D_80242328_AC7498, 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, 0x00870301, 0x00870301, 0x00870301, 0x00870301, 0x00870301, 0x00870301, 0x00870301, 0x00870301, 0x00870301, 0x00870301, 0x00870301, 0x00870301, 0x00870301, 0x00870301, 0x00870301, 0x00870301, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000007, D_80241818_AC6988, 0x432A0000, 0x00000000, 0x43AC8000, 0x00400D01, D_802423CC_AC753C, 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, 0x00930301, 0x00930302, 0x00930303, 0x00930303, 0x00930301, 0x00930301, 0x00930300, 0x00930300, 0x00930301, 0x00930301, 0x00930301, 0x00930301, 0x00930301, 0x00930301, 0x00930301, 0x00930301, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, D_80241844_AC69B4, 0x43480000, 0x00000000, 0x43A28000, 0x00400D01, D_80242404_AC7574, 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, 0x00940001, 0x00940004, 0x00940004, 0x00940004, 0x00940001, 0x00940001, 0x00940001, 0x00940001, 0x00940001, 0x00940001, 0x00940001, 0x00940001, 0x00940001, 0x00940001, 0x00940001, 0x00940001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000009, D_80241870_AC69E0, 0xC3160000, 0x00000000, 0x00000000, 0x00400C09, D_80242428_AC7598, 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, 0x00CE0001, 0x00CE0002, 0x00CE0001, 0x00CE0001, 0x00CE0001, 0x00CE0001, 0x00CE0001, 0x00CE0001, 0x00CE0001, 0x00CE0001, 0x00CE0001, 0x00CE0001, 0x00CE0001, 0x00CE0001, 0x00CE0001, 0x00CE0001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000000A, D_8024189C_AC6A0C, 0xC2F00000, 0x00000000, 0xC1700000, 0x00400909, D_80242460_AC75D0, 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, 0x008F0002, 0x008F0005, 0x008F0006, 0x008F0006, 0x008F0002, 0x008F0002, 0x008F0000, 0x008F0000, 0x008F0000, 0x008F0000, 0x008F0000, 0x008F0000, 0x008F0000, 0x008F0000, 0x008F0000, 0x008F0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000000B, D_80242484_AC75F4, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kkj/kkj_02/AC8D20.data.s b/ver/us/asm/data/world/area_kkj/kkj_02/AC8D20.data.s deleted file mode 100644 index 7fba4b4245..0000000000 --- a/ver/us/asm/data/world/area_kkj/kkj_02/AC8D20.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240000_AC8D20 -.word 0xC2960000, 0x00000000, 0x00000000, 0x42B40000, 0x4492E000, 0x42DC0000, 0x00000000, 0x43870000, 0x43B10000, 0x00000000, 0x43930000, 0x42EA0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80240354, D_80240000_AC8D20, 0x00000003, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x0000003F, 0x00000001, 0x00000007, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x0000003F, 0x00000001, 0x00000005, 0x00000023, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x0000003F, 0x00000001, 0x00000006, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kkj/kkj_02/AC8E40.data.s b/ver/us/asm/data/world/area_kkj/kkj_02/AC8E40.data.s deleted file mode 100644 index 1c7d2cde8d..0000000000 --- a/ver/us/asm/data/world/area_kkj/kkj_02/AC8E40.data.s +++ /dev/null @@ -1,15 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240120_AC8E40 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000024, 0x00000002, 0xFE363C82, 0x00000003, 0x00000024, 0x00000002, 0xFE363C83, 0x00000005, 0x00000044, 0x00000001, ExitDoubleDoor, 0x00000008, 0x00000001, 0x00000011, 0x00000043, 0x00000003, GotoMap, 0x802409E0, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802401C4_AC8EE4 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000024, 0x00000002, 0xFE363C81, 0x00000004, 0x00000024, 0x00000002, 0xFE363C82, 0x0000000A, 0x00000024, 0x00000002, 0xFE363C83, 0x00000008, 0x00000044, 0x00000001, ExitDoubleDoor, 0x00000008, 0x00000001, 0x00000011, 0x00000043, 0x00000003, GotoMap, 0x802409E8, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240268_AC8F88 -.word 0x00000047, 0x00000005, D_80240120_AC8E40, 0x00000100, 0x00000001, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_802401C4_AC8EE4, 0x00000100, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802402B0_AC8FD0 -.word 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x00000003, 0x00000024, 0x00000002, 0xFE363C83, 0x00000005, 0x00000046, 0x00000001, EnterDoubleDoor, 0x00000016, 0x00000001, 0x00000001, 0x00000024, 0x00000002, 0xFE363C82, 0x0000000A, 0x00000024, 0x00000002, 0xFE363C83, 0x00000008, 0x00000046, 0x00000001, EnterDoubleDoor, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0329, 0x00000019, 0x00000043, 0x00000002, SetSpriteShading, 0xFFFFFFFF, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000043, 0x00000003, SetCamLeadPlayer, 0x00000000, 0x00000000, 0x00000043, 0x00000003, MakeNpcs, 0x00000000, 0x802409C8, 0x00000044, 0x00000001, 0x80240070, 0x00000043, 0x00000002, UseDoorSounds, 0x00000002, 0x00000044, 0x00000001, D_80240268_AC8F88, 0x00000044, 0x00000001, D_802402B0_AC8FD0, 0x00000008, 0x00000001, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kkj/kkj_02/AC9160.data.s b/ver/us/asm/data/world/area_kkj/kkj_02/AC9160.data.s deleted file mode 100644 index c1b4c5d96c..0000000000 --- a/ver/us/asm/data/world/area_kkj/kkj_02/AC9160.data.s +++ /dev/null @@ -1,30 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240440_AC9160 -.word 0x3FC00000, 0x0000003C, 0x0000001E, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001 - -dlabel D_80240470_AC9190 -.word 0x00000043, 0x00000002, BasicAI_Main, D_80240440_AC9160, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240490_AC91B0 -.word 0x00000000, 0x001E0018, 0x00000000, 0x00000000, D_80240470_AC9190, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630010, 0x00000000, 0x00170013, 0x00000000, 0x00000000, D_80240470_AC9190, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630010 - -dlabel D_802404E8_AC9208 -.word 0x00000000, 0x001E0018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000, 0x00000000, 0x00170013, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000 - -dlabel D_80240540_AC9260 -.word 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00830004, 0x00830001, 0x00000000, 0x00000049, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240570_AC9290 -.word 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00870004, 0x00870001, 0x00000000, 0x0000004A, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802405A0_AC92C0 -.word 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, D_80240540_AC9260, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802405C4_AC92E4 -.word 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, D_80240570_AC9290, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802405E8_AC9308 -.word 0x00000000, D_80240490_AC91B0, 0x00000000, 0x00000000, 0xC2C80000, 0x00000D0D, D_802405A0_AC92C0, 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, 0xFFFFFF9C, 0x00000032, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0x00000000, 0xFFFFFF9C, 0x00000032, 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, 0x00830001, 0x00830002, 0x00830003, 0x00830003, 0x00830001, 0x00830001, 0x00830006, 0x00830006, 0x00830003, 0x00830003, 0x00830003, 0x00830003, 0x00830003, 0x00830003, 0x00830003, 0x00830003, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, D_802404E8_AC9208, 0x4492E000, 0x42DC0000, 0x42700000, 0x00000D0D, D_802405C4_AC92E4, 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, 0x00870001, 0x00870001, 0x00870001, 0x00870001, 0x00870001, 0x00870001, 0x00870001, 0x00870001, 0x00870001, 0x00870001, 0x00870001, 0x00870001, 0x00870001, 0x00870001, 0x00870001, 0x00870001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, D_802405E8_AC9308, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kkj/kkj_03/AC9A40.data.s b/ver/us/asm/data/world/area_kkj/kkj_03/AC9A40.data.s deleted file mode 100644 index e5a7ea57f8..0000000000 --- a/ver/us/asm/data/world/area_kkj/kkj_03/AC9A40.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240330_AC9A40 -.word 0xC2BE0000, 0x00000000, 0x00000000, 0x42B40000, 0x441D8000, 0x00000000, 0x00000000, 0x42B40000, 0x441D8000, 0x00000000, 0x00000000, 0x42B40000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x802406D0, D_80240330_AC9A40, 0x00000003, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80200000, 0x00000000, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x0000003F, 0x00000001, 0x00000005, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x0000003F, 0x00000001, 0x00000004, 0x0000001C, 0x00000000, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x0000006B, 0x00000000, 0x00000008, 0x00000020, 0x00000000, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, kkj_03_UpdateTexturePanSmooth, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, kkj_03_UpdateTexturePanStepped, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kkj/kkj_03/AC9C00.data.s b/ver/us/asm/data/world/area_kkj/kkj_03/AC9C00.data.s deleted file mode 100644 index b9d5ff8c76..0000000000 --- a/ver/us/asm/data/world/area_kkj/kkj_03/AC9C00.data.s +++ /dev/null @@ -1,15 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802404F0_AC9C00 -.word 0xE7000000, 0x00000000, 0xD7000002, 0xFFFFFFFF, 0xE3000A01, 0x00100000, 0xE3000C00, 0x00080000, 0xE3000D01, 0x00000000, 0xE3000F00, 0x00000000, 0xE3001001, 0x00000000, 0xE3001201, 0x00002000, 0xE3001402, 0x00000C00, 0xFA000000, 0x4B1F13FF, 0xFB000000, 0xFF764D00, 0xFC10E5E0, 0x230B1D52, 0xE200001C, 0x0C184B50, 0xD9FDFFFF, 0x00000000, 0xD9FFFFFF, 0x00200404, 0xDF000000, 0x00000000 - -dlabel D_80240570_AC9C80 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x00000047, 0x00000024, 0x00000002, 0xFE363C83, 0x00000049, 0x00000044, 0x00000001, ExitDoubleDoor, 0x00000008, 0x00000001, 0x00000011, 0x00000043, 0x00000003, GotoMap, 0x802413F0, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240614_AC9D24 -.word 0x00000047, 0x00000005, D_80240570_AC9C80, 0x00000100, 0x00000000, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240640_AC9D50 -.word 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x00000047, 0x00000024, 0x00000002, 0xFE363C83, 0x00000049, 0x00000046, 0x00000001, EnterDoubleDoor, 0x00000044, 0x00000001, 0x80240B40, 0x00000016, 0x00000001, 0x00000001, 0x00000044, 0x00000001, 0x80241140, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0329, 0x00000019, 0x00000043, 0x00000002, SetSpriteShading, 0xFFFFFFFF, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000043, 0x00000003, SetCamLeadPlayer, 0x00000000, 0x00000000, 0x00000043, 0x00000003, MakeNpcs, 0x00000000, 0x80240B1C, 0x00000043, 0x00000003, EnableGroup, 0x000000A5, 0x00000000, 0x00000043, 0x00000003, SetTexPanner, 0x00000093, 0x00000000, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x00000028, 0x00000024, 0x00000002, 0xFE363C84, 0x00000384, 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, 0x80240450, 0x00000057, 0x00000000, 0x00000043, 0x00000004, SetModelCustomGfx, 0x00000093, 0x00000000, 0xFFFFFFFF, 0x00000043, 0x00000004, SetCustomGfx, 0x00000000, D_802404F0_AC9C00, 0x00000000, 0x00000044, 0x00000001, 0x802403A0, 0x00000043, 0x00000002, UseDoorSounds, 0x00000002, 0x00000044, 0x00000001, D_80240614_AC9D24, 0x00000044, 0x00000001, D_80240640_AC9D50, 0x00000008, 0x00000001, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kkj/kkj_03/ACA010.data.s b/ver/us/asm/data/world/area_kkj/kkj_03/ACA010.data.s deleted file mode 100644 index 7d51669c8a..0000000000 --- a/ver/us/asm/data/world/area_kkj/kkj_03/ACA010.data.s +++ /dev/null @@ -1,9 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240900_ACA010 -.word 0x00000000, 0x002E0024, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000 - -dlabel D_8024092C_ACA03C -.word 0x00000000, D_80240900_ACA010, 0x44278000, 0x00000000, 0xC1400000, 0x00020F0D, 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, 0x000A0000, 0x000A0000, 0x000A0000, 0x000A0000, 0x000A0000, 0x000A0000, 0x000A0000, 0x000A0000, 0x000A0000, 0x000A0000, 0x000A0000, 0x000A0000, 0x000A0000, 0x000A0000, 0x000A0000, 0x000A0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, D_8024092C_ACA03C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kkj/kkj_03/ACA250.data.s b/ver/us/asm/data/world/area_kkj/kkj_03/ACA250.data.s deleted file mode 100644 index 0354ebb427..0000000000 --- a/ver/us/asm/data/world/area_kkj/kkj_03/ACA250.data.s +++ /dev/null @@ -1,12 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240B40_ACA250 -.word 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000F, 0x00000002, 0xFE363C80, 0x0000020D, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000003, FadeOutMusic, 0x00000000, 0x0000029A, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000073, 0x00000000, 0x00000008, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x000A0002, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000000, 0xF24A8280, 0x00000043, 0x00000005, NpcMoveTo, 0x00000000, 0x00000271, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x000A0001, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x000C0000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x000C0026, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x000C0001, 0x000C0026, 0x00000000, 0x0000004B, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x000C0002, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x000A0001, 0x00000056, 0x00000000, 0x00000043, 0x00000009, SetCamProperties, 0x00000000, 0xF24A8E80, 0x00000258, 0x00000000, 0xFFFFFFF4, 0xF24F8E80, 0xF24ABE80, 0xF24A5680, 0x00000057, 0x00000000, 0x00000043, 0x00000004, PlayerMoveTo, 0x0000023F, 0x00000000, 0x00000014, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x000C0000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x000C0026, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x000C0001, 0x000C0026, 0x00000000, 0x0000004C, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010029, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x000C0001, 0x000C0026, 0x00000000, 0x0000004D, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x000C0002, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x000A0001, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, FadeOutMusic, 0x00000000, 0x000003E8, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, PlayerMoveTo, 0x0000024E, 0x00000000, 0x0000000A, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000003, PlaySoundAtPlayer, 0x00000262, 0x00000000, 0x00000043, 0x0000000A, ShowEmote, 0x00000000, 0x00000000, 0xFFFFFFD3, 0x00000014, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000000, 0x0000005A, 0x00000007, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x000A0002, 0x00000043, 0x00000005, NpcMoveTo, 0x00000000, 0x00000280, 0x00000000, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x000A0001, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000000, 0x00000262, 0x00000000, 0x00000043, 0x0000000A, ShowEmote, 0x00000000, 0x00000000, 0xFFFFFFD3, 0x00000014, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x000C0011, 0x00000008, 0x00000001, 0x0000003C, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000000, 0x0000010E, 0x00000007, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000011, 0x00000056, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x80000056, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x000000C8, 0xF24A7E80, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000003C, 0x00000043, 0x00000003, GotoMap, 0x802413F8, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241054_ACA764 -.word 0x00000043, 0x00000003, EnableTexPanning, 0x000000A0, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFFFF38, 0x00000043, 0x00000005, SetTexPanOffset, 0x00000002, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802410D4_ACA7E4 -.word 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, TranslateGroup, 0x000000A4, 0x00000000, 0xFE363C80, 0x00000000, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFFFFFE, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000005, SetNpcPos, 0x00000000, 0x000002A8, 0x00000000, 0xFFFFFFF1, 0x00000043, 0x00000003, EnableGroup, 0x000000A5, 0x00000001, 0x00000044, 0x00000001, D_80241054_ACA764, 0x00000044, 0x00000001, D_802410D4_ACA7E4, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x00000258, 0x00000000, 0xFFFFFFF1, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x00000258, 0x00000000, 0xFFFFFFF1, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000056, 0x00000000, 0x00000043, 0x00000002, SetPlayerJumpscale, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000010E, 0x00000000, 0x00000043, 0x00000005, PlayerJump1, 0x00000226, 0x00000000, 0x00000000, 0x00000014, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000005A, 0x00000000, 0x00000043, 0x00000005, PlayerJump1, 0x00000276, 0x00000000, 0x00000000, 0x00000014, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010005, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060003, 0x00000008, 0x00000001, 0x0000000F, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x000A0004, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0x00000000, 0x00000258, 0x00000000, 0x00000014, 0x00000043, 0x00000005, NpcMoveTo, 0x00000000, 0x000002A8, 0x00000000, 0x00000014, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x80000056, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x000000C8, 0xF24A7E80, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000043, 0x00000003, GotoMap, 0x80241400, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kkj/kkj_10/ACBBF0.data.s b/ver/us/asm/data/world/area_kkj/kkj_10/ACBBF0.data.s deleted file mode 100644 index 8eccbe48e9..0000000000 --- a/ver/us/asm/data/world/area_kkj/kkj_10/ACBBF0.data.s +++ /dev/null @@ -1,33 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802410D0_ACBBF0 -.word 0x00000000, 0x00000000, 0x43F00000, 0x00000000, 0x00000000, 0x42C80000, 0xC3B68000, 0x43340000, 0xC3D20000, 0x42200000, 0xC3820000, 0x43070000, 0x43660000, 0x00000000, 0xC3520000, 0x43340000, 0x43D20000, 0x42200000, 0xC3820000, 0x43610000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_8024180C_ACC32C, D_802410D0_ACBBF0, 0x00000005, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0019000B - -dlabel D_80241160_ACBC80 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, UseDoorSounds, 0x00000002, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x00000015, 0x00000024, 0x00000002, 0xFE363C83, 0x00000013, 0x00000044, 0x00000001, ExitDoubleDoor, 0x00000008, 0x00000001, 0x00000011, 0x00000043, 0x00000003, GotoMap, 0x802435B0, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241214_ACBD34 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, UseDoorSounds, 0x00000002, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000024, 0x00000002, 0xFE363C81, 0x00000005, 0x00000024, 0x00000002, 0xFE363C82, 0x0000000E, 0x00000024, 0x00000002, 0xFE363C83, 0x00000010, 0x00000044, 0x00000001, ExitDoubleDoor, 0x00000008, 0x00000001, 0x00000011, 0x00000043, 0x00000003, GotoMap, 0x802435B8, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802412C8_ACBDE8 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, UseDoorSounds, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000024, 0x00000002, 0xFE363C81, 0x0000000A, 0x00000024, 0x00000002, 0xFE363C82, 0x00000018, 0x00000024, 0x00000002, 0xFE363C83, 0x00000001, 0x00000044, 0x00000001, ExitSingleDoor, 0x00000008, 0x00000001, 0x00000011, 0x00000043, 0x00000003, GotoMap, 0x802435C0, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024137C_ACBE9C -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, UseDoorSounds, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000003, 0x00000024, 0x00000002, 0xFE363C81, 0x00000014, 0x00000024, 0x00000002, 0xFE363C82, 0x0000001A, 0x00000024, 0x00000002, 0xFE363C83, 0x00000001, 0x00000044, 0x00000001, ExitSingleDoor, 0x00000008, 0x00000001, 0x00000011, 0x00000043, 0x00000003, GotoMap, 0x802435C8, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241430_ACBF50 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, UseDoorSounds, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000004, 0x00000024, 0x00000002, 0xFE363C81, 0x00000019, 0x00000024, 0x00000002, 0xFE363C82, 0x0000001C, 0x00000024, 0x00000002, 0xFE363C83, 0x00000001, 0x00000044, 0x00000001, ExitSingleDoor, 0x00000008, 0x00000001, 0x00000011, 0x00000043, 0x00000003, GotoMap, 0x802435D0, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802414E4_ACC004 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, UseDoorSounds, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000024, 0x00000002, 0xFE363C81, 0x0000000A, 0x00000024, 0x00000002, 0xFE363C82, 0x00000018, 0x00000024, 0x00000002, 0xFE363C83, 0x00000001, 0x00000044, 0x00000001, ExitSingleDoor, 0x00000008, 0x00000001, 0x00000011, 0x00000043, 0x00000003, GotoMap, 0x802435D8, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241598_ACC0B8 -.word 0x0000000D, 0x00000002, 0xF5DE0180, 0x0000003A, 0x00000047, 0x00000005, D_80241160_ACBC80, 0x00000100, 0x00000000, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000014, 0x00000001, 0xF5DE0180, 0x00000016, 0x00000001, 0x00000026, 0x00000047, 0x00000005, D_802414E4_ACC004, 0x00000100, 0x0000000A, 0x00000001, 0x00000000, 0x0000001C, 0x00000000, 0x00000047, 0x00000005, D_802412C8_ACBDE8, 0x00000100, 0x0000000A, 0x00000001, 0x00000000, 0x00000023, 0x00000000, 0x00000047, 0x00000005, D_80241214_ACBD34, 0x00000100, 0x00000005, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_8024137C_ACBE9C, 0x00000100, 0x00000014, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80241430_ACBF50, 0x00000100, 0x00000019, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241690_ACC1B0 -.word 0x00000043, 0x00000002, UseDoorSounds, 0x00000000, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000002, UseDoorSounds, 0x00000002, 0x00000024, 0x00000002, 0xFE363C82, 0x00000015, 0x00000024, 0x00000002, 0xFE363C83, 0x00000013, 0x00000046, 0x00000001, EnterDoubleDoor, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000002, UseDoorSounds, 0x00000002, 0x00000024, 0x00000002, 0xFE363C82, 0x0000000E, 0x00000024, 0x00000002, 0xFE363C83, 0x00000010, 0x00000046, 0x00000001, EnterDoubleDoor, 0x00000016, 0x00000001, 0x00000002, 0x00000024, 0x00000002, 0xFE363C82, 0x00000018, 0x00000024, 0x00000002, 0xFE363C83, 0x00000001, 0x00000046, 0x00000001, EnterSingleDoor, 0x00000016, 0x00000001, 0x00000003, 0x00000024, 0x00000002, 0xFE363C82, 0x0000001A, 0x00000024, 0x00000002, 0xFE363C83, 0x00000001, 0x00000046, 0x00000001, EnterSingleDoor, 0x00000016, 0x00000001, 0x00000004, 0x00000024, 0x00000002, 0xFE363C82, 0x0000001C, 0x00000024, 0x00000002, 0xFE363C83, 0x00000001, 0x00000046, 0x00000001, EnterSingleDoor, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024180C_ACC32C -.word 0x00000024, 0x00000002, 0xF5DE0329, 0x0000001A, 0x00000043, 0x00000002, SetSpriteShading, 0x00050000, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000043, 0x00000003, SetCamLeadPlayer, 0x00000000, 0x00000000, 0x00000014, 0x00000001, 0xF5DE0180, 0x0000001D, 0x00000001, 0x00000006, 0x0000001D, 0x00000001, 0x00000026, 0x00000043, 0x00000003, MakeNpcs, 0x00000000, 0x80242738, 0x00000020, 0x00000000, 0x00000016, 0x00000001, 0x0000003A, 0x00000043, 0x00000002, func_80240034_ACAB54, 0x00000001, 0x00000043, 0x00000003, MakeNpcs, 0x00000000, 0x80243594, 0x0000001C, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000082, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000083, 0x00000000, 0x00000023, 0x00000000, 0x00000046, 0x00000001, 0x80241B1C, 0x0000000F, 0x00000002, 0xF5DE0180, 0x0000005E, 0x00000043, 0x00000001, func_80240000_ACAB20, 0x00000013, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0x0000005F, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000075, 0x00000000, 0x00000008, 0x00000012, 0x00000000, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x0000006B, 0x00000001, 0x00000008, 0x00000013, 0x00000000, 0x00000044, 0x00000001, D_80241598_ACC0B8, 0x00000044, 0x00000001, D_80241690_ACC1B0, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kkj/kkj_10/ACC510.data.s b/ver/us/asm/data/world/area_kkj/kkj_10/ACC510.data.s deleted file mode 100644 index 25262aef8c..0000000000 --- a/ver/us/asm/data/world/area_kkj/kkj_10/ACC510.data.s +++ /dev/null @@ -1,9 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802419F0_ACC510 -.word 0x0000006A, 0x00000000 - -dlabel D_802419F8_ACC518 -.word 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00D8, 0x000000A0, 0x00000028, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000006, PlaySoundAt, 0x00000269, 0x00000000, 0x00000000, 0x0000000A, 0x000001EA, 0x00000024, 0x00000002, 0xFE363C80, 0xFD050F80, 0x00000043, 0x00000001, kkj_10_RemovePadlock, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000024, 0x00000002, 0xF8405D76, 0x00000001, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000047, 0x00000005, D_80241160_ACBC80, 0x00000100, 0x00000000, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000E, 0x00000002, 0xF5DE0180, 0x0000003A, 0x0000000A, 0x00000002, 0xF8405D76, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_Padlock, 0x00000000, 0x0000000A, 0x000001EA, 0x000000B4, 0x80000000, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x0000004E, 0x00000006, D_802419F8_ACC518, 0x00000100, 0x00004000, D_802419F0_ACC510, 0x00000000, 0x00000001, 0x00000012, 0x00000000, 0x00000047, 0x00000005, D_80241160_ACBC80, 0x00000100, 0x00000000, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kkj/kkj_10/ACC700.data.s b/ver/us/asm/data/world/area_kkj/kkj_10/ACC700.data.s deleted file mode 100644 index 5faa9e6f35..0000000000 --- a/ver/us/asm/data/world/area_kkj/kkj_10/ACC700.data.s +++ /dev/null @@ -1,57 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80241BE0_ACC700 -.word 0x00000000, 0x00280018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00190000 - -dlabel D_80241C0C_ACC72C -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x0000004D, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000001, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFFFFFFFF, 0x00000262, 0x00000000, 0x00000043, 0x0000000A, ShowEmote, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000014, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, NpcFacePlayer, 0xFFFFFFFF, 0x00000005, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, PlayerFaceNpc, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x000C0005, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00580002, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00580009, 0x00580002, 0x00000000, 0x00140174, 0x00000043, 0x00000005, kkj_10_UnkGooberFunc, 0xFFFFFFFF, 0xFE363C83, 0xFE363C80, 0xFE363C82, 0x0000000B, 0x00000002, 0xFE363C83, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00580007, 0x00000043, 0x00000003, SetNpcSpeed, 0xFFFFFFFF, 0xF24A8E80, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0xFE363C80, 0xFE363C82, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00580002, 0x00000013, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00580009, 0x00580002, 0x00000000, 0x00140175, 0x00000043, 0x00000002, SetPlayerAnimation, 0x000C0017, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000004, GotoMapSpecial, 0x802435F8, 0x0000000B, 0x0000000D, 0x00000008, 0x00000001, 0x00000064, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241E14_ACC934 -.word 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000008, kkj_10_UnkModelMatrixFunc2, 0xFE363C80, 0x00000064, 0x0000005A, 0x00000000, 0x00000028, 0x00000082, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000043, 0x00000003, BindNpcAI, 0xFFFFFFFF, D_80241C0C_ACC72C, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000003, SetNpcSpeed, 0xFFFFFFFF, 0xF24A8280, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0xFFFFFF10, 0x000000F0, 0x00000000, 0x00000043, 0x00000006, kkj_10_UnkAtan2Func, 0xFE363C80, 0xFFFFFF10, 0x000000F0, 0x00000000, 0x000000F0, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFF, 0xFE363C80, 0x0000000F, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0x00000000, 0x000000F0, 0x00000000, 0x00000043, 0x00000006, kkj_10_UnkAtan2Func, 0xFE363C80, 0x00000000, 0x000000F0, 0xFFFFFF10, 0x000000F0, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFF, 0xFE363C80, 0x0000000F, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0xFFFFFF10, 0x000000F0, 0x00000000, 0x00000043, 0x00000006, kkj_10_UnkAtan2Func, 0xFE363C80, 0xFFFFFF10, 0x000000F0, 0xFFFFFF10, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFF, 0xFE363C80, 0x0000000F, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0xFFFFFF10, 0x00000000, 0x00000000, 0x00000043, 0x00000006, kkj_10_UnkAtan2Func, 0xFE363C80, 0xFFFFFF10, 0x00000000, 0xFFFFFF10, 0x000000F0, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFF, 0xFE363C80, 0x0000000F, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242058_ACCB78 -.word 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000008, kkj_10_UnkModelMatrixFunc2, 0xFE363C80, 0x00000064, 0x0000005A, 0x00000000, 0x00000028, 0x00000083, 0x00000001, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000043, 0x00000003, BindNpcAI, 0xFFFFFFFF, D_80241C0C_ACC72C, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000003, SetNpcSpeed, 0xFFFFFFFF, 0xF24A8280, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0x000000F0, 0x000000F0, 0x00000000, 0x00000043, 0x00000006, kkj_10_UnkAtan2Func, 0xFE363C80, 0x000000F0, 0x000000F0, 0x000000F0, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFF, 0xFE363C80, 0x0000000F, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0x000000F0, 0x00000000, 0x00000000, 0x00000043, 0x00000006, kkj_10_UnkAtan2Func, 0xFE363C80, 0x000000F0, 0x00000000, 0x000000F0, 0x000000F0, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFF, 0xFE363C80, 0x0000000F, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0x000000F0, 0x000000F0, 0x00000000, 0x00000043, 0x00000006, kkj_10_UnkAtan2Func, 0xFE363C80, 0x000000F0, 0x000000F0, 0x00000000, 0x000000F0, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFF, 0xFE363C80, 0x0000000F, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0x00000000, 0x000000F0, 0x00000000, 0x00000043, 0x00000006, kkj_10_UnkAtan2Func, 0xFE363C80, 0x00000000, 0x000000F0, 0x000000F0, 0x000000F0, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFF, 0xFE363C80, 0x0000000F, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024229C_ACCDBC -.word 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00580005, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0xFFFFFF10, 0x00000000, 0x00000000, 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, D_80241E14_ACC934, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802422F0_ACCE10 -.word 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00580005, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x000000F0, 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, D_80242058_ACCB78, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242344_ACCE64 -.word 0x00580002, 0x00580005, 0x00580007, 0x00580009, 0xFFFFFFFF - -dlabel D_80242358_ACCE78 -.word 0x00000000, D_80241BE0_ACC700, 0x00000000, 0xC3FA0000, 0x00000000, 0x00000D0D, D_8024229C_ACCDBC, 0x00000000, 0x00000000, 0x00000000, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00580001, 0x00580004, 0x00580006, 0x00580006, 0x00580001, 0x00580001, 0x00580010, 0x00580010, 0x0058000C, 0x0058000B, 0x0058000D, 0x00580001, 0x00580001, 0x00580001, 0x00580001, 0x00580001, 0x00000000, 0x00000000, D_80242344_ACCE64, 0x00000000, 0x00000001, D_80241BE0_ACC700, 0x00000000, 0xC3FA0000, 0x00000000, 0x00000D0D, D_802422F0_ACCE10, 0x00000000, 0x00000000, 0x00000000, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00580001, 0x00580004, 0x00580006, 0x00580006, 0x00580001, 0x00580001, 0x00580010, 0x00580010, 0x0058000C, 0x0058000B, 0x0058000D, 0x00580001, 0x00580001, 0x00580001, 0x00580001, 0x00580001, 0x00000000, 0x00000000, D_80242344_ACCE64, 0x00000000, 0x00000002, D_80242358_ACCE78, 0x00000000, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_80242750_ACD270 -.word 0x00000000, 0x00280018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00190000 - -dlabel D_8024277C_ACD29C -.word 0x00580000, 0x00580001, 0x00580002, 0x00580004, 0x00580005, 0x00580006, 0x00580007, 0x00580008, 0x00580009, 0x00580012, 0x00580014, 0x0058001B, 0xFFFFFFFF - -dlabel D_802427B0_ACD2D0 -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x0000004D, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000001, 0x00000043, 0x00000001, func_80240F44_ACBA64, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFFFFFFFF, 0x00000262, 0x00000000, 0x00000043, 0x0000000A, ShowEmote, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000014, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, NpcFacePlayer, 0xFFFFFFFF, 0x00000005, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, PlayerFaceNpc, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x000C0005, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00580002, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00580009, 0x00580002, 0x00000000, 0x00140174, 0x00000043, 0x00000005, dup_kkj_10_UnkGooberFunc, 0xFFFFFFFF, 0xFE363C83, 0xFE363C80, 0xFE363C82, 0x0000000B, 0x00000002, 0xFE363C83, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00580007, 0x00000043, 0x00000003, SetNpcSpeed, 0xFFFFFFFF, 0xF24A8E80, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0xFE363C80, 0xFE363C82, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00580002, 0x00000013, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00580009, 0x00580002, 0x00000000, 0x00140175, 0x00000043, 0x00000002, SetPlayerAnimation, 0x000C0017, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000004, GotoMapSpecial, 0x80243618, 0x0000000B, 0x0000000D, 0x00000008, 0x00000001, 0x00000064, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802429C4_ACD4E4 -.word 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000008, dup_kkj_10_UnkModelMatrixFunc2, 0xFE363C80, 0x00000064, 0x0000005A, 0x00000000, 0x00000028, 0x00000082, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C82, 0x00000000, 0x00000043, 0x00000002, dup_kkj_10_GetPeachDisguise, 0xFE363C81, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000043, 0x00000003, SetSelfEnemyFlagBits, 0x08000000, 0x00000001, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000003, BindNpcAI, 0xFFFFFFFF, D_802427B0_ACD2D0, 0x00000024, 0x00000002, 0xFE363C82, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000003, SetSelfEnemyFlagBits, 0x08000000, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000003, SetNpcSpeed, 0xFFFFFFFF, 0xF24A8280, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0xFFFFFF10, 0x000000F0, 0x00000000, 0x00000043, 0x00000006, dup_kkj_10_UnkAtan2Func, 0xFE363C80, 0xFFFFFF10, 0x000000F0, 0x00000000, 0x000000F0, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFF, 0xFE363C80, 0x0000000F, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0x00000000, 0x000000F0, 0x00000000, 0x00000043, 0x00000006, dup_kkj_10_UnkAtan2Func, 0xFE363C80, 0x00000000, 0x000000F0, 0xFFFFFF10, 0x000000F0, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFF, 0xFE363C80, 0x0000000F, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0xFFFFFF10, 0x000000F0, 0x00000000, 0x00000043, 0x00000006, dup_kkj_10_UnkAtan2Func, 0xFE363C80, 0xFFFFFF10, 0x000000F0, 0xFFFFFF10, 0xFFFFFFCE, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFF, 0xFE363C80, 0x0000000F, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0xFFFFFF10, 0xFFFFFFCE, 0x00000000, 0x00000043, 0x00000006, dup_kkj_10_UnkAtan2Func, 0xFE363C80, 0xFFFFFF10, 0xFFFFFFCE, 0xFFFFFF10, 0x000000F0, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFF, 0xFE363C80, 0x0000000F, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242C60_ACD780 -.word 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000008, dup_kkj_10_UnkModelMatrixFunc2, 0xFE363C80, 0x00000064, 0x0000005A, 0x00000000, 0x00000028, 0x00000083, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C82, 0x00000000, 0x00000043, 0x00000002, dup_kkj_10_GetPeachDisguise, 0xFE363C81, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000043, 0x00000003, SetSelfEnemyFlagBits, 0x08000000, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000003, BindNpcAI, 0xFFFFFFFF, D_802427B0_ACD2D0, 0x00000024, 0x00000002, 0xFE363C82, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000003, SetSelfEnemyFlagBits, 0x08000000, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000003, SetNpcSpeed, 0xFFFFFFFF, 0xF24A8280, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0x000000F0, 0x000000F0, 0x00000000, 0x00000043, 0x00000006, dup_kkj_10_UnkAtan2Func, 0xFE363C80, 0x000000F0, 0x000000F0, 0x000000F0, 0xFFFFFFCE, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFF, 0xFE363C80, 0x0000000F, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0x000000F0, 0xFFFFFFCE, 0x00000000, 0x00000043, 0x00000006, dup_kkj_10_UnkAtan2Func, 0xFE363C80, 0x000000F0, 0xFFFFFFCE, 0x000000F0, 0x000000F0, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFF, 0xFE363C80, 0x0000000F, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0x000000F0, 0x000000F0, 0x00000000, 0x00000043, 0x00000006, dup_kkj_10_UnkAtan2Func, 0xFE363C80, 0x000000F0, 0x000000F0, 0x00000000, 0x000000F0, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFF, 0xFE363C80, 0x0000000F, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0x00000000, 0x000000F0, 0x00000000, 0x00000043, 0x00000006, dup_kkj_10_UnkAtan2Func, 0xFE363C80, 0x00000000, 0x000000F0, 0x000000F0, 0x000000F0, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFF, 0xFE363C80, 0x0000000F, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242EFC_ACDA1C -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000003, GetSelfVar, 0x00000000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00580009, 0x00580002, 0x00000005, 0x0014013C, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00580009, 0x00580002, 0x00000005, 0x0014013D, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242FC8_ACDAE8 -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, dup_kkj_10_GetPeachDisguise, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000003, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00580009, 0x00580002, 0x00000005, 0x00140140, 0x00000012, 0x00000000, 0x00000043, 0x00000003, GetSelfVar, 0x00000000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00580009, 0x00580002, 0x00000005, 0x0014013E, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00580009, 0x00580002, 0x00000005, 0x0014013F, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802430E4_ACDC04 -.word 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00580005, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0xFFFFFF10, 0x00000000, 0xFFFFFFCE, 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, D_802429C4_ACD4E4, 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, D_80242EFC_ACDA1C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024314C_ACDC6C -.word 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00580005, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x000000F0, 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, D_80242C60_ACD780, 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, D_80242FC8_ACDAE8, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802431B4_ACDCD4 -.word 0x00000000, D_80242750_ACD270, 0x00000000, 0xC3FA0000, 0x00000000, 0x00000D0D, D_802430E4_ACDC04, 0x00000000, 0x00000000, 0x00000000, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00580001, 0x00580004, 0x00580006, 0x00580006, 0x00580001, 0x00580001, 0x00580010, 0x00580010, 0x0058000C, 0x0058000B, 0x0058000D, 0x00580001, 0x00580001, 0x00580001, 0x00580001, 0x00580001, 0x00000000, 0x00000000, D_8024277C_ACD29C, 0x00000000, 0x00000001, D_80242750_ACD270, 0x00000000, 0xC3FA0000, 0x00000000, 0x00000D0D, D_8024314C_ACDC6C, 0x00000000, 0x00000000, 0x00000000, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00580001, 0x00580004, 0x00580006, 0x00580006, 0x00580001, 0x00580001, 0x00580010, 0x00580010, 0x0058000C, 0x0058000B, 0x0058000D, 0x00580001, 0x00580001, 0x00580001, 0x00580001, 0x00580001, 0x00000000, 0x00000000, D_8024277C_ACD29C, 0x00000000, 0x00000002, D_802431B4_ACDCD4, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kkj/kkj_11/ACF210.data.s b/ver/us/asm/data/world/area_kkj/kkj_11/ACF210.data.s deleted file mode 100644 index 56bb8ab499..0000000000 --- a/ver/us/asm/data/world/area_kkj/kkj_11/ACF210.data.s +++ /dev/null @@ -1,36 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802410D0_ACF210 -.word 0x00000000, 0x00000000, 0x43F00000, 0x00000000, 0x00000000, 0x42C80000, 0xC3B40000, 0x43340000, 0xC3A28000, 0x00000000, 0x43B40000, 0x42340000, 0xC3F00000, 0x00000000, 0x42480000, 0x42B40000, 0x00000000, 0x00000000, 0xC37F0000, 0x43340000, 0x43F00000, 0x00000000, 0x42480000, 0x43870000, 0x43960000, 0x00000000, 0x43BE0000, 0x439D8000, 0xC4020000, 0x00000000, 0x42480000, 0x42B40000, 0x43E90000, 0x00000000, 0x42700000, 0x43870000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80241994_ACFAD4, D_802410D0_ACF210, 0x00000009, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0019000C - -dlabel D_802411A0_ACF2E0 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, UseDoorSounds, 0x00000002, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x00000014, 0x00000024, 0x00000002, 0xFE363C83, 0x00000012, 0x00000044, 0x00000001, ExitDoubleDoor, 0x00000008, 0x00000001, 0x00000011, 0x00000043, 0x00000003, GotoMap, 0x80245ED0, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241254_ACF394 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, UseDoorSounds, 0x00000002, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000024, 0x00000002, 0xFE363C81, 0x00000005, 0x00000024, 0x00000002, 0xFE363C82, 0x00000017, 0x00000024, 0x00000002, 0xFE363C83, 0x00000019, 0x00000044, 0x00000001, ExitDoubleDoor, 0x00000008, 0x00000001, 0x00000011, 0x00000043, 0x00000003, GotoMap, 0x80245ED8, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241308_ACF448 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, UseDoorSounds, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000004, 0x00000024, 0x00000002, 0xFE363C81, 0x0000000A, 0x00000024, 0x00000002, 0xFE363C82, 0x00000020, 0x00000024, 0x00000002, 0xFE363C83, 0x00000001, 0x00000044, 0x00000001, ExitSingleDoor, 0x00000008, 0x00000001, 0x00000011, 0x00000043, 0x00000003, GotoMap, 0x80245EE0, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802413BC_ACF4FC -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, UseDoorSounds, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000024, 0x00000002, 0xFE363C81, 0x0000000F, 0x00000024, 0x00000002, 0xFE363C82, 0x0000001C, 0x00000024, 0x00000002, 0xFE363C83, 0x00000001, 0x00000044, 0x00000001, ExitSingleDoor, 0x00000008, 0x00000001, 0x00000011, 0x00000043, 0x00000003, GotoMap, 0x80245EE8, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241470_ACF5B0 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, UseDoorSounds, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000003, 0x00000024, 0x00000002, 0xFE363C81, 0x00000014, 0x00000024, 0x00000002, 0xFE363C82, 0x0000001E, 0x00000024, 0x00000002, 0xFE363C83, 0x00000001, 0x00000044, 0x00000001, ExitSingleDoor, 0x00000008, 0x00000001, 0x00000011, 0x00000043, 0x00000003, GotoMap, 0x80245EF0, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241524_ACF664 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, UseDoorSounds, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000005, 0x00000024, 0x00000002, 0xFE363C81, 0x0000001E, 0x00000024, 0x00000002, 0xFE363C82, 0x00000022, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFFFF, 0x00000044, 0x00000001, ExitSingleDoor, 0x00000008, 0x00000001, 0x00000011, 0x00000043, 0x00000003, GotoMap, 0x80245EF8, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802415D8_ACF718 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, UseDoorSounds, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000006, 0x00000024, 0x00000002, 0xFE363C81, 0x00000019, 0x00000024, 0x00000002, 0xFE363C82, 0x00000024, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFFFF, 0x00000044, 0x00000001, ExitSingleDoor, 0x00000008, 0x00000001, 0x00000011, 0x00000043, 0x00000003, GotoMap, 0x80245F00, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024168C_ACF7CC -.word 0x0000000D, 0x00000002, 0xF5DE0180, 0x00000006, 0x00000047, 0x00000005, D_802411A0_ACF2E0, 0x00000100, 0x00000000, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x0000000D, 0x00000002, 0xF5DE0180, 0x00000058, 0x00000047, 0x00000005, D_80241254_ACF394, 0x00000100, 0x00000005, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80241308_ACF448, 0x00000100, 0x0000000A, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000047, 0x00000005, D_80241524_ACF664, 0x00000100, 0x0000001E, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_802413BC_ACF4FC, 0x00000100, 0x0000000F, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80241470_ACF5B0, 0x00000100, 0x00000014, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_802415D8_ACF718, 0x00000100, 0x00000019, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241790_ACF8D0 -.word 0x00000043, 0x00000002, UseDoorSounds, 0x00000000, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000002, UseDoorSounds, 0x00000002, 0x00000024, 0x00000002, 0xFE363C82, 0x00000014, 0x00000024, 0x00000002, 0xFE363C83, 0x00000012, 0x00000046, 0x00000001, EnterDoubleDoor, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000002, UseDoorSounds, 0x00000002, 0x00000024, 0x00000002, 0xFE363C82, 0x00000017, 0x00000024, 0x00000002, 0xFE363C83, 0x00000019, 0x00000046, 0x00000001, EnterDoubleDoor, 0x00000016, 0x00000001, 0x00000002, 0x00000024, 0x00000002, 0xFE363C82, 0x0000001C, 0x00000024, 0x00000002, 0xFE363C83, 0x00000001, 0x00000046, 0x00000001, EnterSingleDoor, 0x00000016, 0x00000001, 0x00000003, 0x00000024, 0x00000002, 0xFE363C82, 0x0000001E, 0x00000024, 0x00000002, 0xFE363C83, 0x00000001, 0x00000046, 0x00000001, EnterSingleDoor, 0x00000016, 0x00000001, 0x00000004, 0x00000024, 0x00000002, 0xFE363C82, 0x00000020, 0x00000024, 0x00000002, 0xFE363C83, 0x00000001, 0x00000046, 0x00000001, EnterSingleDoor, 0x00000016, 0x00000001, 0x00000005, 0x00000024, 0x00000002, 0xFE363C82, 0x00000022, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFFFF, 0x00000046, 0x00000001, EnterSingleDoor, 0x00000016, 0x00000001, 0x00000006, 0x00000024, 0x00000002, 0xFE363C82, 0x00000024, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFFFF, 0x00000046, 0x00000001, EnterSingleDoor, 0x00000016, 0x00000001, 0x00000007, 0x00000046, 0x00000001, 0x80241F4C, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241994_ACFAD4 -.word 0x00000024, 0x00000002, 0xF5DE0329, 0x0000001A, 0x00000043, 0x00000002, SetSpriteShading, 0x00050001, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000043, 0x00000003, SetCamLeadPlayer, 0x00000000, 0x00000000, 0x00000014, 0x00000001, 0xF5DE0180, 0x0000001D, 0x00000001, 0xFFFFFFB4, 0x0000001D, 0x00000001, 0xFFFFFFCA, 0x0000001D, 0x00000001, 0xFFFFFFF2, 0x0000001D, 0x00000001, 0x00000006, 0x0000001D, 0x00000001, 0x00000026, 0x00000043, 0x00000003, MakeNpcs, 0x00000000, 0x8024468C, 0x00000020, 0x00000000, 0x00000016, 0x00000001, 0x0000003A, 0x00000043, 0x00000002, func_80240034_ACE174, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0x0000007F, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000080, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000081, 0x00000000, 0x00000043, 0x00000001, func_80240000_ACE140, 0x00000043, 0x00000003, MakeNpcs, 0x00000000, 0x80245EB4, 0x0000001C, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x0000007F, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000080, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000081, 0x00000000, 0x00000043, 0x00000001, func_80240000_ACE140, 0x00000023, 0x00000000, 0x00000046, 0x00000001, 0x80241D2C, 0x00000043, 0x00000002, GetDemoState, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000046, 0x00000001, 0x80242E38, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0x0000005F, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000075, 0x00000000, 0x00000008, 0x00000013, 0x00000000, 0x00000044, 0x00000001, D_8024168C_ACF7CC, 0x00000044, 0x00000001, D_80241790_ACF8D0, 0x00000008, 0x00000001, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kkj/kkj_11/ACFD40.data.s b/ver/us/asm/data/world/area_kkj/kkj_11/ACFD40.data.s deleted file mode 100644 index daa0dcd154..0000000000 --- a/ver/us/asm/data/world/area_kkj/kkj_11/ACFD40.data.s +++ /dev/null @@ -1,9 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80241C00_ACFD40 -.word 0x0000006A, 0x00000000 - -dlabel D_80241C08_ACFD48 -.word 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00D8, 0x000000A0, 0x00000028, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000006, PlaySoundAt, 0x00000269, 0x00000000, 0x00000000, 0x0000000A, 0x000001EA, 0x00000024, 0x00000002, 0xFE363C80, 0xFD050F80, 0x00000043, 0x00000001, kkj_11_RemovePadlock, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000024, 0x00000002, 0xF8405D74, 0x00000001, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000047, 0x00000005, D_802411A0_ACF2E0, 0x00000100, 0x00000000, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000E, 0x00000002, 0xF5DE0180, 0x00000006, 0x0000000A, 0x00000002, 0xF8405D74, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_Padlock, 0x00000000, 0x0000000A, 0x000001EA, 0x000000B4, 0x80000000, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x0000004E, 0x00000006, D_80241C08_ACFD48, 0x00000100, 0x00004000, D_80241C00_ACFD40, 0x00000000, 0x00000001, 0x00000012, 0x00000000, 0x00000047, 0x00000005, D_802411A0_ACF2E0, 0x00000100, 0x00000000, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kkj/kkj_11/ACFF30.data.s b/ver/us/asm/data/world/area_kkj/kkj_11/ACFF30.data.s deleted file mode 100644 index e992ef9edd..0000000000 --- a/ver/us/asm/data/world/area_kkj/kkj_11/ACFF30.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80241DF0_ACFF30 -.word 0x00000043, 0x00000004, PlaySoundAtCollider, 0x00000014, 0x000001C1, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0xFFFFFF88, 0x0000000A, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateModel, 0x0000001E, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000005, MakeLerp, 0xFFFFFF88, 0x00000000, 0x0000000A, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateModel, 0x0000001E, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x00000014, 0x000001C2, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0x0000000A, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x00000000, 0x00000000, 0x000001BC, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x00000000, 0x00000000, 0x000001BC, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000008, 0x00000001, 0x00000001, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFFFFFE52, 0x00000000, 0x00000032, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFFFFFE52, 0x00000000, 0x00000032, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8680, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000008, 0x00000001, 0x0000001E, 0x00000024, 0x00000002, 0xF9718886, 0x00000001, 0x00000044, 0x00000001, D_80241DF0_ACFF30, 0x00000008, 0x00000001, 0x0000000A, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFC, 0xFFFFFE39, 0x00000032, 0x0000001E, 0x00000057, 0x00000000, 0x00000043, 0x00000004, PlayerMoveTo, 0xFFFFFE52, 0x00000032, 0x0000001E, 0x00000043, 0x00000004, SetPlayerPos, 0xFFFFFE52, 0x00000000, 0x00000032, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kkj/kkj_11/AD02E0.data.s b/ver/us/asm/data/world/area_kkj/kkj_11/AD02E0.data.s deleted file mode 100644 index e6e1bc8af4..0000000000 --- a/ver/us/asm/data/world/area_kkj/kkj_11/AD02E0.data.s +++ /dev/null @@ -1,48 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802421A0_AD02E0 -.word 0x00000043, 0x00000003, DemoJoystickXY, 0xFFFFFFB5, 0xFFFFFFD4, 0x00000008, 0x00000001, 0x00000029, 0x00000043, 0x00000003, DemoJoystickXY, 0xFFFFFFB6, 0xFFFFFFD4, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, DemoJoystickXY, 0xFFFFFFB6, 0xFFFFFFD6, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, DemoJoystickXY, 0xFFFFFFB6, 0xFFFFFFD8, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, DemoJoystickXY, 0xFFFFFFB6, 0xFFFFFFD9, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, DemoJoystickXY, 0xFFFFFFB5, 0xFFFFFFDB, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, DemoJoystickXY, 0xFFFFFFB5, 0xFFFFFFDD, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000003, DemoJoystickXY, 0xFFFFFFB5, 0xFFFFFFDF, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, DemoJoystickXY, 0xFFFFFFB5, 0xFFFFFFE0, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, DemoJoystickXY, 0xFFFFFFB4, 0xFFFFFFE1, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, DemoJoystickXY, 0xFFFFFFB4, 0xFFFFFFE2, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, DemoJoystickXY, 0xFFFFFFB4, 0xFFFFFFE3, 0x00000008, 0x00000001, 0x00000004, 0x00000043, 0x00000003, DemoJoystickXY, 0xFFFFFFB4, 0xFFFFFFE4, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, DemoJoystickXY, 0xFFFFFFB2, 0xFFFFFFE9, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, DemoJoystickXY, 0xFFFFFFB1, 0xFFFFFFF1, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, DemoJoystickXY, 0xFFFFFFAF, 0xFFFFFFF9, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, DemoJoystickXY, 0xFFFFFFAE, 0xFFFFFFFE, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000003, DemoJoystickXY, 0xFFFFFFAE, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, DemoJoystickXY, 0xFFFFFFAF, 0x00000002, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, DemoJoystickXY, 0xFFFFFFB0, 0x00000005, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, DemoJoystickXY, 0xFFFFFFB0, 0x00000007, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, DemoJoystickXY, 0xFFFFFFB1, 0x00000009, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, DemoJoystickXY, 0xFFFFFFB1, 0x0000000C, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, DemoJoystickXY, 0xFFFFFFB2, 0x00000012, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, DemoJoystickXY, 0xFFFFFFB3, 0x00000015, 0x00000008, 0x00000001, 0x0000000C, 0x00000043, 0x00000003, DemoJoystickXY, 0xFFFFFFB4, 0x00000016, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, DemoJoystickXY, 0xFFFFFFB5, 0x0000001B, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, DemoJoystickXY, 0xFFFFFFB6, 0x0000001E, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, DemoJoystickXY, 0xFFFFFFB6, 0x0000001F, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000003, DemoJoystickXY, 0xFFFFFFB7, 0x0000001F, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000003, DemoJoystickXY, 0xFFFFFFB7, 0x00000021, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, DemoJoystickXY, 0xFFFFFFB7, 0x00000022, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, DemoJoystickXY, 0xFFFFFFB8, 0x00000024, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, DemoJoystickXY, 0xFFFFFFB9, 0x00000026, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, DemoJoystickXY, 0xFFFFFFBA, 0x00000026, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, DemoJoystickXY, 0xFFFFFFE0, 0x00000017, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, DemoJoystickXY, 0xFFFFFFFF, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000003, DemoJoystickXY, 0xFFFFFFFF, 0xFFFFFFFD, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, DemoJoystickXY, 0x00000000, 0xFFFFFFE5, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, DemoJoystickXY, 0xFFFFFFFF, 0xFFFFFFC0, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, DemoJoystickXY, 0xFFFFFFF4, 0xFFFFFFAF, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, DemoJoystickXY, 0xFFFFFFF2, 0xFFFFFFAE, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, DemoJoystickXY, 0xFFFFFFE8, 0xFFFFFFAF, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, DemoJoystickXY, 0xFFFFFFE0, 0xFFFFFFB0, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, DemoJoystickXY, 0xFFFFFFDD, 0xFFFFFFB1, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, DemoJoystickXY, 0xFFFFFFD5, 0xFFFFFFB3, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, DemoJoystickXY, 0xFFFFFFCC, 0xFFFFFFB5, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, DemoJoystickXY, 0xFFFFFFC4, 0xFFFFFFB7, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, DemoJoystickXY, 0xFFFFFFBE, 0xFFFFFFB8, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000003, DemoJoystickXY, 0xFFFFFFBD, 0xFFFFFFB9, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, DemoJoystickXY, 0xFFFFFFBC, 0xFFFFFFC1, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, DemoJoystickXY, 0xFFFFFFB9, 0xFFFFFFCB, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, DemoJoystickXY, 0xFFFFFFB5, 0xFFFFFFE0, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, DemoJoystickXY, 0xFFFFFFB1, 0xFFFFFFF0, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, DemoJoystickXY, 0xFFFFFFAE, 0xFFFFFFFE, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, DemoJoystickXY, 0xFFFFFFAE, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, DemoJoystickXY, 0xFFFFFFAF, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, DemoJoystickXY, 0xFFFFFFAF, 0x00000002, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, DemoJoystickXY, 0xFFFFFFAF, 0x00000003, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000003, DemoJoystickXY, 0xFFFFFFB0, 0x00000005, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, DemoJoystickXY, 0xFFFFFFB0, 0x00000007, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, DemoJoystickXY, 0xFFFFFFB1, 0x0000000B, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, DemoJoystickXY, 0xFFFFFFB3, 0x00000014, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, DemoJoystickXY, 0xFFFFFFB7, 0x00000021, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, DemoJoystickXY, 0xFFFFFFBA, 0x00000030, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, DemoJoystickXY, 0xFFFFFFBF, 0x00000042, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000003, DemoJoystickXY, 0xFFFFFFBF, 0x00000043, 0x00000008, 0x00000001, 0x0000001C, 0x00000043, 0x00000003, DemoJoystickXY, 0xFFFFFFBF, 0x00000042, 0x00000008, 0x00000001, 0x00000004, 0x00000043, 0x00000003, DemoJoystickXY, 0xFFFFFFBF, 0x00000041, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, DemoJoystickXY, 0xFFFFFFC4, 0x0000003B, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, DemoJoystickXY, 0xFFFFFFD0, 0x00000031, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, DemoJoystickXY, 0xFFFFFFE3, 0x0000001F, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, DemoJoystickXY, 0xFFFFFFF3, 0x0000000F, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, DemoJoystickXY, 0xFFFFFFFF, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000003, DemoJoystickXY, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, DemoJoystickXY, 0x00000002, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, DemoJoystickXY, 0x0000000A, 0x00000001, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000003, DemoJoystickXY, 0xFFFFFFFF, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000003, DemoJoystickXY, 0xFFFFFFFE, 0x00000009, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, DemoJoystickXY, 0xFFFFFFED, 0x00000021, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, DemoJoystickXY, 0xFFFFFFD8, 0x00000043, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, DemoJoystickXY, 0xFFFFFFD4, 0x00000047, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000003, DemoJoystickXY, 0xFFFFFFD4, 0x00000048, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, DemoJoystickXY, 0xFFFFFFD4, 0x00000049, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, DemoJoystickXY, 0xFFFFFFD5, 0x00000049, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, DemoJoystickXY, 0xFFFFFFD5, 0x0000004A, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000003, DemoJoystickXY, 0xFFFFFFD6, 0x0000004A, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, DemoJoystickXY, 0xFFFFFFD7, 0x0000004A, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000003, DemoJoystickXY, 0xFFFFFFD9, 0x0000004B, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, DemoJoystickXY, 0xFFFFFFDC, 0x0000004B, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, DemoJoystickXY, 0xFFFFFFE1, 0x0000004C, 0x00000008, 0x00000001, 0x00000033, 0x00000043, 0x00000003, DemoJoystickXY, 0xFFFFFFE3, 0x0000004C, 0x0000000A, 0x00000002, 0xF8405B89, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xF8405B89, 0x00000001, 0x00000043, 0x00000004, GotoMapSpecial, 0x80245F08, 0x00000002, 0x00000002, 0x00000008, 0x00000001, 0x0000006E, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242D78_AD0EB8 -.word 0x00000008, 0x00000001, 0x0000000A, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetDemoState, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000002, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x0000000A, 0x00000002, 0xF8405B89, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xF8405B89, 0x00000001, 0x00000043, 0x00000004, GotoMapSpecial, 0x80245F08, 0x00000002, 0x00000003, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF8405B89, 0x00000000, 0x00000044, 0x00000001, D_80242D78_AD0EB8, 0x00000044, 0x00000001, D_802421A0_AD02E0, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242E70_AD0FB0 -.word 0x00000000, 0x00280018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00190000 - -dlabel D_80242E9C_AD0FDC -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x0000004D, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000001, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFFFFFFFF, 0x00000262, 0x00000000, 0x00000043, 0x0000000A, ShowEmote, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000014, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, NpcFacePlayer, 0xFFFFFFFF, 0x00000005, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, PlayerFaceNpc, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x000C0005, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00580002, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00580009, 0x00580002, 0x00000000, 0x00140174, 0x00000043, 0x00000005, kkj_11_UnkGooberFunc, 0xFFFFFFFF, 0xFE363C83, 0xFE363C80, 0xFE363C82, 0x0000000B, 0x00000002, 0xFE363C83, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00580007, 0x00000043, 0x00000003, SetNpcSpeed, 0xFFFFFFFF, 0xF24A8E80, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0xFE363C80, 0xFE363C82, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00580002, 0x00000013, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00580009, 0x00580002, 0x00000000, 0x00140175, 0x00000043, 0x00000002, SetPlayerAnimation, 0x000C0017, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000004, GotoMapSpecial, 0x80245F28, 0x0000000B, 0x0000000D, 0x00000008, 0x00000001, 0x00000064, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802430A4_AD11E4 -.word 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000008, kkj_11_UnkModelMatrixFunc2, 0xFE363C80, 0x00000064, 0x0000005A, 0x00000000, 0x00000028, 0x0000007F, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000043, 0x00000003, BindNpcAI, 0xFFFFFFFF, D_80242E9C_AD0FDC, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000003, SetNpcSpeed, 0xFFFFFFFF, 0xF24A8280, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0xFFFFFF7E, 0xFFFFFF7E, 0x00000000, 0x00000043, 0x00000006, kkj_11_UnkAtan2Func, 0xFE363C80, 0xFFFFFF7E, 0xFFFFFF7E, 0xFFFFFF4C, 0xFFFFFFE2, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFF, 0xFE363C80, 0x0000000F, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0xFFFFFF4C, 0xFFFFFFE2, 0x00000000, 0x00000043, 0x00000006, kkj_11_UnkAtan2Func, 0xFE363C80, 0xFFFFFF4C, 0xFFFFFFE2, 0x000000B4, 0xFFFFFFE2, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFF, 0xFE363C80, 0x0000000F, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0x000000B4, 0xFFFFFFE2, 0x00000000, 0x00000043, 0x00000006, kkj_11_UnkAtan2Func, 0xFE363C80, 0x000000B4, 0xFFFFFFE2, 0x00000082, 0xFFFFFF7E, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFF, 0xFE363C80, 0x0000000F, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0x00000082, 0xFFFFFF7E, 0x00000000, 0x00000043, 0x00000006, kkj_11_UnkAtan2Func, 0xFE363C80, 0x00000082, 0xFFFFFF7E, 0xFFFFFF7E, 0xFFFFFF7E, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFF, 0xFE363C80, 0x0000000F, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802432E8_AD1428 -.word 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000008, kkj_11_UnkModelMatrixFunc2, 0xFE363C80, 0x00000064, 0x0000005A, 0x00000000, 0x00000028, 0x00000080, 0x00000001, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000043, 0x00000003, BindNpcAI, 0xFFFFFFFF, D_80242E9C_AD0FDC, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000003, SetNpcSpeed, 0xFFFFFFFF, 0xF24A8280, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0xFFFFFF7E, 0x000000B4, 0x00000000, 0x00000043, 0x00000006, kkj_11_UnkAtan2Func, 0xFE363C80, 0xFFFFFF7E, 0x000000B4, 0xFFFFFF7E, 0x000000E6, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFF, 0xFE363C80, 0x0000000F, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0xFFFFFF7E, 0x000000E6, 0x00000000, 0x00000043, 0x00000006, kkj_11_UnkAtan2Func, 0xFE363C80, 0xFFFFFF7E, 0x000000E6, 0xFFFFFFD8, 0x000000E6, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFF, 0xFE363C80, 0x0000000F, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0xFFFFFFD8, 0x000000E6, 0x00000000, 0x00000043, 0x00000006, kkj_11_UnkAtan2Func, 0xFE363C80, 0xFFFFFFD8, 0x000000E6, 0xFFFFFFD8, 0x00000050, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFF, 0xFE363C80, 0x0000000F, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0xFFFFFFD8, 0x00000050, 0x00000000, 0x00000043, 0x00000006, kkj_11_UnkAtan2Func, 0xFE363C80, 0xFFFFFFD8, 0x00000050, 0xFFFFFF06, 0x00000050, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFF, 0xFE363C80, 0x0000000F, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0xFFFFFF06, 0x00000050, 0x00000000, 0x00000043, 0x00000006, kkj_11_UnkAtan2Func, 0xFE363C80, 0xFFFFFF06, 0x00000050, 0xFFFFFF06, 0x000000B4, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFF, 0xFE363C80, 0x0000000F, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0xFFFFFF06, 0x000000B4, 0x00000000, 0x00000043, 0x00000006, kkj_11_UnkAtan2Func, 0xFE363C80, 0xFFFFFF06, 0x000000B4, 0xFFFFFF7E, 0x000000B4, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFF, 0xFE363C80, 0x0000000F, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802435D4_AD1714 -.word 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000008, kkj_11_UnkModelMatrixFunc2, 0xFE363C80, 0x00000064, 0x0000005A, 0x00000000, 0x00000028, 0x00000081, 0x00000002, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000043, 0x00000003, BindNpcAI, 0xFFFFFFFF, D_80242E9C_AD0FDC, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000003, SetNpcSpeed, 0xFFFFFFFF, 0xF24A8280, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0x00000082, 0x000000B4, 0x00000000, 0x00000043, 0x00000006, kkj_11_UnkAtan2Func, 0xFE363C80, 0x00000082, 0x000000B4, 0x000000FA, 0x000000B4, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFF, 0xFE363C80, 0x0000000F, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0x000000FA, 0x000000B4, 0x00000000, 0x00000043, 0x00000006, kkj_11_UnkAtan2Func, 0xFE363C80, 0x000000FA, 0x000000B4, 0x000000FA, 0x00000050, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFF, 0xFE363C80, 0x0000000F, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0x000000FA, 0x00000050, 0x00000000, 0x00000043, 0x00000006, kkj_11_UnkAtan2Func, 0xFE363C80, 0x000000FA, 0x00000050, 0x00000028, 0x00000050, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFF, 0xFE363C80, 0x0000000F, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0x00000028, 0x00000050, 0x00000000, 0x00000043, 0x00000006, kkj_11_UnkAtan2Func, 0xFE363C80, 0x00000028, 0x00000050, 0x00000028, 0x000000E6, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFF, 0xFE363C80, 0x0000000F, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0x00000028, 0x000000E6, 0x00000000, 0x00000043, 0x00000006, kkj_11_UnkAtan2Func, 0xFE363C80, 0x00000028, 0x000000E6, 0x00000082, 0x000000E6, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFF, 0xFE363C80, 0x0000000F, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0x00000082, 0x000000E6, 0x00000000, 0x00000043, 0x00000006, kkj_11_UnkAtan2Func, 0xFE363C80, 0x00000082, 0x000000E6, 0x00000082, 0x000000B4, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFF, 0xFE363C80, 0x0000000F, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802438C0_AD1A00 -.word 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, AwaitPlayerApproach, 0xFE363C80, 0xFE363C82, 0x00000032, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C83, 0xFE363C82, 0x0000000A, 0x00000002, 0xFE363C81, 0xFE363C83, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x0000004D, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000001, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFFFFFFFF, 0x00000262, 0x00000000, 0x00000043, 0x0000000A, ShowEmote, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000014, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, NpcFacePlayer, 0xFFFFFFFF, 0x00000005, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, PlayerFaceNpc, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x000C0005, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00580008, 0x00580001, 0x00000000, 0x00140174, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00580008, 0x00580001, 0x00000000, 0x00140175, 0x00000043, 0x00000002, SetPlayerAnimation, 0x000C0017, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000004, GotoMapSpecial, 0x80245F28, 0x0000000B, 0x0000000D, 0x00000008, 0x00000001, 0x00000064, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80243AB4_AD1BF4 -.word 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00580005, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000082, 0x00000000, 0xFFFFFF7E, 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, D_802430A4_AD11E4, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80243B08_AD1C48 -.word 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00580005, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0xFFFFFF06, 0x00000000, 0x000000B4, 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, D_802432E8_AD1428, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80243B5C_AD1C9C -.word 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00580005, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000082, 0x00000000, 0x000000E6, 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, D_802435D4_AD1714, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80243BB0_AD1CF0 -.word 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0x00000064, 0xFFFFFEA2, 0x00000043, 0x00000003, SetNpcYaw, 0xFFFFFFFF, 0x000000DC, 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, D_802438C0_AD1A00, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80243C04_AD1D44 -.word 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000004, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0xFFFFFFD8, 0x00000000, 0xFFFFFF24, 0x00000043, 0x00000003, SetNpcYaw, 0xFFFFFFFF, 0x0000005A, 0x00000012, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0x00000000, 0xFFFFFF10, 0x00000043, 0x00000003, SetNpcYaw, 0xFFFFFFFF, 0x000000DC, 0x00000013, 0x00000000, 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, D_802438C0_AD1A00, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80243CB8_AD1DF8 -.word 0x00580001, 0x00580004, 0x00580006, 0x00580008, 0x00580002, 0x00580005, 0x00580007, 0x00580009, 0xFFFFFFFF - -dlabel D_80243CDC_AD1E1C -.word 0x00000000, D_80242E70_AD0FB0, 0x00000000, 0xC3FA0000, 0x00000000, 0x00000F0D, D_80243AB4_AD1BF4, 0x00000000, 0x00000000, 0x00000000, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00580001, 0x00580004, 0x00580006, 0x00580006, 0x00580001, 0x00580001, 0x00580010, 0x00580010, 0x0058000C, 0x0058000B, 0x0058000D, 0x00580001, 0x00580001, 0x00580001, 0x00580001, 0x00580001, 0x00000000, 0x00000000, D_80243CB8_AD1DF8, 0x00000000, 0x00000001, D_80242E70_AD0FB0, 0x00000000, 0xC3FA0000, 0x00000000, 0x00000F0D, D_80243B08_AD1C48, 0x00000000, 0x00000000, 0x00000000, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00580001, 0x00580004, 0x00580006, 0x00580006, 0x00580001, 0x00580001, 0x00580010, 0x00580010, 0x0058000C, 0x0058000B, 0x0058000D, 0x00580001, 0x00580001, 0x00580001, 0x00580001, 0x00580001, 0x00000000, 0x00000000, D_80243CB8_AD1DF8, 0x00000000, 0x00000002, D_80242E70_AD0FB0, 0x00000000, 0xC3FA0000, 0x00000000, 0x00000F0D, D_80243B5C_AD1C9C, 0x00000000, 0x00000000, 0x00000000, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00580001, 0x00580004, 0x00580006, 0x00580006, 0x00580001, 0x00580001, 0x00580010, 0x00580010, 0x0058000C, 0x0058000B, 0x0058000D, 0x00580001, 0x00580001, 0x00580001, 0x00580001, 0x00580001, 0x00000000, 0x00000000, D_80243CB8_AD1DF8, 0x00000000, 0x00000003, D_80242E70_AD0FB0, 0x00000000, 0xC3FA0000, 0x00000000, 0x00000F0D, D_80243BB0_AD1CF0, 0x00000000, 0x00000000, 0x00000000, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00580001, 0x00580004, 0x00580006, 0x00580006, 0x00580001, 0x00580001, 0x00580010, 0x00580010, 0x0058000C, 0x0058000B, 0x0058000D, 0x00580001, 0x00580001, 0x00580001, 0x00580001, 0x00580001, 0x00000000, 0x00000000, D_80243CB8_AD1DF8, 0x00000000, 0x00000004, D_80242E70_AD0FB0, 0x00000000, 0xC3FA0000, 0x00000000, 0x00000F0D, D_80243C04_AD1D44, 0x00000000, 0x00000000, 0x00000000, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00580001, 0x00580004, 0x00580006, 0x00580006, 0x00580001, 0x00580001, 0x00580010, 0x00580010, 0x0058000C, 0x0058000B, 0x0058000D, 0x00580001, 0x00580001, 0x00580001, 0x00580001, 0x00580001, 0x00000000, 0x00000000, D_80243CB8_AD1DF8, 0x00000000, 0x00000005, D_80243CDC_AD1E1C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kkj/kkj_11/AD27F0.data.s b/ver/us/asm/data/world/area_kkj/kkj_11/AD27F0.data.s deleted file mode 100644 index 472b5c5a4e..0000000000 --- a/ver/us/asm/data/world/area_kkj/kkj_11/AD27F0.data.s +++ /dev/null @@ -1,54 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802446B0_AD27F0 -.word 0x00000000, 0x00280018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00190000 - -dlabel D_802446DC_AD281C -.word 0x00580000, 0x00580001, 0x00580002, 0x00580004, 0x00580005, 0x00580006, 0x00580007, 0x00580008, 0x00580009, 0x00580012, 0x00580014, 0x0058001B, 0xFFFFFFFF - -dlabel D_80244710_AD2850 -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000001, func_80240F44_ACF084, 0x0000004D, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000001, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFFFFFFFF, 0x00000262, 0x00000000, 0x00000043, 0x0000000A, ShowEmote, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000014, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, NpcFacePlayer, 0xFFFFFFFF, 0x00000005, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, PlayerFaceNpc, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x000C0005, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00580001, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00580008, 0x00580001, 0x00000000, 0x00140174, 0x00000043, 0x00000005, dup_kkj_11_UnkGooberFunc, 0xFFFFFFFF, 0xFE363C83, 0xFE363C80, 0xFE363C82, 0x0000000B, 0x00000002, 0xFE363C83, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00580007, 0x00000043, 0x00000003, SetNpcSpeed, 0xFFFFFFFF, 0xF24A8E80, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0xFE363C80, 0xFE363C82, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00580001, 0x00000013, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00580008, 0x00580001, 0x00000000, 0x00140175, 0x00000043, 0x00000002, SetPlayerAnimation, 0x000C0017, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000004, GotoMapSpecial, 0x80245F48, 0x0000000B, 0x0000000D, 0x00000008, 0x00000001, 0x00000064, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80244924_AD2A64 -.word 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x0000000A, 0x00000002, 0xFE363C81, 0xFE363C84, 0x00000043, 0x00000002, kkj_11_GetPeachDisguise, 0xFE363C83, 0x0000000A, 0x00000002, 0xFE363C83, 0x00000000, 0x00000043, 0x00000005, IsPlayerWithin, 0xFE363C80, 0xFE363C82, 0x00000050, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000003, BindNpcAI, 0xFFFFFFFF, D_80244710_AD2850, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80244A18_AD2B58 -.word 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000002, kkj_11_GetPeachDisguise, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, IsPlayerWithin, 0xFFFFFEED, 0xFFFFFFDA, 0x0000001E, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00580001, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x00580001, 0x00000043, 0x00000003, BindNpcAI, 0xFFFFFFFF, D_80244710_AD2850, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80244AE8_AD2C28 -.word 0x00000044, 0x00000001, D_80244924_AD2A64, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000003, SetSelfEnemyFlagBits, 0x08000000, 0x00000001, 0x00000043, 0x00000001, WaitForPlayerInputEnabled, 0x00000056, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, SetPlayerSpeed, 0xF24A8280, 0x00000043, 0x00000004, PlayerMoveTo, 0x00000046, 0xFFFFFEBB, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00580004, 0x00000043, 0x00000003, SetNpcSpeed, 0xFFFFFFFF, 0xF24A8280, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0x00000000, 0xFFFFFEA2, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00580001, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFF, 0x000000DC, 0x00000005, 0x00000043, 0x00000003, SetSelfEnemyFlagBits, 0x08000000, 0x00000000, 0x00000013, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80244C48_AD2D88 -.word 0x00000044, 0x00000001, D_80244924_AD2A64, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000004, 0x00000043, 0x00000003, SetSelfEnemyFlagBits, 0x08000000, 0x00000001, 0x00000043, 0x00000001, WaitForPlayerInputEnabled, 0x00000056, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, SetPlayerSpeed, 0xF24A8280, 0x00000043, 0x00000004, PlayerMoveTo, 0x00000046, 0xFFFFFF38, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00580004, 0x00000043, 0x00000003, SetNpcSpeed, 0xFFFFFFFF, 0xF24A8280, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0x00000000, 0xFFFFFF10, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00580001, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFF, 0x000000DC, 0x00000005, 0x00000043, 0x00000003, SetSelfEnemyFlagBits, 0x08000000, 0x00000000, 0x00000013, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80244DA8_AD2EE8 -.word 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000003, GetSelfVar, 0x00000001, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00580008, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x00580008, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, RandInt, 0x0000003C, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C80, 0x0000001E, 0x00000008, 0x00000001, 0xFE363C80, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00580001, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x00580001, 0x00000008, 0x00000001, 0x0000000A, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80244EB4_AD2FF4 -.word 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00580008, 0x00580001, 0x00000010, 0x00140135, 0x00000043, 0x00000003, GetSelfVar, 0x00000000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00580004, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x0000000D, 0x00000002, 0xFE363C80, 0x00000000, 0x00000027, 0x00000002, 0xFE363C83, 0xFFFFFFCE, 0x00000012, 0x00000000, 0x00000027, 0x00000002, 0xFE363C83, 0x00000032, 0x00000013, 0x00000000, 0x00000043, 0x00000003, SetNpcSpeed, 0xFFFFFFFF, 0xF24A8280, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0xFE363C83, 0xFE363C85, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00580001, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFF, 0x000000DC, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000001, 0x00000047, 0x00000005, D_80241254_ACF394, 0x00000100, 0x00000005, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024502C_AD316C -.word 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00580008, 0x00580001, 0x00000010, 0x00140135, 0x00000043, 0x00000003, GetSelfVar, 0x00000000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00580004, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x0000000D, 0x00000002, 0xFE363C80, 0x00000000, 0x00000027, 0x00000002, 0xFE363C83, 0xFFFFFFCE, 0x00000012, 0x00000000, 0x00000027, 0x00000002, 0xFE363C83, 0x00000032, 0x00000013, 0x00000000, 0x00000043, 0x00000003, SetNpcSpeed, 0xFFFFFFFF, 0xF24A8280, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0xFE363C83, 0xFE363C85, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00580001, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFF, 0x000000DC, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000001, 0x00000047, 0x00000005, D_80241308_ACF448, 0x00000100, 0x0000000A, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802451A4_AD32E4 -.word 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00580001, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x00580001, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, kkj_11_GetPeachDisguise, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000003, NpcFacePlayer, 0xFFFFFFFF, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000003, BindNpcAI, 0xFFFFFFFF, D_80244710_AD2850, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, GetSelfVar, 0x00000000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00580008, 0x00580001, 0x00000010, 0x00140131, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00580008, 0x00580001, 0x00000010, 0x00140132, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802452F4_AD3434 -.word 0x00000043, 0x00000003, EnableNpcAI, 0x00000001, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00580001, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x00580001, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, kkj_11_GetPeachDisguise, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000003, NpcFacePlayer, 0xFFFFFFFF, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000003, BindNpcAI, 0xFFFFFFFF, D_80244710_AD2850, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, GetSelfVar, 0x00000000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00580008, 0x00580001, 0x00000010, 0x00140133, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00580008, 0x00580001, 0x00000010, 0x00140134, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, EnableNpcAI, 0x00000001, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024546C_AD35AC -.word 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0xFFFFFFBA, 0x00000064, 0xFFFFFEA2, 0x00000043, 0x00000003, SetNpcYaw, 0xFFFFFFFF, 0x0000005A, 0x00000012, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0x00000064, 0xFFFFFEA2, 0x00000043, 0x00000003, SetNpcYaw, 0xFFFFFFFF, 0x000000C8, 0x00000013, 0x00000000, 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, D_80244AE8_AD2C28, 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, D_80244EB4_AD2FF4, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80245534_AD3674 -.word 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00580001, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0xFFFFFED9, 0x00000000, 0xFFFFFFE2, 0x00000043, 0x00000004, NpcFaceNpc, 0xFFFFFFFF, 0x00000002, 0x00000000, 0x00000044, 0x00000001, D_80244A18_AD2B58, 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, D_80244DA8_AD2EE8, 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, D_802451A4_AD32E4, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802455C0_AD3700 -.word 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00580001, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0xFFFFFF01, 0x00000000, 0xFFFFFFC9, 0x00000043, 0x00000004, NpcFaceNpc, 0xFFFFFFFF, 0x00000001, 0x00000000, 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, D_802452F4_AD3434, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024562C_AD376C -.word 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000004, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0xFFFFFFD8, 0x00000000, 0xFFFFFF24, 0x00000043, 0x00000003, SetNpcYaw, 0xFFFFFFFF, 0x0000005A, 0x00000012, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0x00000000, 0xFFFFFF10, 0x00000043, 0x00000003, SetNpcYaw, 0xFFFFFFFF, 0x000000DC, 0x00000013, 0x00000000, 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, D_80244C48_AD2D88, 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, D_8024502C_AD316C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802456F4_AD3834 -.word 0x00000000, D_802446B0_AD27F0, 0x00000000, 0xC3FA0000, 0x00000000, 0x00400D0D, D_8024546C_AD35AC, 0x00000000, 0x00000000, 0x00000000, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00580001, 0x00580004, 0x00580006, 0x00580006, 0x00580001, 0x00580001, 0x00580010, 0x00580010, 0x0058000C, 0x0058000B, 0x0058000D, 0x00580001, 0x00580001, 0x00580001, 0x00580001, 0x00580001, 0x00000000, 0x00000000, D_802446DC_AD281C, 0x00000000, 0x00000001, D_802446B0_AD27F0, 0x00000000, 0xC3FA0000, 0x00000000, 0x00400D0D, D_80245534_AD3674, 0x00000000, 0x00000000, 0x00000000, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00580001, 0x00580004, 0x00580006, 0x00580006, 0x00580001, 0x00580001, 0x00580010, 0x00580010, 0x0058000C, 0x0058000B, 0x0058000D, 0x00580001, 0x00580001, 0x00580001, 0x00580001, 0x00580001, 0x00000000, 0x00000000, D_802446DC_AD281C, 0x00000000, 0x00000002, D_802446B0_AD27F0, 0x00000000, 0xC3FA0000, 0x00000000, 0x00400D0D, D_802455C0_AD3700, 0x00000000, 0x00000000, 0x00000000, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00580001, 0x00580004, 0x00580006, 0x00580006, 0x00580001, 0x00580001, 0x00580010, 0x00580010, 0x0058000C, 0x0058000B, 0x0058000D, 0x00580001, 0x00580001, 0x00580001, 0x00580001, 0x00580001, 0x00000000, 0x00000000, D_802446DC_AD281C, 0x00000000, 0x00000003, D_802446B0_AD27F0, 0x00000000, 0xC3FA0000, 0x00000000, 0x00400D0D, D_8024562C_AD376C, 0x00000000, 0x00000000, 0x00000000, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00580001, 0x00580004, 0x00580006, 0x00580006, 0x00580001, 0x00580001, 0x00580010, 0x00580010, 0x0058000C, 0x0058000B, 0x0058000D, 0x00580001, 0x00580001, 0x00580001, 0x00580001, 0x00580001, 0x00000000, 0x00000000, D_802446DC_AD281C, 0x00000000, 0x00000004, D_802456F4_AD3834, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kkj/kkj_12/AD4940.data.s b/ver/us/asm/data/world/area_kkj/kkj_12/AD4940.data.s deleted file mode 100644 index b4a0c1f38e..0000000000 --- a/ver/us/asm/data/world/area_kkj/kkj_12/AD4940.data.s +++ /dev/null @@ -1,60 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802408B0_AD4940 -.word 0xC2960000, 0x00000000, 0x00000000, 0x42B40000, 0x4492E000, 0x42DC0000, 0x00000000, 0x43870000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80240B7C_AD4C0C, D_802408B0_AD4940, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0019000D - -dlabel D_80240910_AD49A0 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000024, 0x00000002, 0xFE363C82, 0x00000005, 0x00000024, 0x00000002, 0xFE363C83, 0x00000007, 0x00000044, 0x00000001, ExitDoubleDoor, 0x00000008, 0x00000001, 0x00000011, 0x00000043, 0x00000003, GotoMap, 0x80241E10, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802409B4_AD4A44 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000024, 0x00000002, 0xFE363C81, 0x00000004, 0x00000024, 0x00000002, 0xFE363C82, 0x00000019, 0x00000024, 0x00000002, 0xFE363C83, 0x00000017, 0x00000044, 0x00000001, ExitDoubleDoor, 0x00000008, 0x00000001, 0x00000011, 0x00000043, 0x00000003, GotoMap, 0x80241E18, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240A58_AD4AE8 -.word 0x00000047, 0x00000005, D_80240910_AD49A0, 0x00000100, 0x00000001, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF5DE0180, 0x0000003A, 0x0000000A, 0x00000002, 0xF8405D77, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000047, 0x00000005, D_802409B4_AD4A44, 0x00000100, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240AD8_AD4B68 -.word 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x00000005, 0x00000024, 0x00000002, 0xFE363C83, 0x00000007, 0x00000046, 0x00000001, EnterDoubleDoor, 0x00000016, 0x00000001, 0x00000001, 0x00000024, 0x00000002, 0xFE363C82, 0x00000019, 0x00000024, 0x00000002, 0xFE363C83, 0x00000017, 0x00000046, 0x00000001, EnterDoubleDoor, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240B7C_AD4C0C -.word 0x00000024, 0x00000002, 0xF5DE0329, 0x0000001A, 0x00000043, 0x00000002, SetSpriteShading, 0x00050002, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x0000000A, 0x00000002, 0xF5DE0180, 0x0000003A, 0x00000043, 0x00000002, func_80240034_AD40C4, 0x00000001, 0x00000043, 0x00000003, MakeNpcs, 0x00000000, D_80241DF0_AD5E80, 0x00000012, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x0000007C, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x0000007D, 0x00000000, 0x00000013, 0x00000000, 0x0000000F, 0x00000002, 0xF5DE0180, 0x0000005E, 0x00000043, 0x00000001, func_80240000_AD4090, 0x00000013, 0x00000000, 0x00000043, 0x00000002, UseDoorSounds, 0x00000002, 0x00000044, 0x00000001, D_80240A58_AD4AE8, 0x00000044, 0x00000001, D_80240AD8_AD4B68, 0x00000008, 0x00000001, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240CC0_AD4D50 -.word 0x00000000, 0x00280018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00190000 - -dlabel D_80240CEC_AD4D7C -.word 0x00000000, 0x00180018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000 - -dlabel D_80240D18_AD4DA8 -.word 0x00580000, 0x00580001, 0x00580002, 0x00580004, 0x00580005, 0x00580006, 0x00580007, 0x00580008, 0x00580009, 0x00580012, 0x00580014, 0x0058001B, 0xFFFFFFFF - -dlabel D_80240D4C_AD4DDC -.word 0x00390000, 0x00390002, 0x00390003, 0x00390004, 0x00390005, 0x00390008, 0x00390007, 0x00390013, 0x00390014, 0xFFFFFFFF - -dlabel D_80240D74_AD4E04 -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, kkj_12_GetPeachDisguise, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000003, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00580009, 0x00580002, 0x00000000, 0x00140143, 0x00000012, 0x00000000, 0x00000043, 0x00000003, GetSelfVar, 0x00000000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00580009, 0x00580002, 0x00000000, 0x00140141, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00580009, 0x00580002, 0x00000000, 0x00140142, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240E90_AD4F20 -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, kkj_12_GetPeachDisguise, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000003, 0x00000043, 0x00000007, AdjustCam, 0x00000000, 0xF24A8E80, 0x00000000, 0xF24FF280, 0xF24AB680, 0xF24A5E80, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00580009, 0x00580002, 0x00000000, 0x00140147, 0x00000056, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xF8405D77, 0x00000001, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000100, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00580005, 0x00000043, 0x00000003, SetNpcSpeed, 0xFFFFFFFF, 0xF24A8280, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0x0000041A, 0x00000000, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00580009, 0x00580002, 0x00000000, 0x00140148, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0x00000384, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFE0C, 0x00000000, 0x00000024, 0x00000002, 0xF8405D77, 0x00000001, 0x00000047, 0x00000005, D_802409B4_AD4A44, 0x00000100, 0x00000004, 0x00000001, 0x00000000, 0x00000043, 0x00000003, ResetCam, 0x00000000, 0xF24A8A80, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405D75, 0x00000000, 0x00000043, 0x00000007, AdjustCam, 0x00000000, 0xF24A8E80, 0x00000000, 0xF24FF280, 0xF24AB680, 0xF24A5E80, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00580009, 0x00580002, 0x00000000, 0x00140144, 0x00000008, 0x00000001, 0x0000000A, 0x00000024, 0x00000002, 0xFE363C80, 0x0000006A, 0x00000043, 0x00000004, ShowGotItem, 0xFE363C80, 0x00000001, 0x00000000, 0x00000043, 0x00000002, AddKeyItem, 0xFE363C80, 0x00000024, 0x00000002, 0xF8405D75, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00580009, 0x00580002, 0x00000000, 0x00140145, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFF, 0x0000010E, 0x00000000, 0x00000043, 0x00000003, ResetCam, 0x00000000, 0xF24A8E80, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00580009, 0x00580002, 0x00000010, 0x00140146, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802411C0_AD5250 -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000001, func_80240714_AD47A4, 0x0000004D, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000001, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFFFFFFFF, 0x00000262, 0x00000000, 0x00000043, 0x0000000A, ShowEmote, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000014, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, NpcFacePlayer, 0xFFFFFFFF, 0x00000005, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, PlayerFaceNpc, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x000C0005, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00580002, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00580009, 0x00580002, 0x00000000, 0x00140174, 0x00000043, 0x00000005, kkj_12_UnkGooberFunc, 0xFFFFFFFF, 0xFE363C83, 0xFE363C80, 0xFE363C82, 0x0000000B, 0x00000002, 0xFE363C83, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00580007, 0x00000043, 0x00000003, SetNpcSpeed, 0xFFFFFFFF, 0xF24A8E80, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0xFE363C80, 0xFE363C82, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00580002, 0x00000013, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00580009, 0x00580002, 0x00000000, 0x00140175, 0x00000043, 0x00000002, SetPlayerAnimation, 0x000C0017, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000004, GotoMapSpecial, 0x80241E38, 0x0000000B, 0x0000000D, 0x00000008, 0x00000001, 0x00000064, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802413D4_AD5464 -.word 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000008, kkj_12_UnkModelMatrixFunc2, 0xFE363C80, 0x00000064, 0x0000005A, 0x00000000, 0x00000028, 0x0000007C, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C82, 0x00000000, 0x00000043, 0x00000002, kkj_12_GetPeachDisguise, 0xFE363C81, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000043, 0x00000003, SetSelfEnemyFlagBits, 0x08000000, 0x00000001, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000003, BindNpcAI, 0xFFFFFFFF, D_802411C0_AD5250, 0x00000024, 0x00000002, 0xFE363C82, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000003, SetSelfEnemyFlagBits, 0x08000000, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000003, SetNpcSpeed, 0xFFFFFFFF, 0xF24A8280, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0x00000384, 0x00000000, 0x00000000, 0x00000043, 0x00000006, kkj_12_UnkAtan2Func, 0xFE363C80, 0x00000384, 0x00000000, 0x00000320, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFF, 0xFE363C80, 0x0000000F, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0x00000320, 0x00000000, 0x00000000, 0x00000043, 0x00000006, kkj_12_UnkAtan2Func, 0xFE363C80, 0x00000320, 0x00000000, 0x00000384, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFF, 0xFE363C80, 0x0000000F, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802415C8_AD5658 -.word 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000008, kkj_12_UnkModelMatrixFunc2, 0xFE363C80, 0x00000064, 0x0000005A, 0x00000000, 0x00000028, 0x0000007D, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C82, 0x00000000, 0x00000043, 0x00000002, kkj_12_GetPeachDisguise, 0xFE363C81, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000043, 0x00000003, SetSelfEnemyFlagBits, 0x08000000, 0x00000001, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000003, BindNpcAI, 0xFFFFFFFF, D_802411C0_AD5250, 0x00000024, 0x00000002, 0xFE363C82, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000003, SetSelfEnemyFlagBits, 0x08000000, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802416EC_AD577C -.word 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00580005, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000320, 0x0000006E, 0x00000000, 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, D_802413D4_AD5464, 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, D_80240D74_AD4E04, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241754_AD57E4 -.word 0x0000000B, 0x00000002, 0xF8405D77, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x0000007D, 0x00000000, 0x00000043, 0x00000001, func_8024089C_AD492C, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00580002, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000492, 0x0000006E, 0x00000000, 0x00000043, 0x00000003, SetNpcYaw, 0xFFFFFFFF, 0x0000010E, 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, D_802415C8_AD5658, 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, D_80240E90_AD4F20, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241820_AD58B0 -.word 0x00000000, D_80240CC0_AD4D50, 0x00000000, 0xC3FA0000, 0x00000000, 0x00000D0D, D_802416EC_AD577C, 0x00000000, 0x00000000, 0x00000000, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00580001, 0x00580004, 0x00580006, 0x00580006, 0x00580001, 0x00580001, 0x00580010, 0x00580010, 0x0058000C, 0x0058000B, 0x0058000D, 0x00580001, 0x00580001, 0x00580001, 0x00580001, 0x00580001, 0x00000000, 0x00000000, D_80240D18_AD4DA8, 0x00000000, 0x00000001, D_80240CC0_AD4D50, 0x00000000, 0xC3FA0000, 0x00000000, 0x00400D0D, D_80241754_AD57E4, 0x00000000, 0x00000000, 0x00000000, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00580001, 0x00580004, 0x00580006, 0x00580006, 0x00580001, 0x00580001, 0x00580010, 0x00580010, 0x0058000C, 0x0058000B, 0x0058000D, 0x00580001, 0x00580001, 0x00580001, 0x00580001, 0x00580001, 0x00000000, 0x00000000, D_80240D18_AD4DA8, 0x00000000, 0x00000002, D_80240CEC_AD4D7C, 0x00000000, 0xC47A0000, 0x00000000, 0x00000D0D, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00390002, 0x00390003, 0x00390004, 0x00390004, 0x00390002, 0x00390002, 0x0039000C, 0x0039000C, 0x00390011, 0x00390012, 0x00390007, 0x00390008, 0x00390001, 0x00390002, 0x00390002, 0x00390002, 0x00000000, 0x00000000, D_80240D4C_AD4DDC, 0x00000000 - -dlabel D_80241DF0_AD5E80 -.word 0x00000003, D_80241820_AD58B0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kkj/kkj_13/AD6630.data.s b/ver/us/asm/data/world/area_kkj/kkj_13/AD6630.data.s deleted file mode 100644 index 63b82f0fc8..0000000000 --- a/ver/us/asm/data/world/area_kkj/kkj_13/AD6630.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240760_AD6630 -.word 0xC2BE0000, 0x00000000, 0x00000000, 0x42B40000, 0x44A1E000, 0x00000000, 0x00000000, 0x43870000, 0x441D8000, 0x00000000, 0x00000000, 0x42B40000, 0x00000000, 0x00000000, 0x00000000, 0x42B40000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80240BF8, D_80240760_AD6630, 0x00000004, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80200000, 0x0019000E, 0x00000014, 0x00000001, 0xF5DE0180, 0x00000016, 0x00000001, 0xFFFFFF80, 0x0000001B, 0x00000001, 0x0000005F, 0x0000000A, 0x00000002, 0xF8405D7A, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000066, 0x00000000, 0x00000008, 0x00000057, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000066, 0x00000000, 0x00000008, 0x00000013, 0x00000000, 0x0000001C, 0x00000000, 0x00000023, 0x00000000, 0x00000043, 0x00000002, UseDoorSounds, 0x00000002, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kkj/kkj_13/AD6780.data.s b/ver/us/asm/data/world/area_kkj/kkj_13/AD6780.data.s deleted file mode 100644 index f65941cf78..0000000000 --- a/ver/us/asm/data/world/area_kkj/kkj_13/AD6780.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802408B0_AD6780 -.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, kkj_13_UpdateTexturePanSmooth, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, kkj_13_UpdateTexturePanStepped, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kkj/kkj_13/AD6820.data.s b/ver/us/asm/data/world/area_kkj/kkj_13/AD6820.data.s deleted file mode 100644 index 75cd5da100..0000000000 --- a/ver/us/asm/data/world/area_kkj/kkj_13/AD6820.data.s +++ /dev/null @@ -1,15 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240950_AD6820 -.word 0xE7000000, 0x00000000, 0xD7000002, 0xFFFFFFFF, 0xE3000A01, 0x00100000, 0xE3000C00, 0x00080000, 0xE3000D01, 0x00000000, 0xE3000F00, 0x00000000, 0xE3001001, 0x00000000, 0xE3001201, 0x00002000, 0xE3001402, 0x00000C00, 0xFA000000, 0x4B1F13FF, 0xFB000000, 0xFF764D00, 0xFC10E5E0, 0x230B1D52, 0xE200001C, 0x0C184B50, 0xD9FDFFFF, 0x00000000, 0xD9FFFFFF, 0x00200404, 0xDF000000, 0x00000000 - -dlabel D_802409D0_AD68A0 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x0000004E, 0x00000024, 0x00000002, 0xFE363C83, 0x00000050, 0x00000044, 0x00000001, ExitDoubleDoor, 0x00000008, 0x00000001, 0x00000011, 0x00000043, 0x00000003, GotoMap, 0x80244F90, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240A74_AD6944 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000024, 0x00000002, 0xFE363C81, 0x00000003, 0x00000024, 0x00000002, 0xFE363C82, 0x00000062, 0x00000024, 0x00000002, 0xFE363C83, 0x00000060, 0x00000044, 0x00000001, ExitDoubleDoor, 0x00000008, 0x00000001, 0x00000011, 0x00000043, 0x00000003, GotoMap, 0x80244F98, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240B18_AD69E8 -.word 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x0000004E, 0x00000024, 0x00000002, 0xFE363C83, 0x00000050, 0x00000046, 0x00000001, EnterDoubleDoor, 0x00000044, 0x00000001, 0x8024126C, 0x00000016, 0x00000001, 0x00000001, 0x00000024, 0x00000002, 0xFE363C82, 0x00000062, 0x00000024, 0x00000002, 0xFE363C83, 0x00000060, 0x00000046, 0x00000001, EnterDoubleDoor, 0x00000016, 0x00000001, 0x00000002, 0x00000044, 0x00000001, 0x8024390C, 0x00000016, 0x00000001, 0x00000003, 0x00000044, 0x00000001, 0x80244CA8, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0329, 0x0000001A, 0x00000043, 0x00000002, SetSpriteShading, 0x00050003, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x0000000A, 0x00000002, 0xF5DE0180, 0xFFFFFF80, 0x00000043, 0x00000003, MakeNpcs, 0x00000000, 0x80243568, 0x00000013, 0x00000000, 0x0000000F, 0x00000002, 0xF5DE0180, 0x0000005A, 0x00000043, 0x00000003, MakeNpcs, 0x00000000, 0x80242744, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000002, 0x00000043, 0x00000003, EnableGroup, 0x0000002A, 0x00000000, 0x00000043, 0x00000003, EnableGroup, 0x00000027, 0x00000000, 0x00000043, 0x00000003, EnableGroup, 0x000000A9, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000003, EnableGroup, 0x0000002D, 0x00000000, 0x00000043, 0x00000003, EnableGroup, 0x00000023, 0x00000000, 0x00000043, 0x00000003, EnableGroup, 0x000000A9, 0x00000000, 0x00000013, 0x00000000, 0x0000000F, 0x00000002, 0xF5DE0180, 0x0000005A, 0x0000000A, 0x00000002, 0xF8405D7A, 0x00000000, 0x00000043, 0x00000003, EnableGroup, 0x000000A9, 0x00000001, 0x00000043, 0x00000005, TranslateGroup, 0x000000A9, 0x0000030C, 0x0000005A, 0x00000000, 0x00000043, 0x00000006, RotateGroup, 0x000000A9, 0xFFFFFFC4, 0x00000000, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, SetTexPanner, 0x0000009A, 0x00000000, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x00000028, 0x00000024, 0x00000002, 0xFE363C84, 0x00000384, 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_802408B0_AD6780, 0x00000057, 0x00000000, 0x00000043, 0x00000004, SetModelCustomGfx, 0x0000009A, 0x00000000, 0xFFFFFFFF, 0x00000043, 0x00000004, SetCustomGfx, 0x00000000, D_80240950_AD6820, 0x00000000, 0x00000044, 0x00000001, 0x802407E0, 0x00000047, 0x00000005, D_802409D0_AD68A0, 0x00000100, 0x00000000, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80240A74_AD6944, 0x00000100, 0x00000003, 0x00000001, 0x00000000, 0x00000044, 0x00000001, D_80240B18_AD69E8, 0x00000008, 0x00000001, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kkj/kkj_13/AD6E60.data.s b/ver/us/asm/data/world/area_kkj/kkj_13/AD6E60.data.s deleted file mode 100644 index 2ee7c295e5..0000000000 --- a/ver/us/asm/data/world/area_kkj/kkj_13/AD6E60.data.s +++ /dev/null @@ -1,60 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240F90_AD6E60 -.word 0x00000000, 0x004B0048, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000 - -dlabel D_80240FBC_AD6E8C -.word 0x00000000, 0x00180018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000 - -dlabel D_80240FE8_AD6EB8 -.word 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000001, 0x80000066, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, func_80240330_AD6200, 0x0000000C, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405D7A, 0x00000001, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000002, StopSound, 0x80000066, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024108C_AD6F5C -.word 0x00000056, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000001, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000004, PlayerMoveTo, 0x0000020D, 0x00000000, 0x00000032, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010006, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x00000258, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x00000258, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8080, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000000, 0xF24A7A80, 0x00000043, 0x00000006, NpcJump0, 0x00000000, 0x000002A3, 0x00000000, 0x00000000, 0x0000000A, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000000, 0x000020A0, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00800012, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00800013, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00800014, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x00000014, 0xF24A8280, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00800002, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0x0000005A, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405D7A, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000005, SetNpcPos, 0x00000000, 0x000002D5, 0x000000D2, 0xFFFFFFE7, 0x00000043, 0x00000005, SetNpcPos, 0x00000001, 0x000002D5, 0x000000D2, 0xFFFFFFE7, 0x00000044, 0x00000001, D_80240FE8_AD6EB8, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000002, 0x000C001C, 0x000C001B, 0x00000000, 0x0013006F, 0x00000043, 0x00000003, EnableNpcShadow, 0x00000000, 0x00000000, 0x00000043, 0x00000004, SetCamType, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x000002D5, 0x00000024, 0x00000002, 0xFE363C81, 0x00000032, 0x00000024, 0x00000002, 0xFE363C82, 0xFFFFFFE7, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8A80, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24AA680, 0xF24A7080, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x00000258, 0x00000043, 0x00000004, SetCamPosA, 0x00000000, 0xF24BCE80, 0xF24A6C80, 0x00000043, 0x00000004, SetCamPosB, 0x00000000, 0xF24DC280, 0xF24E3A80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x0000003C, 0x00000043, 0x00000003, EnableNpcShadow, 0x00000000, 0x00000001, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000000, 0xF24A7A80, 0x00000043, 0x00000006, NpcJump0, 0x00000000, 0x000002D5, 0x00000032, 0xFFFFFFE7, 0x00000014, 0x00000057, 0x00000000, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000001, 0xF24A7A80, 0x00000043, 0x00000006, NpcJump0, 0x00000001, 0x000002D5, 0x00000032, 0xFFFFFFE7, 0x00000014, 0x00000008, 0x00000001, 0x0000000A, 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, 0xF24A8A80, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24ACA80, 0xF24A4A80, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x0000015E, 0x00000043, 0x00000004, SetCamPosA, 0x00000000, 0xF24B9C80, 0xF24A1680, 0x00000043, 0x00000004, SetCamPosB, 0x00000000, 0xF24DC280, 0xF24E3A80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00800019, 0x00800018, 0x00000000, 0x00130070, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000005, GetNpcPos, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24AB680, 0xF24A5E80, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x00000145, 0x00000043, 0x00000004, SetCamPosA, 0x00000000, 0xF24B9A80, 0xF24A7A80, 0x00000043, 0x00000004, SetCamPosB, 0x00000000, 0xF24D2280, 0xF24E3A80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000002, 0x000C001C, 0x000C001B, 0x00000000, 0x00130071, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000004, SetPlayerPos, 0x00000190, 0x00000000, 0xFFFFFFF1, 0x00000043, 0x00000002, PartnerIsFlying, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0x00000172, 0x00000014, 0xFFFFFFF1, 0x00000012, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0x00000172, 0x00000000, 0xFFFFFFF1, 0x00000013, 0x00000000, 0x00000043, 0x00000002, ClearPartnerMoveHistory, 0xFFFFFFFC, 0x00000043, 0x00000003, ResetCam, 0x00000000, 0xF24BE280, 0x00000046, 0x00000001, D_8024108C_AD6F5C, 0x00000008, 0x00000001, 0x00000032, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00800006, 0x00800002, 0x00000000, 0x00130072, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, SetNpcVar, 0x00000000, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x0000000A, 0x00000056, 0x00000000, 0x00000043, 0x00000004, PlayerMoveTo, 0x00000244, 0x00000000, 0x00000019, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00800004, 0x00000043, 0x00000005, NpcMoveTo, 0x00000000, 0x00000276, 0x00000000, 0x00000019, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00800002, 0x00000057, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802418C4_AD7794 -.word 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000003, GetSelfVar, 0x00000000, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000002, StartBossBattle, 0x00000066, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241964_AD7834 -.word 0x44480000, 0x42480000, 0x00000000, 0x44430000, 0x42200000, 0x00000000, 0x442F0000, 0x41A00000, 0x40A00000, 0x441B0000, 0x41700000, 0x41700000, 0x44188000, 0x41C80000, 0x00000000, 0x4414C000, 0x42480000, 0xC1700000 - -dlabel D_802419AC_AD787C -.word 0x4414C000, 0x42480000, 0xC1700000, 0x4414C000, 0x42340000, 0xC3160000, 0x4414C000, 0x420C0000, 0xC32A0000, 0x4414C000, 0x42200000, 0xC33E0000 - -dlabel D_802419DC_AD78AC -.word 0x4414C000, 0x42200000, 0xC33E0000, 0x4414C000, 0x43110000, 0xC3390000, 0x4414C000, 0x437A0000, 0xC3340000 - -dlabel D_80241A00_AD78D0 -.word 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, GetNextPathPos, 0x00000043, 0x00000005, SetNpcPos, 0x00000000, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000005, SetNpcPos, 0x00000001, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C81, 0x0000001C, 0x00000027, 0x00000002, 0xFE363C82, 0x00000028, 0x00000027, 0x00000002, 0xFE363C83, 0xFFFFFFFD, 0x00000043, 0x00000005, SetNpcPos, 0x00000002, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241AE0_AD79B0 -.word 0x00000043, 0x00000005, SetNpcPos, 0x00000000, 0x00000320, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetNpcYaw, 0x00000000, 0x0000010E, 0x00000043, 0x00000005, SetNpcPos, 0x00000001, 0x00000320, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetNpcYaw, 0x00000001, 0x0000010E, 0x00000043, 0x00000005, SetNpcPos, 0x00000002, 0x0000033C, 0x0000005A, 0xFFFFFFFD, 0x00000044, 0x00000001, D_80240FE8_AD6EB8, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, SetPlayerAnimation, 0x0001002B, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000003, InterpPlayerYaw, 0x00000000, 0x00000001, 0x00000057, 0x00000000, 0x00000043, 0x00000005, LoadPath, 0x00000019, D_80241964_AD7834, 0x00000006, 0x00000000, 0x00000046, 0x00000001, D_80241A00_AD78D0, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x0080001B, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000005, LoadPath, 0x00000019, D_802419AC_AD787C, 0x00000004, 0x00000000, 0x00000046, 0x00000001, D_80241A00_AD78D0, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00800018, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000005, LoadPath, 0x00000019, D_802419DC_AD78AC, 0x00000003, 0x00000000, 0x00000044, 0x00000001, D_80241A00_AD78D0, 0x00000008, 0x00000001, 0x0000000A, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241C98_AD7B68 -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000001, 0x00000043, 0x00000003, EnableGroup, 0x000000A9, 0x00000000, 0x00000043, 0x00000004, SetPlayerPos, 0x0000020D, 0x00000000, 0x00000000, 0x00000043, 0x00000002, PartnerIsFlying, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x0000000A, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0x000001EA, 0xFE363C81, 0x00000000, 0x00000043, 0x00000003, SetNpcYaw, 0xFFFFFFFC, 0x0000005A, 0x00000043, 0x00000005, SetNpcPos, 0x00000000, 0x000002A3, 0x00000000, 0x00000000, 0x00000043, 0x00000007, AdjustCam, 0x00000000, 0xF24BE280, 0x0000004B, 0x000001C2, 0xF24ABE80, 0xF24A5E80, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x0080000F, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00800002, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00800006, 0x00800002, 0x00000000, 0x00130078, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000000, 0x0000005A, 0x00000001, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00800004, 0x00000043, 0x00000005, NpcMoveTo, 0x00000000, 0x00000320, 0x00000000, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00800018, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x000C001E, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000002, 0x000C001C, 0x000C001B, 0x00000000, 0x00130079, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000004, PlayerMoveTo, 0x00000244, 0x00000000, 0x0000000A, 0x00000046, 0x00000001, D_80241AE0_AD79B0, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00800006, 0x00800002, 0x00000000, 0x0013007A, 0x00000043, 0x00000003, ResetCam, 0x00000000, 0xF24A7E80, 0x00000024, 0x00000002, 0xF8405D7A, 0x00000001, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241F4C_AD7E1C -.word 0x00000043, 0x00000002, GetBattleOutcome, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000003, SetEncounterStatusFlags, 0x00000002, 0x00000001, 0x00000044, 0x00000001, D_80241C98_AD7B68, 0x00000016, 0x00000001, 0x00000001, 0x00000016, 0x00000001, 0x00000002, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241FC4_AD7E94 -.word 0x00000043, 0x00000005, SetNpcPos, 0x00000000, 0x00000000, 0xFFFFFC18, 0x00000000, 0x0000000A, 0x00000002, 0xF8405D7A, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, D_802418C4_AD7794, 0x00000043, 0x00000003, BindNpcDefeat, 0xFFFFFFFF, D_80241F4C_AD7E1C, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00800018, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024204C_AD7F1C -.word 0x00000043, 0x00000003, EnableNpcShadow, 0x00000001, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000001, 0x00000000, 0xFFFFFC18, 0x00000000, 0x0000000A, 0x00000002, 0xF8405D7A, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00800021, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802420C0_AD7F90 -.word 0x00000043, 0x00000005, SetNpcPos, 0x00000002, 0x00000000, 0xFFFFFC18, 0x00000000, 0x0000000A, 0x00000002, 0xF8405D7A, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000002, 0x00000307, 0x0000005A, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x000C001C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024213C_AD800C -.word 0x00800000, 0x00800002, 0x00800004, 0x00800005, 0x00800006, 0x00800012, 0x00800013, 0x00800014, 0x00800018, 0x0080000F, 0x00800019, 0x0080001B, 0x00800021, 0xFFFFFFFF - -dlabel D_80242174_AD8044 -.word 0x00000000, D_80240F90_AD6E60, 0x00000000, 0xC3FA0000, 0x00000000, 0x00840F05, D_80241FC4_AD7E94, 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, 0x00800002, 0x00800002, 0x00800002, 0x00800002, 0x00800002, 0x00800002, 0x00800002, 0x00800002, 0x00800002, 0x00800002, 0x00800002, 0x00800002, 0x00800002, 0x00800002, 0x00800002, 0x00800002, 0x00000000, 0x00000000, D_8024213C_AD800C, 0x00000000 - -dlabel D_80242364_AD8234 -.word 0x00000001, D_80240FBC_AD6E8C, 0x00000000, 0xC3FA0000, 0x00000000, 0x00840F05, D_8024204C_AD7F1C, 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, 0x00800002, 0x00800002, 0x00800002, 0x00800002, 0x00800002, 0x00800002, 0x00800002, 0x00800002, 0x00800002, 0x00800002, 0x00800002, 0x00800002, 0x00800002, 0x00800002, 0x00800002, 0x00800002, 0x00000000, 0x00000000, D_8024213C_AD800C, 0x00000000 - -dlabel D_80242554_AD8424 -.word 0x00000002, D_80240FBC_AD6E8C, 0x44278000, 0x00000000, 0xC1400000, 0x00860F05, D_802420C0_AD7F90, 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, 0x000A0000, 0x000A0000, 0x000A0000, 0x000A0000, 0x000A0000, 0x000A0000, 0x000A0000, 0x000A0000, 0x000A0000, 0x000A0000, 0x000A0000, 0x000A0000, 0x000A0000, 0x000A0000, 0x000A0000, 0x000A0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, D_80242174_AD8044, 0x23020000, 0x00000001, D_80242364_AD8234, 0x23020000, 0x00000001, D_80242554_AD8424, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kkj/kkj_13/AD8650.data.s b/ver/us/asm/data/world/area_kkj/kkj_13/AD8650.data.s deleted file mode 100644 index 9a7865562c..0000000000 --- a/ver/us/asm/data/world/area_kkj/kkj_13/AD8650.data.s +++ /dev/null @@ -1,42 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80242780_AD8650 -.word 0x00000000, 0x004B0048, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000 - -dlabel D_802427AC_AD867C -.word 0x00000000, 0x00180018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000 - -dlabel D_802427D8_AD86A8 -.word 0x00000000, 0x0028001E, 0x00000000, 0x00000000, 0x00000000, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x001A0000 - -dlabel D_80242804_AD86D4 -.word 0x00000000, 0x00280018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00190000 - -dlabel D_80242830_AD8700 -.word 0x00000000, 0x002E0024, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000 - -dlabel D_8024285C_AD872C -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000001, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, GetSelfVar, 0x00000000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000001, 0x00020000, 0x00000043, 0x00000002, StartBossBattle, 0x00000066, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802428F8_AD87C8 -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024291C_AD87EC -.word 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, D_8024285C_AD872C, 0x00000043, 0x00000003, BindNpcDefeat, 0xFFFFFFFF, D_802428F8_AD87C8, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242954_AD8824 -.word 0x00800000, 0x00800002, 0x00800003, 0x00800004, 0x00800005, 0x00800006, 0x00800007, 0x00800009, 0x0080000A, 0x0080000E, 0x00800010, 0x0080000B, 0x00800014, 0x00800017, 0x00800018, 0x00800021, 0xFFFFFFFF - -dlabel D_80242998_AD8868 -.word 0x00600001, 0x00600002, 0x00600004, 0x00600009, 0x0060000A, 0x0060000B, 0xFFFFFFFF - -dlabel D_802429B4_AD8884 -.word 0x00580000, 0x00580001, 0x00580004, 0x00580006, 0xFFFFFFFF - -dlabel D_802429C8_AD8898 -.word 0x00000000, D_80242780_AD8650, 0x00000000, 0xC3FA0000, 0x00000000, 0x00840F05, D_8024291C_AD87EC, 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, 0x00800002, 0x00800002, 0x00800002, 0x00800002, 0x00800002, 0x00800002, 0x00800002, 0x00800002, 0x00800002, 0x00800002, 0x00800002, 0x00800002, 0x00800002, 0x00800002, 0x00800002, 0x00800002, 0x00000000, 0x00000000, D_80242954_AD8824, 0x00000000 - -dlabel D_80242BB8_AD8A88 -.word 0x00000001, D_802427AC_AD867C, 0x00000000, 0xC3FA0000, 0x00000000, 0x00000F0D, 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, 0x00800002, 0x00800002, 0x00800002, 0x00800002, 0x00800002, 0x00800002, 0x00800002, 0x00800002, 0x00800002, 0x00800002, 0x00800002, 0x00800002, 0x00800002, 0x00800002, 0x00800002, 0x00800002, 0x00000000, 0x00000000, D_80242954_AD8824, 0x00000000, 0x00000002, D_80242804_AD86D4, 0x00000000, 0xC3FA0000, 0x00000000, 0x00000F0D, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00580001, 0x00580004, 0x00580006, 0x00580006, 0x00580001, 0x00580001, 0x00580010, 0x00580010, 0x0058000C, 0x0058000B, 0x0058000D, 0x00580001, 0x00580001, 0x00580001, 0x00580001, 0x00580001, 0x00000000, 0x00000000, D_802429B4_AD8884, 0x00000000, 0x00000003, D_80242804_AD86D4, 0x00000000, 0xC3FA0000, 0x00000000, 0x00000F0D, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00580001, 0x00580004, 0x00580006, 0x00580006, 0x00580001, 0x00580001, 0x00580010, 0x00580010, 0x0058000C, 0x0058000B, 0x0058000D, 0x00580001, 0x00580001, 0x00580001, 0x00580001, 0x00580001, 0x00000000, 0x00000000, D_802429B4_AD8884, 0x00000000, 0x00000004, D_802427D8_AD86A8, 0x00000000, 0xC3FA0000, 0x00000000, 0x00000F0D, 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, 0x00600001, 0x00600002, 0x00600003, 0x00600003, 0x00600001, 0x00600001, 0x00600000, 0x00600000, 0x00600003, 0x00600003, 0x00600003, 0x00600003, 0x00600003, 0x00600003, 0x00600003, 0x00600003, 0x00000000, 0x00000000, D_80242998_AD8868, 0x00000000, 0x00000005, D_80242830_AD8700, 0x44278000, 0x00000000, 0xC1400000, 0x00020F0D, 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, 0x000A0000, 0x000A0000, 0x000A0000, 0x000A0000, 0x000A0000, 0x000A0000, 0x000A0000, 0x000A0000, 0x000A0000, 0x000A0000, 0x000A0000, 0x000A0000, 0x000A0000, 0x000A0000, 0x000A0000, 0x000A0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, D_802429C8_AD8898, 0x23010000, 0x00000005, D_80242BB8_AD8A88, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kkj/kkj_13/AD9460.data.s b/ver/us/asm/data/world/area_kkj/kkj_13/AD9460.data.s deleted file mode 100644 index c479fe6e33..0000000000 --- a/ver/us/asm/data/world/area_kkj/kkj_13/AD9460.data.s +++ /dev/null @@ -1,24 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80243590_AD9460 -.word 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000001, 0x80000066, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, func_80240390_AD6260, 0x0000000C, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000002, StopSound, 0x80000066, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80243614_AD94E4 -.word 0x00050000, 0x0005005A, 0x000500B4, 0x0005010E, 0x000A001E, 0x000A005A, 0x000A0096, 0x000A00D2, 0x000A010E, 0x000A014A, 0x00140000, 0x0014003C, 0x00140078, 0x001400B4, 0x001400F0, 0x0014012C, 0x001E000F, 0x001E002D, 0x001E004B, 0x001E0069, 0x001E0087, 0x001E00A5, 0x001E00C3, 0x001E00E1, 0x001E00FF, 0x001E011D, 0x001E013B, 0x001E0159 - -dlabel D_80243684_AD9554 -.word 0x43E10000, 0x43160000, 0xC3960000, 0x44098000, 0x42D20000, 0xC3340000, 0x44228000, 0x42700000, 0xC2960000, 0x44548000, 0x42B40000, 0x00000000 - -dlabel D_802436B4_AD9584 -.word 0x44250000, 0x00000000, 0x41700000, 0x441E8000, 0x42700000, 0xC2A60000, 0x44180000, 0x42A00000, 0xC3160000, 0x44118000, 0x42700000, 0xC3690000, 0x440B0000, 0x00000000, 0xC39D8000, 0x44048000, 0xC2700000, 0xC3C70000 - -dlabel D_802436FC_AD95CC -.word 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x000002D0, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x000002D0, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xFE363C80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80243784_AD9654 -.word 0x00000043, 0x00000005, GetNpcPos, 0x00000005, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF24F2A80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024383C_AD970C -.word 0x00000043, 0x00000005, GetNpcPos, 0x00000000, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF24F2A80, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24ABE80, 0xF24A4E80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xFE363C80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x0000006B, 0x00000000, 0x00000008, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000005, SetNpcPos, 0x00000005, 0x000002A8, 0x00000000, 0xFFFFFFF1, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x00000258, 0x00000000, 0xFFFFFFF1, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x00000258, 0x00000000, 0xFFFFFFF1, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF24F2A80, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24ABE80, 0xF24A5280, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000056, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x80000056, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x0000001E, 0xF24A7E80, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x0000001E, 0xF24A7C80, 0x00000043, 0x00000002, PlaySound, 0x00000433, 0x00000043, 0x00000002, func_802D62E4, 0x00000033, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, SetPlayerJumpscale, 0x00000000, 0x00000005, 0x00000001, 0x00000002, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000010E, 0x00000000, 0x00000043, 0x00000005, PlayerJump1, 0x00000226, 0x00000000, 0x00000000, 0x00000014, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000005A, 0x00000000, 0x00000043, 0x00000005, PlayerJump1, 0x00000276, 0x00000000, 0x00000000, 0x00000014, 0x00000006, 0x00000000, 0x00000043, 0x00000004, PlayerMoveTo, 0x00000226, 0x00000000, 0x0000001E, 0x00000043, 0x00000004, PlayerMoveTo, 0x0000023F, 0x00000000, 0x0000001E, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000005A, 0x00000007, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000005, 0x00000001, 0x00000002, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060003, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010005, 0x00000008, 0x00000001, 0x0000000F, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000005, 0x000A0004, 0x00000005, 0x00000001, 0x00000002, 0x00000043, 0x00000005, NpcMoveTo, 0x00000005, 0x00000258, 0xFFFFFFFE, 0x00000014, 0x00000043, 0x00000005, NpcMoveTo, 0x00000005, 0x000002A8, 0xFFFFFFFE, 0x00000014, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000005, 0x000A0002, 0x00000043, 0x00000005, NpcMoveTo, 0x00000005, 0x00000258, 0xFFFFFFFE, 0x0000001E, 0x00000043, 0x00000005, NpcMoveTo, 0x00000005, 0x00000271, 0xFFFFFFFE, 0x0000001E, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000005, 0x000A0001, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000005, 0x0000010E, 0x00000007, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x000000A0, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000005, 0x000C0000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000005, 0x000C0026, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000005, 0x000C0001, 0x000C0026, 0x00000000, 0x0000004E, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000005, 0x000C0002, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000005, 0x000A0001, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000005, 0x010A0001, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000005, GetNpcPos, 0x00000005, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, NpcJump0, 0x00000005, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000A, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, InterpPlayerYaw, 0x00000000, 0x00000007, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x00000258, 0x00000000, 0xFFFFFFF1, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x00000258, 0x00000000, 0xFFFFFFF1, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8E80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000005, 0x010A0001, 0x010A0001, 0x00000005, 0x0000004F, 0x00000008, 0x00000001, 0x0000001E, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00800018, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00800021, 0x00000043, 0x00000003, SetNpcYaw, 0x00000000, 0x0000005A, 0x00000043, 0x00000003, SetNpcYaw, 0x00000001, 0x0000005A, 0x00000044, 0x00000001, D_80243590_AD9460, 0x00000043, 0x00000005, LoadPath, 0x00000032, D_80243684_AD9554, 0x00000004, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, GetNextPathPos, 0x00000043, 0x00000005, SetNpcPos, 0x00000000, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000005, SetNpcPos, 0x00000001, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00800002, 0x00000043, 0x00000005, SetNpcPos, 0x00000000, 0x00000334, 0x00000014, 0x00000000, 0x00000043, 0x00000003, SetNpcYaw, 0x00000000, 0x0000010E, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000004, 0x0060000B, 0x00000043, 0x00000003, SetNpcYaw, 0x00000004, 0x0000005A, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, LoadPath, 0x00000032, D_80243684_AD9554, 0x00000004, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, GetNextPathPos, 0x00000043, 0x00000005, SetNpcPos, 0x00000004, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000004, 0x00600001, 0x00000043, 0x00000005, SetNpcPos, 0x00000004, 0x00000398, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetNpcYaw, 0x00000004, 0x0000010E, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000001, func_802403F0_AD62C0, 0x00000043, 0x00000003, EnableGroup, 0x0000002D, 0x00000000, 0x00000043, 0x00000003, EnableGroup, 0x00000023, 0x00000000, 0x00000043, 0x00000003, EnableGroup, 0x0000002A, 0x00000001, 0x00000043, 0x00000003, EnableGroup, 0x00000027, 0x00000001, 0x00000043, 0x00000006, PlaySoundAt, 0x00002097, 0x00000000, 0x00000258, 0x0000003C, 0xFFFFFF6A, 0x00000043, 0x0000000F, PlayEffect, 0x00000011, 0x00000000, 0x00000258, 0x0000003C, 0xFFFFFF6A, 0x00000078, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000001, func_802404E0_AD63B0, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000001, func_8024046C_AD633C, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x0000000A, 0xF24A8280, 0x00000057, 0x00000000, 0x00000005, 0x00000001, 0x00000046, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000000, 0x00000000, 0x00000043, 0x00000004, NpcFaceNpc, 0x00000005, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000005, 0x000A0001, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000005, SetNpcPos, 0x00000001, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000066, 0x00000000, 0x00000008, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000000, 0xF24A7A80, 0x00000043, 0x00000006, NpcJump0, 0x00000000, 0x0000032A, 0x00000000, 0x00000000, 0x00000005, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000000, 0x000020A0, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00800014, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x00000014, 0xF24A8280, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00800002, 0x00000057, 0x00000000, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x000002E4, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8280, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000008, 0x00000001, 0x0000001E, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000004, 0x00600002, 0x00000043, 0x00000005, NpcMoveTo, 0x00000004, 0x00000370, 0x00000000, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000004, 0x00600001, 0x00000057, 0x00000000, 0x00000043, 0x00000007, SpeakToNpc, 0x00000000, 0x00800006, 0x00800002, 0x00000000, 0x00000005, 0x00000050, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x00000271, 0x00000000, 0xFFFFFFF1, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF24F2A80, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24ABE80, 0xF24A4E80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000007, SpeakToNpc, 0x00000005, 0x000C0007, 0x000C0008, 0x00000000, 0x00000000, 0x00000051, 0x00000024, 0x00000002, 0xFE363C80, 0xF24A7E80, 0x00000046, 0x00000001, D_8024383C_AD970C, 0x00000043, 0x00000007, SpeakToNpc, 0x00000000, 0x00800007, 0x00800002, 0x00000000, 0x00000005, 0x00000052, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00800004, 0x00000043, 0x00000005, NpcMoveTo, 0x00000000, 0x00000302, 0x00000000, 0x0000001E, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00800002, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000004, 0x00600002, 0x00000043, 0x00000005, NpcMoveTo, 0x00000004, 0x00000348, 0x00000000, 0x0000001E, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000004, 0x00600001, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000024, 0x00000002, 0xFE363C80, 0xF24BE280, 0x00000046, 0x00000001, D_802436FC_AD95CC, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000004, PlayerMoveTo, 0x00000294, 0x00000000, 0x0000000F, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010006, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00800006, 0x00800002, 0x00000000, 0x00000053, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000005, 0x000C0013, 0x000C0012, 0x00000005, 0x00000054, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x0080000E, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x0080000E, 0x0080000E, 0x00000000, 0x00000055, 0x00000024, 0x00000002, 0xFE363C80, 0xF24BE280, 0x00000046, 0x00000001, D_8024383C_AD970C, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x0080000A, 0x0080000A, 0x00000000, 0x00000056, 0x00000024, 0x00000002, 0xFE363C80, 0xF24A8E80, 0x00000046, 0x00000001, D_802436FC_AD95CC, 0x00000043, 0x00000004, SetNpcVar, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000004, PlayerMoveTo, 0x000002B7, 0x00000000, 0x0000000A, 0x00000043, 0x00000002, SetPlayerJumpscale, 0xF24A7D80, 0x00000043, 0x00000005, PlayerJump, 0x000002D0, 0x00000050, 0x00000000, 0x00000014, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000004, GetNpcVar, 0x00000000, 0x00000000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000002, SetPlayerActionState, 0x0000000A, 0x00000043, 0x00000004, SetPlayerPos, 0x00000294, 0x00000000, 0x0000000F, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010018, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000005, 0x000C0006, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x0080000E, 0x00000046, 0x00000001, D_80243784_AD9654, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000005, 0x000C0006, 0x000C0006, 0x00000005, 0x0000005D, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x00000316, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x00000316, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF24F2A80, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24ABE80, 0xF24A4E80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x0080000E, 0x0080000E, 0x00000005, 0x0000005E, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000004, 0x00600004, 0x00600001, 0x00000005, 0x0000005F, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00800002, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000000, 0x0000005A, 0x00000005, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00800010, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00800003, 0x00000043, 0x00000007, SpeakToNpc, 0x00000000, 0x00800009, 0x00800003, 0x00000000, 0x00000004, 0x00000060, 0x00000008, 0x00000001, 0x0000000A, 0x00000024, 0x00000002, 0xFE363C80, 0xF24BE280, 0x00000046, 0x00000001, D_802436FC_AD95CC, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00800002, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000000, 0x0000010E, 0x0000000A, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00800006, 0x00800002, 0x00000005, 0x00000061, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00800010, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, FadeOutMusic, 0x00000000, 0x000001F4, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000000, 0x00002121, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000013, 0x00000000, 0x0000030C, 0x0000005F, 0x0000001B, 0x00000001, 0x0000001E, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000028, 0x00000056, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x0000000A, 0xF24A8A80, 0x00000057, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtPlayer, 0x00002127, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C82, 0x00000005, 0x00000043, 0x0000000F, PlayEffect, 0x00000036, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtPlayer, 0x00000390, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010017, 0x00000043, 0x00000005, LoadPath, 0x0000001E, D_802436B4_AD9584, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, GetNextPathPos, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C84, 0x0000002D, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C84, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000003, GotoMap, 0x80244FC0, 0x00000002, 0x00000008, 0x00000001, 0x00000064, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, FadeOutMusic, 0x00000000, 0x000001F4, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000005, 0x010A0001, 0x00000043, 0x00000003, SetNpcYaw, 0x00000005, 0x0000013B, 0x00000043, 0x00000005, SetNpcPos, 0x00000005, 0x00000265, 0x00000000, 0xFFFFFFA6, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x0080000E, 0x00000043, 0x00000005, SetNpcPos, 0x00000000, 0x000002EE, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000004, 0x00600001, 0x00000043, 0x00000005, SetNpcPos, 0x00000004, 0x00000334, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0xF24BE280, 0x00000046, 0x00000001, D_802436FC_AD95CC, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000005, 0xF24A8680, 0x00000043, 0x00000005, NpcMoveTo, 0x00000005, 0x0000023A, 0xFFFFFF7E, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000005, 0x010A0001, 0x010A0001, 0x00000005, 0x00000062, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000004, 0x0000005A, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000004, 0x00600004, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000004, 0x00600001, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x00580006, 0x00000043, 0x00000005, SetNpcPos, 0x00000002, 0x00000384, 0x00000000, 0x0000001E, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000002, 0xF24A8A80, 0x00000043, 0x00000005, NpcMoveTo, 0x00000002, 0x00000294, 0x0000001E, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000003, 0x00580006, 0x00000043, 0x00000005, SetNpcPos, 0x00000003, 0x000003AC, 0x00000000, 0x0000001E, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000003, 0xF24A8A80, 0x00000043, 0x00000005, NpcMoveTo, 0x00000003, 0x000002BC, 0x0000001E, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000004, 0x0000010E, 0x00000000, 0x00000043, 0x00000003, GotoMap, 0x80244FC8, 0x00000005, 0x00000008, 0x00000001, 0x00000064, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kkj/kkj_14/ADB360.data.s b/ver/us/asm/data/world/area_kkj/kkj_14/ADB360.data.s deleted file mode 100644 index e99d8305a6..0000000000 --- a/ver/us/asm/data/world/area_kkj/kkj_14/ADB360.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802404C0_ADB360 -.word 0xC3BB8000, 0x00000000, 0xC1F00000, 0x42B40000, 0x43D98000, 0x41F00000, 0xC2040000, 0x43870000, 0xC2F40000, 0x41200000, 0xC2A40000, 0x43340000, 0xC1A00000, 0x00000000, 0x41F00000, 0x43870000, 0xC30C0000, 0x00000000, 0x00000000, 0x43870000, 0x42200000, 0x00000000, 0x41F00000, 0x43340000, 0xC1A00000, 0x00000000, 0x00000000, 0x43870000, 0x00000000, 0x00000000, 0x41F00000, 0x43340000, 0xC3020000, 0x00000000, 0x00000000, 0x43340000, 0xC2700000, 0x00000000, 0x00000000, 0x43870000, 0x43BE0000, 0x41F00000, 0x41200000, 0x43870000, 0x43160000, 0x00000000, 0xC1F00000, 0x42B40000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80240DA4, D_802404C0_ADB360, 0x0000000C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80200000, 0x0019000F, 0x00000014, 0x00000001, 0xF5DE0180, 0x0000001D, 0x00000001, 0xFFFFFF97, 0x0000001D, 0x00000001, 0xFFFFFFB4, 0x0000001D, 0x00000001, 0xFFFFFFF2, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000073, 0x00000000, 0x00000008, 0x00000020, 0x00000000, 0x0000001D, 0x00000001, 0xFFFFFFCA, 0x0000001D, 0x00000001, 0x00000006, 0x0000001D, 0x00000001, 0x00000026, 0x0000001D, 0x00000001, 0x0000003A, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000074, 0x00000000, 0x00000008, 0x00000020, 0x00000000, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, kkj_14_UpdateTexturePanSmooth, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, kkj_14_UpdateTexturePanStepped, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kkj/kkj_14/ADB5C0.data.s b/ver/us/asm/data/world/area_kkj/kkj_14/ADB5C0.data.s deleted file mode 100644 index 51c97d86c2..0000000000 --- a/ver/us/asm/data/world/area_kkj/kkj_14/ADB5C0.data.s +++ /dev/null @@ -1,24 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240720_ADB5C0 -.word 0xE7000000, 0x00000000, 0xD7000002, 0xFFFFFFFF, 0xE3000A01, 0x00100000, 0xE3000C00, 0x00080000, 0xE3000D01, 0x00000000, 0xE3000F00, 0x00000000, 0xE3001001, 0x00000000, 0xE3001201, 0x00002000, 0xE3001402, 0x00000C00, 0xFA000000, 0x4B1F13FF, 0xFB000000, 0xFF764D00, 0xFC10E5E0, 0x230B1D52, 0xE200001C, 0x0C184B50, 0xD9FDFFFF, 0x00000000, 0xD9FFFFFF, 0x00200404, 0xDF000000, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0xF5DE01CE, 0x00000043, 0x00000001, func_8024035C_ADB1FC, 0x00000043, 0x00000002, PlaySound, 0x000000DC, 0x00000043, 0x00000004, GotoMapSpecial, 0x8024A6B8, 0x00000004, 0x0000000C, 0x00000008, 0x00000001, 0x00000064 - -dlabel D_802407F0_ADB690 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xF9718893, 0x00000001, 0x00000043, 0x00000002, UseDoorSounds, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000002, 0x00000024, 0x00000002, 0xFE363C82, 0x00000002, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFFFF, 0x00000044, 0x00000001, ExitSingleDoor, 0x00000008, 0x00000001, 0x00000011, 0x0000000A, 0x00000002, 0xF5DE0180, 0xFFFFFF80, 0x00000043, 0x00000003, GotoMap, 0x8024A6C8, 0x00000004, 0x00000012, 0x00000000, 0x00000043, 0x00000003, GotoMap, 0x8024A6C0, 0x00000004, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802408E8_ADB788 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xF9718893, 0x00000000, 0x00000043, 0x00000002, UseDoorSounds, 0x00000005, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000024, 0x00000002, 0xFE363C81, 0x00000007, 0x00000024, 0x00000002, 0xFE363C82, 0x0000007D, 0x00000024, 0x00000002, 0xFE363C83, 0x00000080, 0x00000024, 0x00000002, 0xFE363C84, 0x0000007C, 0x00000024, 0x00000002, 0xFE363C85, 0x0000007F, 0x00000044, 0x00000001, 0x80285E9C, 0x00000008, 0x00000001, 0x00000011, 0x00000043, 0x00000003, GotoMap, 0x8024A6D0, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802409CC_ADB86C -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000024, 0x00000002, 0xF9718893, 0x00000000, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000002, 0x00000044, 0x00000001, ExitWalk, 0x0000000A, 0x00000002, 0xF8405D61, 0x00000000, 0x00000043, 0x00000003, GotoMap, 0x8024A6E0, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000003, GotoMap, 0x8024A6D8, 0x00000001, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240A6C_ADB90C -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D0163, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240AB4_ADB954 -.word 0x0000000A, 0x00000002, 0xF5DE0180, 0xFFFFFF80, 0x00000047, 0x00000005, D_80240A6C_ADB90C, 0x00000100, 0x00000007, 0x00000001, 0x00000000, 0x00000012, 0x00000000, 0x00000047, 0x00000005, D_802408E8_ADB788, 0x00000100, 0x00000007, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_802409CC_ADB86C, 0x00080000, 0x0000001A, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000047, 0x00000005, D_802407F0_ADB690, 0x00000100, 0x00000002, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240B54_ADB9F4 -.word 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000002, UseDoorSounds, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x00000002, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFFFF, 0x00000046, 0x00000001, EnterSingleDoor, 0x00000044, 0x00000001, D_80240AB4_ADB954, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000002, UseDoorSounds, 0x00000005, 0x00000024, 0x00000002, 0xFE363C82, 0x0000007D, 0x00000024, 0x00000002, 0xFE363C83, 0x00000080, 0x00000024, 0x00000002, 0xFE363C84, 0x0000007C, 0x00000024, 0x00000002, 0xFE363C85, 0x0000007F, 0x00000046, 0x00000001, 0x80285EC4, 0x00000044, 0x00000001, D_80240AB4_ADB954, 0x00000016, 0x00000001, 0x00000002, 0x00000024, 0x00000002, 0xFE363C80, D_80240AB4_ADB954, 0x00000044, 0x00000001, EnterWalk, 0x00000016, 0x00000001, 0x00000003, 0x00000044, 0x00000001, 0x80244E54, 0x00000016, 0x00000001, 0x00000004, 0x00000044, 0x00000001, 0x80246C90, 0x00000044, 0x00000001, D_80240AB4_ADB954, 0x00000016, 0x00000001, 0x00000005, 0x00000044, 0x00000001, 0x8024739C, 0x00000044, 0x00000001, D_80240AB4_ADB954, 0x00000016, 0x00000001, 0x00000006, 0x00000044, 0x00000001, 0x80247F7C, 0x00000044, 0x00000001, D_80240AB4_ADB954, 0x00000016, 0x00000001, 0x00000007, 0x00000044, 0x00000001, 0x802482C0, 0x00000044, 0x00000001, D_80240AB4_ADB954, 0x00000016, 0x00000001, 0x00000008, 0x00000044, 0x00000001, 0x80248430, 0x00000044, 0x00000001, D_80240AB4_ADB954, 0x00000016, 0x00000001, 0x00000009, 0x00000044, 0x00000001, 0x80248770, 0x00000044, 0x00000001, D_80240AB4_ADB954, 0x00000016, 0x00000001, 0x0000000A, 0x00000044, 0x00000001, 0x802497B4, 0x00000016, 0x00000001, 0x0000000B, 0x00000044, 0x00000001, 0x80242A60, 0x00000044, 0x00000001, D_80240AB4_ADB954, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0329, 0x0000001A, 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, 0x00000002, GetEntryID, 0xFE363C80, 0x0000000F, 0x00000002, 0xFE363C80, 0x00000003, 0x0000000B, 0x00000002, 0xFE363C80, 0x0000000B, 0x00000024, 0x00000002, 0xF8405D60, 0x00000000, 0x00000024, 0x00000002, 0xF8405D5F, 0x00000000, 0x00000013, 0x00000000, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000003, 0x00000024, 0x00000002, 0xF5DE0180, 0xFFFFFF97, 0x00000024, 0x00000002, 0xF5DE01CF, 0x00000000, 0x00000024, 0x00000002, 0xF8405D61, 0x00000000, 0x00000043, 0x00000003, MakeNpcs, 0x00000000, 0x80243E3C, 0x00000016, 0x00000001, 0x00000004, 0x00000024, 0x00000002, 0xF5DE0180, 0xFFFFFFB4, 0x00000024, 0x00000002, 0xF5DE01CF, 0x00000000, 0x00000024, 0x00000002, 0xF8405D61, 0x00000000, 0x00000016, 0x00000001, 0x00000005, 0x00000024, 0x00000002, 0xF5DE0180, 0xFFFFFFCA, 0x00000024, 0x00000002, 0xF5DE01CF, 0x00000000, 0x00000024, 0x00000002, 0xF8405D61, 0x00000000, 0x00000024, 0x00000002, 0xF9718886, 0x00000000, 0x00000043, 0x00000003, MakeNpcs, 0x00000000, 0x802442D0, 0x00000016, 0x00000001, 0x00000006, 0x00000024, 0x00000002, 0xF5DE0180, 0xFFFFFFF2, 0x00000024, 0x00000002, 0xF5DE01CF, 0x00000000, 0x00000024, 0x00000002, 0xF8405D61, 0x00000000, 0x00000016, 0x00000001, 0x00000007, 0x00000024, 0x00000002, 0xF5DE0180, 0x00000006, 0x00000024, 0x00000002, 0xF5DE01CF, 0x00000000, 0x00000024, 0x00000002, 0xF8405D61, 0x00000001, 0x00000016, 0x00000001, 0x00000008, 0x00000024, 0x00000002, 0xF5DE0180, 0x00000026, 0x00000024, 0x00000002, 0xF5DE01CF, 0x00000000, 0x00000024, 0x00000002, 0xF8405D61, 0x00000001, 0x00000016, 0x00000001, 0x00000009, 0x00000043, 0x00000001, func_80240384_ADB224, 0x00000024, 0x00000002, 0xF5DE0180, 0x0000003A, 0x00000024, 0x00000002, 0xF5DE01CF, 0x00000000, 0x00000024, 0x00000002, 0xF8405D61, 0x00000001, 0x00000016, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, MakeNpcs, 0x00000000, 0x80244B94, 0x00000016, 0x00000001, 0x0000000B, 0x00000027, 0x00000002, 0xF5DE01CF, 0x00000001, 0x00000043, 0x00000003, MakeNpcs, 0x00000000, 0x802439B4, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000044, 0x00000001, 0x80242744, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000005, 0x00000044, 0x00000001, 0x802405C0, 0x00000013, 0x00000000, 0x00000044, 0x00000001, D_80240B54_ADB9F4, 0x00000043, 0x00000003, SetTexPanner, 0x00000036, 0x00000000, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x00000028, 0x00000024, 0x00000002, 0xFE363C84, 0x00000384, 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, 0x80240680, 0x00000057, 0x00000000, 0x00000043, 0x00000004, SetModelCustomGfx, 0x00000036, 0x00000000, 0xFFFFFFFF, 0x00000043, 0x00000004, SetCustomGfx, 0x00000000, D_80240720_ADB5C0, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kkj/kkj_14/ADC0F0.data.s b/ver/us/asm/data/world/area_kkj/kkj_14/ADC0F0.data.s deleted file mode 100644 index 9a5fb938cd..0000000000 --- a/ver/us/asm/data/world/area_kkj/kkj_14/ADC0F0.data.s +++ /dev/null @@ -1,42 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80241250_ADC0F0 -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000014, 0x00000001, 0xF5DE0180, 0x00000016, 0x00000001, 0xFFFFFFB4, 0x0000000A, 0x00000002, 0xF8405D60, 0x00000000, 0x0000000A, 0x00000002, 0xF9718894, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x000C0000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, SetPlayerAnimation, 0x000C0026, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFE, 0x000C0001, 0x000C0026, 0x00000005, 0x00140039, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x00200009, 0x00200001, 0x00000000, 0x0014003A, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFE, 0x000C0001, 0x000C0026, 0x00000005, 0x0014003B, 0x00000043, 0x00000002, SetPlayerAnimation, 0x000C0002, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, SetPlayerAnimation, 0x000A0001, 0x00000024, 0x00000002, 0xF9718894, 0x00000001, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x0014017B, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x0014017B, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000021, 0x00000002, 0xFFFFFFCA, 0x00000058, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x0014017B, 0x000000A0, 0x00000028, 0x0000001C, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x00000043, 0x000000A0, 0x00000028, 0x00000023, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024143C_ADC2DC -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000014, 0x00000001, 0xF5DE0180, 0x00000016, 0x00000001, 0xFFFFFFB4, 0x0000000A, 0x00000002, 0xF8405D60, 0x00000000, 0x0000000A, 0x00000002, 0xF9718895, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x00200009, 0x00200001, 0x00000000, 0x0014003C, 0x00000043, 0x00000002, SetPlayerAnimation, 0x000C0000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, SetPlayerAnimation, 0x000C0026, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFE, 0x000C0001, 0x000C0026, 0x00000005, 0x0014003D, 0x00000043, 0x00000002, SetPlayerAnimation, 0x000C0002, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, SetPlayerAnimation, 0x000A0001, 0x00000024, 0x00000002, 0xF9718895, 0x00000001, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x0014017C, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x0014017C, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000021, 0x00000002, 0xFFFFFFCA, 0x00000058, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x0014017C, 0x000000A0, 0x00000028, 0x0000001C, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x00000044, 0x000000A0, 0x00000028, 0x00000023, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241608_ADC4A8 -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000014, 0x00000001, 0xF5DE0180, 0x00000021, 0x00000002, 0xFFFFFFB4, 0x00000058, 0x00000043, 0x00000002, kkj_14_GetPeachDisguise, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000002D, 0x0000000A, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000005, 0x00000027, 0x00000002, 0xFE363C81, 0x00000023, 0x00000027, 0x00000002, 0xFE363C82, 0xFFFFFFF6, 0x00000005, 0x00000001, 0x00000006, 0x00000043, 0x0000000F, PlayEffect, 0x00000006, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000006, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFE, 0x000C0001, 0x000C0026, 0x00000005, 0x00140044, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x00200009, 0x00200001, 0x00000000, 0x00140045, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000013, 0x00000000, 0x0000001C, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x00000045, 0x000000A0, 0x00000028, 0x00000023, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802417D4_ADC674 -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000014, 0x00000001, 0xF5DE0180, 0x00000016, 0x00000001, 0xFFFFFFB4, 0x0000000A, 0x00000002, 0xF8405D60, 0x00000000, 0x0000000A, 0x00000002, 0xF9718897, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x00200009, 0x00200001, 0x00000000, 0x0014003E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x000C0000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, SetPlayerAnimation, 0x000C0026, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFE, 0x000C0001, 0x000C0026, 0x00000005, 0x0014003F, 0x00000043, 0x00000002, SetPlayerAnimation, 0x000C0002, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, SetPlayerAnimation, 0x000A0001, 0x00000024, 0x00000002, 0xF9718897, 0x00000001, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x0014017D, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x0014017D, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000021, 0x00000002, 0xFFFFFFCA, 0x00000058, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x0014017D, 0x000000A0, 0x00000028, 0x0000001C, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x00000046, 0x000000A0, 0x00000028, 0x00000023, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802419A0_ADC840 -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000014, 0x00000001, 0xF5DE0180, 0x00000016, 0x00000001, 0xFFFFFFB4, 0x0000000A, 0x00000002, 0xF8405D60, 0x00000000, 0x0000000A, 0x00000002, 0xF9718898, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x000C0000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, SetPlayerAnimation, 0x000C0026, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFE, 0x000C0001, 0x000C0026, 0x00000005, 0x00140040, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x00200009, 0x00200001, 0x00000000, 0x00140041, 0x00000043, 0x00000002, SetPlayerAnimation, 0x000C0002, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, SetPlayerAnimation, 0x000A0001, 0x00000024, 0x00000002, 0xF9718898, 0x00000001, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x0014017E, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x0014017E, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000021, 0x00000002, 0xFFFFFFCA, 0x00000058, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x0014017E, 0x000000A0, 0x00000028, 0x0000001C, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x00000047, 0x000000A0, 0x00000028, 0x00000023, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241B6C_ADCA0C -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000014, 0x00000001, 0xF5DE0180, 0x00000016, 0x00000001, 0xFFFFFFB4, 0x0000000A, 0x00000002, 0xF8405D60, 0x00000000, 0x0000000A, 0x00000002, 0xF9718899, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x000C0000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, SetPlayerAnimation, 0x000C0026, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFE, 0x000C0001, 0x000C0026, 0x00000005, 0x00140042, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x00200009, 0x00200001, 0x00000000, 0x00140043, 0x00000043, 0x00000002, SetPlayerAnimation, 0x000C0002, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, SetPlayerAnimation, 0x000A0001, 0x00000024, 0x00000002, 0xF9718899, 0x00000001, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x0014017F, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x0014017F, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000021, 0x00000002, 0xFFFFFFCA, 0x00000058, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x0014017F, 0x000000A0, 0x00000028, 0x0000001C, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x00000048, 0x000000A0, 0x00000028, 0x00000023, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241D38_ADCBD8 -.byte 0x00, 0x00, 0x00 - -dlabel D_80241D3B_ADCBDB -.byte 0xFF - -dlabel D_80241D3C_ADCBDC -.word 0x00000043, 0x00000003, EnableTexPanning, 0x0000004F, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x00000050, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFFFF92, 0x00000027, 0x00000002, 0xFE363C81, 0x00000032, 0x00000043, 0x00000005, SetTexPanOffset, 0x00000005, 0x00000000, 0xFE363C80, 0xFE363C81, 0x00000027, 0x00000002, 0xFE363C82, 0x00000028, 0x00000027, 0x00000002, 0xFE363C83, 0x00000082, 0x00000043, 0x00000005, SetTexPanOffset, 0x0000000A, 0x00000001, 0xFE363C82, 0xFE363C83, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241E4C_ADCCEC -.word 0x00000043, 0x00000004, PlaySoundAtCollider, 0x00000018, 0x000000F9, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x000000B4, 0x0000000F, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateGroup, 0x00000046, 0xFE363C80, 0x00000001, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0x00000049, 0x00000001, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateGroup, 0x00000046, 0xFE363C80, 0x00000001, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000047, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000048, 0x00000000, 0x00000024, 0x00000002, 0xF8405D60, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241F80_ADCE20 -.word 0x00000043, 0x00000003, EnableModel, 0x0000004E, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x0000004F, 0x00000000, 0x00000043, 0x00000003, EnableGroup, 0x0000004D, 0x00000001, 0x0000000A, 0x00000002, 0xF5DE0180, 0xFFFFFFB4, 0x00000024, 0x00000002, 0xFE363C80, 0x00000078, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x0000003C, 0x00000013, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x00000025, 0x000000FC, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x000000FF, 0x00000000, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000002, func_802403CC_ADB26C, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000050, 0x00000000, 0x00000043, 0x00000004, SetModelFlags, 0x00000050, 0x00000010, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000006, PlaySoundAt, 0x000000FB, 0x00000000, 0xFFFFFF83, 0x0000000A, 0xFFFFFF88, 0x00000043, 0x0000000F, PlayEffect, 0x00000027, 0x00000000, 0xFFFFFF83, 0x0000000A, 0xFFFFFF88, 0xF24A8280, 0x0000001E, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0xFFFFFF4C, 0x0000001E, 0x00000001, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateModel, 0x00000041, 0xFE363C80, 0x00000001, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000025, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000019, 0x7FFFFE00, 0x00000024, 0x00000002, 0xF8405D5F, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242228_ADD0C8 -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x0000000A, 0x00000002, 0xF8405D60, 0x00000000, 0x00000046, 0x00000001, D_80241E4C_ADCCEC, 0x00000012, 0x00000000, 0x00000043, 0x00000004, FacePlayerTowardPoint, 0xFFFFFFE3, 0xFFFFFF6C, 0x00000005, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, SetPlayerAnimation, 0x000D0010, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, SetPlayerAnimation, 0x000D0011, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x00000018, 0x000000FA, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, SetPlayerJumpscale, 0xF24A7E80, 0x00000043, 0x00000005, PlayerJump1, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000A, 0x00000043, 0x00000002, SetPlayerAnimation, 0x000D0012, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, SetPlayerAnimation, 0x000A0001, 0x00000043, 0x00000003, InterpPlayerYaw, 0x000000E1, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0x0000010E, 0x00000000, 0x00000046, 0x00000001, D_80241F80_ADCE20, 0x00000048, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802423F4_ADD294 -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x0000000A, 0x00000002, 0xF8405D60, 0x00000000, 0x0000000A, 0x00000002, 0xF9718884, 0x00000000, 0x00000043, 0x00000003, NpcFacePlayer, 0xFFFFFFFC, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x0020000C, 0x0020000C, 0x00000005, 0x00140046, 0x00000024, 0x00000002, 0xF9718884, 0x00000001, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_80241E4C_ADCCEC, 0x00000012, 0x00000000, 0x00000043, 0x00000004, FacePlayerTowardPoint, 0xFFFFFFE3, 0xFFFFFF6C, 0x00000005, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, SetPlayerAnimation, 0x000D0010, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, SetPlayerAnimation, 0x000D0011, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x00000018, 0x000000FA, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, SetPlayerJumpscale, 0xF24A7E80, 0x00000043, 0x00000005, PlayerJump1, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000A, 0x00000043, 0x00000002, SetPlayerAnimation, 0x000D0012, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, SetPlayerAnimation, 0x000A0001, 0x00000043, 0x00000003, InterpPlayerYaw, 0x000000E1, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0x000000E1, 0x00000000, 0x0000000A, 0x00000002, 0xF9718885, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFFFFFF88, 0x00000019, 0x00000000, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8680, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x0000012C, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_80241F80_ADCE20, 0x0000000A, 0x00000002, 0xF9718885, 0x00000000, 0x00000043, 0x00000003, ResetCam, 0x00000000, 0xF24A8680, 0x00000043, 0x00000002, SetPlayerAnimation, 0x000C0009, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x0020000F, 0x0020000F, 0x00000005, 0x00140047, 0x00000024, 0x00000002, 0xF9718885, 0x00000001, 0x00000013, 0x00000000, 0x00000048, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF8405D60, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000049, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000047, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000048, 0x00000000, 0x00000043, 0x00000006, RotateGroup, 0x00000046, 0x000000B4, 0x00000001, 0x00000000, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405D5F, 0x00000000, 0x00000043, 0x00000003, EnableGroup, 0x0000004D, 0x00000000, 0x00000044, 0x00000001, D_80241D3C_ADCBDC, 0x00000043, 0x00000004, SetModelCustomGfx, 0x00000050, 0x00000001, 0xFFFFFFFF, 0x00000043, 0x00000004, SetCustomGfxBuilders, 0x00000001, func_802403F8_ADB298, 0x00000000, 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0xFFFFFF81, 0x00000018, 0x00000001, 0xFFFFFFCA, 0x00000047, 0x00000005, D_802423F4_ADD294, 0x00000100, 0x00000018, 0x00000001, 0x00000000, 0x00000018, 0x00000001, 0x0000005F, 0x00000047, 0x00000005, D_80242228_ADD0C8, 0x00000100, 0x00000018, 0x00000001, 0x00000000, 0x0000001C, 0x00000000, 0x00000023, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000025, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000019, 0x7FFFFE00, 0x00000043, 0x00000006, RotateModel, 0x00000041, 0xFFFFFF4C, 0x00000001, 0x00000000, 0x00000000, 0x00000043, 0x00000003, EnableGroup, 0x00000051, 0x00000000, 0x00000013, 0x00000000, 0x00000047, 0x00000005, D_80241250_ADC0F0, 0x00000100, 0x00000025, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_8024143C_ADC2DC, 0x00000100, 0x00000026, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80241608_ADC4A8, 0x00000100, 0x00000027, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_802417D4_ADC674, 0x00000100, 0x00000028, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_802419A0_ADC840, 0x00000100, 0x00000029, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80241B6C_ADCA0C, 0x00000100, 0x0000002A, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kkj/kkj_14/ADD870.data.s b/ver/us/asm/data/world/area_kkj/kkj_14/ADD870.data.s deleted file mode 100644 index 499f013116..0000000000 --- a/ver/us/asm/data/world/area_kkj/kkj_14/ADD870.data.s +++ /dev/null @@ -1,21 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802429D0_ADD870 -.word 0xC3998000, 0x41F00000, 0xC1F00000, 0xC3910000, 0x420C0000, 0xC1F00000, 0xC37A0000, 0x00000000, 0xC1F00000 - -dlabel D_802429F4_ADD894 -.word 0xC3F00000, 0x41F00000, 0xC1F00000, 0xC3B40000, 0x42700000, 0xC1F00000, 0xC3AA0000, 0x42F00000, 0xC28C0000, 0xC3BE0000, 0x42200000, 0xC2C80000 - -dlabel D_80242A24_ADD8C4 -.word 0xC3BE0000, 0x42200000, 0xC2C80000, 0xC3B40000, 0x42340000, 0xC2A40000, 0xC3AA0000, 0x42200000, 0xC2820000, 0xC3A00000, 0x42000000, 0xC2500000, 0xC3910000, 0x41C80000, 0xC1F00000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000076, 0x00000000, 0x00000008, 0x00000043, 0x00000004, SetPlayerPos, 0xFFFFFE20, 0x0000001E, 0xFFFFFFE2, 0x00000043, 0x00000002, SetPlayerAnimation, 0x000C0018, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFFFFFE20, 0x0000001E, 0xFFFFFFE2, 0x00000043, 0x00000005, SetNpcPos, 0x00000000, 0xFFFFFE14, 0x00000000, 0xFFFFFFE2, 0x00000043, 0x00000005, SetNpcPos, 0x00000001, 0xFFFFFE34, 0x00000000, 0xFFFFFFE2, 0x00000043, 0x00000003, SetNpcYaw, 0x00000000, 0x0000005A, 0x00000043, 0x00000003, SetNpcYaw, 0x00000001, 0x0000005A, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFFFFFED4, 0x00000000, 0xFFFFFFE2, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFFFFFED4, 0x00000000, 0xFFFFFFE2, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000002, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000003, 0x7FFFFE00, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x00000002, 0x000001C1, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x00000050, 0x0000000E, 0x00000004, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateModel, 0x00000002, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, LoadPath, 0x00000032, D_802429F4_ADD894, 0x00000004, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, GetNextPathPos, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0x0000005A, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000004, SetNpcVar, 0x00000000, 0x00000000, 0x00000001, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00580014, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000000, 0xF24A8E80, 0x00000043, 0x00000005, NpcMoveTo, 0x00000000, 0xFFFFFEC4, 0xFFFFFFE0, 0x00000000, 0x00000043, 0x00000004, SetNpcVar, 0x00000000, 0x00000000, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00580014, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000001, 0xF24A8E80, 0x00000043, 0x00000005, NpcMoveTo, 0x00000001, 0xFFFFFEE4, 0xFFFFFFE4, 0x00000000, 0x00000057, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x0000000A, 0x00000027, 0x00000002, 0xFE363C82, 0x00000002, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0x0000001E, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000004, GetNpcVar, 0x00000000, 0x00000000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00580012, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00580012, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, SetPlayerAnimation, 0x000C0019, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00580015, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00580015, 0x00000043, 0x00000005, LoadPath, 0x0000000F, D_802429D0_ADD870, 0x00000003, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, GetNextPathPos, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtPlayer, 0x00000162, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x000C001A, 0x00000056, 0x00000000, 0x00000027, 0x00000002, 0xFE363C81, 0x0000000A, 0x00000043, 0x0000000F, PlayEffect, 0x00000006, 0x00000001, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000002F, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFFFB, 0x00000027, 0x00000002, 0xFE363C82, 0x0000000A, 0x00000027, 0x00000002, 0xFE363C83, 0x00000005, 0x00000005, 0x00000001, 0x00000004, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000001, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00580001, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00580006, 0x00000043, 0x00000005, NpcMoveTo, 0x00000000, 0xFFFFFE32, 0xFFFFFFE2, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000000, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00580001, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00580006, 0x00000043, 0x00000005, NpcMoveTo, 0x00000001, 0xFFFFFE52, 0xFFFFFFE2, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000001, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000078, 0x00000000, 0x00000008, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateModel, 0x00000002, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0x00000003, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0x00000002, 0x7FFFFE00, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x00000002, 0x000001C2, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000003C, 0x00000043, 0x00000005, LoadPath, 0x00000032, D_80242A24_ADD8C4, 0x00000005, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, GetNextPathPos, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0x0000005A, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x000A0001, 0x0000000A, 0x00000002, 0xF5DE0180, 0x0000003A, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x00200009, 0x00200001, 0x00000000, 0x00140159, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFE, 0x000C0013, 0x000C0012, 0x00000005, 0x0014015A, 0x0000000C, 0x00000002, 0xF5DE01CF, 0x00000003, 0x0000000A, 0x00000002, 0xF9718893, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x0014015B, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x0014015D, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x0014015C, 0x00000013, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x00200009, 0x00200001, 0x00000000, 0xFE363C80, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x00200009, 0x00200001, 0x00000000, 0x00140176, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFE, 0x000C0013, 0x000C0012, 0x00000005, 0x00140177, 0x0000000C, 0x00000002, 0xF5DE01CF, 0x00000003, 0x0000000A, 0x00000002, 0xF9718893, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00140178, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x0014017A, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00140179, 0x00000013, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x00200009, 0x00200001, 0x00000000, 0xFE363C80, 0x00000013, 0x00000000, 0x00000044, 0x00000001, 0x802405C0, 0x00000043, 0x00000003, ResetCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80243590_ADE430 -.word 0x00000000, 0x00280018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00190000 - -dlabel D_802435BC_ADE45C -.word 0x00580001, 0x00580006, 0x00580012, 0x00580014, 0x00580015, 0xFFFFFFFF - -dlabel D_802435D4_ADE474 -.word 0x00000000, D_80243590_ADE430, 0x00000000, 0xC3FA0000, 0x00000000, 0x00000F0D, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00580001, 0x00580004, 0x00580006, 0x00580006, 0x00580001, 0x00580001, 0x00580010, 0x00580010, 0x0058000C, 0x0058000B, 0x0058000D, 0x00580001, 0x00580001, 0x00580001, 0x00580001, 0x00580001, 0x00000000, 0x00000000, D_802435BC_ADE45C, 0x00000000, 0x00000001, D_80243590_ADE430, 0x00000000, 0xC3FA0000, 0x00000000, 0x00000F0D, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00580001, 0x00580004, 0x00580006, 0x00580006, 0x00580001, 0x00580001, 0x00580010, 0x00580010, 0x0058000C, 0x0058000B, 0x0058000D, 0x00580001, 0x00580001, 0x00580001, 0x00580001, 0x00580001, 0x00000000, 0x00000000, D_802435BC_ADE45C, 0x00000000, 0x00000002, D_802435D4_ADE474, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kkj/kkj_14/ADE870.data.s b/ver/us/asm/data/world/area_kkj/kkj_14/ADE870.data.s deleted file mode 100644 index 207c591414..0000000000 --- a/ver/us/asm/data/world/area_kkj/kkj_14/ADE870.data.s +++ /dev/null @@ -1,18 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802439D0_ADE870 -.word 0x00000000, 0x004B0048, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000 - -dlabel D_802439FC_ADE89C -.word 0x00000000, 0x0028001E, 0x00000000, 0x00000000, 0x00000000, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x001A0000 - -dlabel D_80243A28_ADE8C8 -.word 0x00800000, 0x00800002, 0x00800003, 0x00800004, 0x00800006, 0x00800007, 0x00800009, 0x00800010, 0xFFFFFFFF - -dlabel D_80243A4C_ADE8EC -.word 0x00600001, 0x00600002, 0x00600004, 0xFFFFFFFF - -dlabel D_80243A5C_ADE8FC -.word 0x00000000, D_802439D0_ADE870, 0x00000000, 0xC3FA0000, 0x00000000, 0x00000D0D, 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, 0x00800002, 0x00800002, 0x00800002, 0x00800002, 0x00800002, 0x00800002, 0x00800002, 0x00800002, 0x00800002, 0x00800002, 0x00800002, 0x00800002, 0x00800002, 0x00800002, 0x00800002, 0x00800002, 0x00000000, 0x00000000, D_80243A28_ADE8C8, 0x00000000, 0x00000001, D_802439FC_ADE89C, 0x00000000, 0xC3FA0000, 0x00000000, 0x00000D0D, 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, 0x00600001, 0x00600002, 0x00600003, 0x00600003, 0x00600001, 0x00600001, 0x00600000, 0x00600000, 0x00600003, 0x00600003, 0x00600003, 0x00600003, 0x00600003, 0x00600003, 0x00600003, 0x00600003, 0x00000000, 0x00000000, D_80243A4C_ADE8EC, 0x00000000, 0x00000002, D_80243A5C_ADE8FC, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kkj/kkj_14/ADED00.data.s b/ver/us/asm/data/world/area_kkj/kkj_14/ADED00.data.s deleted file mode 100644 index 98035f11c5..0000000000 --- a/ver/us/asm/data/world/area_kkj/kkj_14/ADED00.data.s +++ /dev/null @@ -1,18 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80243E60_ADED00 -.word 0x00000000, 0x004B0048, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000 - -dlabel D_80243E8C_ADED2C -.word 0x00000000, 0x0028001E, 0x00000000, 0x00000000, 0x00000000, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x001A0000 - -dlabel D_80243EB8_ADED58 -.word 0x00800000, 0x00800002, 0x00800004, 0x00800005, 0x00800006, 0x00800007, 0x0080000C, 0x0080000D, 0xFFFFFFFF - -dlabel D_80243EDC_ADED7C -.word 0x00600001, 0x00600002, 0x00600003, 0x00600004, 0xFFFFFFFF - -dlabel D_80243EF0_ADED90 -.word 0x00000000, D_80243E60_ADED00, 0x00000000, 0xC3FA0000, 0x00000000, 0x00000F0D, 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, 0x00800002, 0x00800002, 0x00800002, 0x00800002, 0x00800002, 0x00800002, 0x00800002, 0x00800002, 0x00800002, 0x00800002, 0x00800002, 0x00800002, 0x00800002, 0x00800002, 0x00800002, 0x00800002, 0x00000000, 0x00000000, D_80243EB8_ADED58, 0x00000000, 0x00000001, D_80243E8C_ADED2C, 0x00000000, 0xC3FA0000, 0x00000000, 0x00000F0D, 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, 0x00600001, 0x00600002, 0x00600003, 0x00600003, 0x00600001, 0x00600001, 0x00600000, 0x00600000, 0x00600003, 0x00600003, 0x00600003, 0x00600003, 0x00600003, 0x00600003, 0x00600003, 0x00600003, 0x00000000, 0x00000000, D_80243EDC_ADED7C, 0x00000000, 0x00000002, D_80243EF0_ADED90, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kkj/kkj_14/ADF190.data.s b/ver/us/asm/data/world/area_kkj/kkj_14/ADF190.data.s deleted file mode 100644 index 7bbc0c4a4c..0000000000 --- a/ver/us/asm/data/world/area_kkj/kkj_14/ADF190.data.s +++ /dev/null @@ -1,24 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802442F0_ADF190 -.word 0x00000000, 0x004B0048, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000 - -dlabel D_8024431C_ADF1BC -.word 0x00000000, 0x0028001E, 0x00000000, 0x00000000, 0x00000000, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x001A0000 - -dlabel D_80244348_ADF1E8 -.word 0x00000000, 0x00280018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00190000 - -dlabel D_80244374_ADF214 -.word 0x00800000, 0x00800002, 0x00800004, 0x00800005, 0x00800006, 0x00800007, 0x00800008, 0x0080000D, 0x00800016, 0xFFFFFFFF - -dlabel D_8024439C_ADF23C -.word 0x00600000, 0x00600001, 0x00600002, 0x00600003, 0x00600004, 0xFFFFFFFF - -dlabel D_802443B4_ADF254 -.word 0x00580000, 0x00580001, 0x00580004, 0x00580006, 0x00580012, 0x00580014, 0x00580018, 0xFFFFFFFF - -dlabel D_802443D4_ADF274 -.word 0x00000000, D_802442F0_ADF190, 0x00000000, 0xC3FA0000, 0x00000000, 0x0000050D, 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, 0x00800002, 0x00800002, 0x00800002, 0x00800002, 0x00800002, 0x00800002, 0x00800002, 0x00800002, 0x00800002, 0x00800002, 0x00800002, 0x00800002, 0x00800002, 0x00800002, 0x00800002, 0x00800002, 0x00000000, 0x00000000, D_80244374_ADF214, 0x00000000, 0x00000001, D_80244348_ADF1E8, 0x00000000, 0xC3FA0000, 0x00000000, 0x0000070D, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00580001, 0x00580004, 0x00580006, 0x00580006, 0x00580001, 0x00580001, 0x00580010, 0x00580010, 0x0058000C, 0x0058000B, 0x0058000D, 0x00580001, 0x00580001, 0x00580001, 0x00580001, 0x00580001, 0x00000000, 0x00000000, D_802443B4_ADF254, 0x00000000, 0x00000002, D_80244348_ADF1E8, 0x00000000, 0xC3FA0000, 0x00000000, 0x0000070D, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00580001, 0x00580004, 0x00580006, 0x00580006, 0x00580001, 0x00580001, 0x00580010, 0x00580010, 0x0058000C, 0x0058000B, 0x0058000D, 0x00580001, 0x00580001, 0x00580001, 0x00580001, 0x00580001, 0x00000000, 0x00000000, D_802443B4_ADF254, 0x00000000, 0x00000003, D_8024431C_ADF1BC, 0x00000000, 0xC3FA0000, 0x00000000, 0x0000050D, 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, 0x00600001, 0x00600002, 0x00600003, 0x00600003, 0x00600001, 0x00600001, 0x00600000, 0x00600000, 0x00600003, 0x00600003, 0x00600003, 0x00600003, 0x00600003, 0x00600003, 0x00600003, 0x00600003, 0x00000000, 0x00000000, D_8024439C_ADF23C, 0x00000000, 0x00000004, D_802443D4_ADF274, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kkj/kkj_14/ADFA50.data.s b/ver/us/asm/data/world/area_kkj/kkj_14/ADFA50.data.s deleted file mode 100644 index 6f529e95cf..0000000000 --- a/ver/us/asm/data/world/area_kkj/kkj_14/ADFA50.data.s +++ /dev/null @@ -1,15 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80244BB0_ADFA50 -.word 0x44020000, 0x428C0000, 0xC2780000, 0x43C80000, 0x42640000, 0x423C0000, 0x43960000, 0x42480000, 0x42200000, 0x43960000, 0x42480000, 0xC1200000, 0x43A00000, 0x42820000, 0x00000000 - -dlabel D_80244BEC_ADFA8C -.word 0x43B00000, 0x42480000, 0xC0000000, 0x43960000, 0x42AA0000, 0x00000000, 0x43AF0000, 0x42F00000, 0x00000000, 0x43C80000, 0x42D20000, 0xC0E00000, 0x43D70000, 0x42B40000, 0xC1700000 - -dlabel D_80244C28_ADFAC8 -.word 0x00000043, 0x00000004, PlaySoundAtCollider, 0x00000002, 0x000001C1, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x00000078, 0x0000000E, 0x00000008, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateModel, 0x00000002, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000078, 0x00000000, 0x00000008, 0x00000008, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateModel, 0x00000002, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x00000002, 0x000001C2, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80244D88_ADFC28 -.word 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000008, NpcFlyTo, 0xFFFFFFFC, 0x00000208, 0x00000046, 0xFFFFFFC4, 0x0000001E, 0xFFFFFFF6, 0x00000000, 0x00000043, 0x00000008, NpcFlyTo, 0xFFFFFFFC, 0x00000208, 0x00000046, 0xFFFFFFC3, 0x0000000A, 0xFFFFFFFB, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFFFFFFFC, 0x000001D8, 0x00000000, 0x00000043, 0x00000008, NpcFlyTo, 0xFFFFFFFC, 0x00000208, 0x00000046, 0xFFFFFFC2, 0x0000000A, 0xFFFFFFFB, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFFFFFFFC, 0x000001D8, 0x00000000, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000001, func_80240480_ADB320, 0x00000043, 0x00000002, SetPlayerAnimation, 0x000C000E, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000010E, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0x00000208, 0x0000003C, 0xFFFFFFDD, 0x00000043, 0x00000005, SetNpcPos, 0x00000000, 0xFFFFFE3E, 0x00000000, 0xFFFFFFEC, 0x00000043, 0x00000005, SetNpcPos, 0x00000001, 0xFFFFFE02, 0x00000000, 0xFFFFFFEC, 0x00000043, 0x00000003, SetNpcYaw, 0x00000000, 0x0000005A, 0x00000043, 0x00000003, SetNpcYaw, 0x00000001, 0x0000005A, 0x00000043, 0x00000007, AdjustCam, 0x00000000, 0xF24BE280, 0x00000014, 0x000000FA, 0xF24ABE80, 0xF24A4E80, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFE, 0x000C000F, 0x000C000E, 0x00000005, 0x00140016, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000005A, 0x00000005, 0x00000043, 0x00000004, PlayerMoveTo, 0x00000014, 0x0000001E, 0x0000001E, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFE, 0x000C000F, 0x000C000E, 0x00000005, 0x00140017, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000010E, 0x00000005, 0x00000043, 0x00000004, PlayerMoveTo, 0xFFFFFFEC, 0x0000001E, 0x0000001E, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFE, 0x000C000F, 0x000C000E, 0x00000005, 0x00140018, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000005A, 0x00000005, 0x00000043, 0x00000004, PlayerMoveTo, 0x00000014, 0x0000001E, 0x0000001E, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFE, 0x000C000F, 0x000C000E, 0x00000005, 0x00140019, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000001, func_8024049C_ADB33C, 0x00000043, 0x00000002, SetPlayerAnimation, 0x000A0001, 0x00000043, 0x00000003, PlaySoundAtPlayer, 0x00000262, 0x00000000, 0x00000043, 0x0000000A, ShowEmote, 0x00000000, 0x00000000, 0xFFFFFFD3, 0x0000001E, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000010E, 0x00000003, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000066, 0x00000000, 0x00000008, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8280, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFFFFFEB6, 0x00000000, 0x00000000, 0x00000043, 0x00000004, SetCamPosA, 0x00000000, 0xFFFFFEB6, 0x00000020, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000008, 0x00000001, 0x00000003, 0x00000044, 0x00000001, D_80244C28_ADFAC8, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, SetNpcVar, 0x00000000, 0x00000000, 0x00000001, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00800004, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000000, 0xF24A8680, 0x00000043, 0x00000005, NpcMoveTo, 0x00000000, 0xFFFFFED4, 0xFFFFFFEC, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0x00000000, 0xFFFFFFCE, 0x0000001E, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00800002, 0x00000043, 0x00000004, SetNpcVar, 0x00000000, 0x00000000, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00600002, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000001, 0xF24A8680, 0x00000043, 0x00000005, NpcMoveTo, 0x00000001, 0xFFFFFF92, 0x0000001E, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00600001, 0x00000057, 0x00000000, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000005, MakeLerp, 0x000000FA, 0x0000012C, 0x00000050, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x0000000A, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000004, GetNpcVar, 0x00000000, 0x00000000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00800007, 0x00800007, 0x00000000, 0x0014001A, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00800002, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, EndSpeech, 0x00000000, 0x00800006, 0x00800002, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x00600004, 0x00600001, 0x00000000, 0x0014001B, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00800010, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00800009, 0x00800003, 0x00000000, 0x0014001C, 0x00000043, 0x00000002, SetPlayerAnimation, 0x000C000D, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00800002, 0x00000043, 0x00000005, EndSpeech, 0x00000000, 0x00800009, 0x00800003, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x000A0001, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x00600004, 0x00600001, 0x00000000, 0x0014001D, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00800006, 0x00800002, 0x00000000, 0x0014001E, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x00600004, 0x00600001, 0x00000000, 0x0014001F, 0x00000008, 0x00000001, 0x0000000F, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00800004, 0x00000043, 0x00000005, NpcMoveTo, 0x00000000, 0xFFFFFE3E, 0x0000001E, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000001, 0x0000010E, 0x00000005, 0x00000008, 0x00000001, 0x0000003C, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00600002, 0x00000043, 0x00000005, NpcMoveTo, 0x00000001, 0xFFFFFE02, 0x0000001E, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00600001, 0x00000057, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF24F2A80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A7C80, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000003, FadeOutMusic, 0x00000000, 0x000007D0, 0x00000008, 0x00000001, 0x0000003C, 0x00000043, 0x00000002, SetPlayerAnimation, 0x000C0000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, SetPlayerAnimation, 0x000C0026, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFE, 0x000C0001, 0x000C0026, 0x00000005, 0x00140020, 0x00000043, 0x00000002, SetPlayerAnimation, 0x000C0002, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, SetPlayerAnimation, 0x000A0001, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000096, 0x00000043, 0x00000006, PlaySoundAt, 0x000001D8, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, PlaySoundAt, 0x000001D8, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, PlaySoundAtPlayer, 0x00000263, 0x00000000, 0x00000043, 0x0000000A, ShowEmote, 0x00000000, 0x00000002, 0xFFFFFFD3, 0x00000014, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, InterpPlayerYaw, 0x00000087, 0x00000005, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, SetPlayerAnimation, 0x000C0000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, SetPlayerAnimation, 0x000C0026, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFE, 0x000C0001, 0x000C0026, 0x00000005, 0x00140021, 0x00000024, 0x00000002, 0xF9718883, 0x00000000, 0x00000045, 0x00000002, D_80244D88_ADFC28, 0xFE363C8A, 0x00000056, 0x00000000, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x0000019D, 0x00000000, 0xFFFFFFBE, 0x00000043, 0x00000004, SetCamType, 0x00000000, 0x00000004, 0x00000000, 0x00000043, 0x00000004, SetCamPosA, 0x00000000, 0x00000152, 0x0000002C, 0x00000043, 0x00000004, SetCamPosB, 0x00000000, 0x0000019D, 0xFFFFFFBE, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, SetPlayerSpeed, 0xF24A8680, 0x00000043, 0x00000004, PlayerMoveTo, 0x000000B3, 0xFFFFFFFC, 0x00000000, 0x00000043, 0x00000004, PlayerMoveTo, 0x000001B7, 0xFFFFFFF0, 0x00000000, 0x00000024, 0x00000002, 0xF9718883, 0x00000001, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0x0000010E, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, SetPlayerAnimation, 0x000C000B, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x00000007, 0x000001CB, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x00000050, 0x0000000E, 0x00000004, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateModel, 0x0000007D, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000080, 0xFE363C80, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x0000007C, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x0000007F, 0xFE363C80, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000070, 0x00000000, 0x00000008, 0x00000056, 0x00000000, 0x00000043, 0x00000005, LoadPath, 0x00000064, D_80244BB0_ADFA50, 0x00000005, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, GetNextPathPos, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xF9718883, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000C, 0x00000002, 0xFE363C80, 0x00000136, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0x0000005A, 0x00000000, 0x00000057, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000C, 0x00000002, 0xFE363C80, 0x000001AE, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000003, InterpPlayerYaw, 0x000000DC, 0x00000005, 0x00000043, 0x00000002, SetPlayerAnimation, 0x000A0001, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000004, func_802D1270, 0x000001A4, 0x00000000, 0xF24A8280, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x00000172, 0x0000001E, 0x00000000, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x00000172, 0x0000001E, 0x00000000, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF24F2A80, 0x00000043, 0x00000004, SetCamPosB, 0x00000000, 0xF2504280, 0xF24AFA80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8A80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xF9718883, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x00000140, 0x0000001E, 0x00000011, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF24D9A80, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24ABE80, 0xF24A3A80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8280, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x00200009, 0x00200001, 0x00000000, 0x00140022, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x00000172, 0x0000001E, 0x00000011, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF24F2A80, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24ABE80, 0xF24A5280, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFE, 0x000D0004, 0x000A0001, 0x00000005, 0x00140023, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x00200009, 0x00200001, 0x00000000, 0x00140024, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A7C1A, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x0000015E, 0x0000001E, 0x00000011, 0x00000043, 0x00000004, PlayerMoveTo, 0x0000017C, 0x00000000, 0x0000001E, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFE, 0x000D0004, 0x000A0001, 0x00000005, 0x00140025, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x00200009, 0x00200001, 0x00000000, 0x00140026, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8A80, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x000000C8, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0x00000011, 0xFFFFFFF2, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x0000017C, 0x0000001E, 0x00000011, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000002, SetPlayerAnimation, 0x000C0000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, SetPlayerAnimation, 0x000C0026, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFE, 0x000C0001, 0x000C0026, 0x00000005, 0x00140027, 0x00000043, 0x00000002, SetPlayerAnimation, 0x000C0002, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, SetPlayerAnimation, 0x000A0001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00200010, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0x00000011, 0xFFFFFFF0, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x00000140, 0x0000001E, 0x00000011, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x00200010, 0x00200010, 0x00000000, 0x00140028, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x0000012C, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0x00000011, 0xFFFFFFF6, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x0000015E, 0x0000001E, 0x00000011, 0x00000043, 0x00000002, SetPlayerAnimation, 0x000C0000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, SetPlayerAnimation, 0x000C0026, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFE, 0x000C0001, 0x000C0026, 0x00000005, 0x00140029, 0x00000043, 0x00000002, SetPlayerAnimation, 0x000C0002, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, SetPlayerAnimation, 0x000A0001, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x00200010, 0x00200010, 0x00000000, 0x0014002A, 0x00000043, 0x00000002, SetPlayerAnimation, 0x000C0000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, SetPlayerAnimation, 0x000C0026, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFE, 0x000C0001, 0x000C0026, 0x00000005, 0x0014002B, 0x00000043, 0x00000002, SetPlayerAnimation, 0x000C0002, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, SetPlayerAnimation, 0x000A0001, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x000C000D, 0x00000043, 0x00000003, PlaySoundAtPlayer, 0x00000262, 0x00000000, 0x00000043, 0x0000000A, ShowEmote, 0x00000000, 0x00000000, 0xFFFFFFD3, 0x0000001E, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x000A0001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x000C0000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, SetPlayerAnimation, 0x000C0026, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFE, 0x000C0001, 0x000C0026, 0x00000005, 0x0014002C, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00200001, 0x00000043, 0x00000005, EndSpeech, 0xFFFFFFFE, 0x000C0001, 0x000C0026, 0x00000005, 0x00000043, 0x00000002, SetPlayerAnimation, 0x000C0002, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, SetPlayerAnimation, 0x000C000A, 0x00000008, 0x00000001, 0x0000000C, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000028, 0x00000002, 0xFE363C82, 0x0000000A, 0x00000027, 0x00000002, 0xFE363C83, 0x00000014, 0x00000027, 0x00000002, 0xFE363C84, 0x00000002, 0x00000043, 0x00000007, MakeItemEntity, 0x00000007, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C80, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8E80, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF24D9A80, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24ABE80, 0xF24A4880, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x0000016D, 0x0000001E, 0x00000011, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000056, 0x00000000, 0x00000043, 0x00000008, NpcFlyTo, 0xFFFFFFFC, 0x0000015E, 0x00000032, 0xFFFFFFFE, 0x0000001E, 0xFFFFFFFB, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00200017, 0x00000043, 0x00000005, MakeLerp, 0x00000032, 0x00000046, 0x0000000A, 0x00000004, 0x00000005, 0x00000001, 0x00000000, 0x00000027, 0x00000002, 0xFE363C82, 0xFFFFFFFE, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, SetItemPos, 0xFE363C89, 0xFE363C82, 0xFE363C80, 0xFE363C84, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00200018, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x00200018, 0x00200018, 0x00000000, 0x0014002D, 0x00000024, 0x00000002, 0xFE363C83, 0xFE363C80, 0x00000005, 0x00000001, 0x0000000A, 0x00000027, 0x00000002, 0xFE363C83, 0xFFFFFFFF, 0x00000043, 0x00000005, SetItemPos, 0xFE363C89, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00200019, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C89, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00200001, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0x0000010E, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00200005, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x00000190, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0x00000011, 0xFFFFFFF6, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x00000163, 0x0000001E, 0x00000011, 0x00000056, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000D, 0x00000002, 0xFE363C80, 0x0000017C, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000005A, 0x00000005, 0x00000043, 0x00000002, SetPlayerAnimation, 0x000C0000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, SetPlayerAnimation, 0x000C0026, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFE, 0x000C0001, 0x000C0026, 0x00000005, 0x0014002E, 0x00000024, 0x00000002, 0xF9718883, 0x00000001, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000C, 0x00000002, 0xFE363C80, 0x00000136, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0x0000005A, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000005, LoadPath, 0x0000003C, D_80244BEC_ADFA8C, 0x00000005, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, GetNextPathPos, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00200001, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0x0000010E, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xF9718883, 0x00000001, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x000000FA, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0x00000011, 0xFFFFFFF3, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x00000195, 0x0000001E, 0x00000011, 0x00000043, 0x00000004, SetCamPosB, 0x00000000, 0xF250BA80, 0xF24AFA80, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFE, 0x000C0001, 0x000C0026, 0x00000005, 0x0014002F, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00200005, 0x00000043, 0x00000008, NpcFlyTo, 0xFFFFFFFC, 0x000001A4, 0x0000003C, 0x00000000, 0x00000014, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00200001, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFE, 0x000C0001, 0x000C0026, 0x00000005, 0x00140030, 0x00000043, 0x00000002, SetPlayerAnimation, 0x000C0002, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, SetPlayerAnimation, 0x000A0001, 0x00000056, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x00000168, 0x0000000A, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, SetNpcRotation, 0xFFFFFFFC, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x00200009, 0x00200001, 0x00000000, 0x00140031, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00200005, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000040, 0x00000001, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0x0000005A, 0x00000005, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, FadeOutMusic, 0x00000000, 0x000007D0, 0x00000043, 0x00000008, NpcFlyTo, 0xFFFFFFFC, 0x00000258, 0x00000064, 0xFFFFFFB0, 0x00000028, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000003, GotoMap, 0x8024A6E8, 0x00000002, 0x00000008, 0x00000001, 0x00000064, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kkj/kkj_14/AE1B30.data.s b/ver/us/asm/data/world/area_kkj/kkj_14/AE1B30.data.s deleted file mode 100644 index 759b4c2cdc..0000000000 --- a/ver/us/asm/data/world/area_kkj/kkj_14/AE1B30.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80246C90_AE1B30 -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000056, 0x00000000, 0x00000043, 0x00000007, AdjustCam, 0x00000000, 0xF24A7C80, 0x00000014, 0x0000012C, 0xF24ABE80, 0xF24A4E80, 0x00000057, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFFFFFF38, 0x0000005D, 0xFFFFFFEF, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0x0000005A, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000078, 0x00000043, 0x00000008, NpcFlyTo, 0xFFFFFFFC, 0xFFFFFF9C, 0x00000028, 0x00000000, 0x0000003C, 0x00000028, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0x0000010E, 0x00000005, 0x00000057, 0x00000000, 0x00000005, 0x00000001, 0x00000003, 0x00000043, 0x00000004, PlayerMoveTo, 0xFFFFFF92, 0x00000000, 0x0000001E, 0x00000043, 0x00000004, PlayerMoveTo, 0xFFFFFF74, 0x00000000, 0x0000001E, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000005A, 0x00000005, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFE, 0x000D0004, 0x000A0001, 0x00000005, 0x00140033, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x00200009, 0x00200001, 0x00000000, 0x00140034, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFE, 0x000D0004, 0x000A0001, 0x00000005, 0x00140035, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x00200009, 0x00200001, 0x00000000, 0x00140036, 0x00000043, 0x00000002, SetPlayerAnimation, 0x000C000D, 0x00000043, 0x00000003, PlaySoundAtPlayer, 0x00000262, 0x00000000, 0x00000043, 0x0000000A, ShowEmote, 0x00000000, 0x00000000, 0x00000000, 0x0000001E, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x000A0001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x000C0000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, SetPlayerAnimation, 0x000C0026, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFE, 0x000C0001, 0x000C0026, 0x00000005, 0x00140037, 0x00000043, 0x00000002, SetPlayerAnimation, 0x000C0002, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, SetPlayerAnimation, 0x000A0001, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x00200009, 0x00200001, 0x00000000, 0x00140038, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kkj/kkj_14/AE1E80.data.s b/ver/us/asm/data/world/area_kkj/kkj_14/AE1E80.data.s deleted file mode 100644 index 866140c23d..0000000000 --- a/ver/us/asm/data/world/area_kkj/kkj_14/AE1E80.data.s +++ /dev/null @@ -1,27 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80246FE0_AE1E80 -.word 0x42DC0000, 0x00000000, 0xC33E0000, 0x43200000, 0x428C0000, 0xC3160000, 0x42C80000, 0x42200000, 0xC2700000, 0x41A00000, 0x428C0000, 0xC2C80000, 0xC2700000, 0x42200000, 0xC1A00000, 0x00000000, 0x41A00000, 0x41F00000 - -dlabel D_80247028_AE1EC8 -.word 0x00000043, 0x00000004, PlaySoundAtCollider, 0x00000002, 0x000001C1, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x00000078, 0x0000000E, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateModel, 0x00000002, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000005, MakeLerp, 0x00000078, 0x00000000, 0x00000008, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateModel, 0x00000002, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x00000002, 0x000001C2, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80247184_AE2024 -.word 0x00000043, 0x00000004, PlaySoundAtCollider, 0x00000002, 0x000001C1, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x00000078, 0x0000000E, 0x00000008, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateModel, 0x00000002, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80247234_AE20D4 -.word 0x00000043, 0x00000005, MakeLerp, 0x00000078, 0x00000000, 0x00000008, 0x00000008, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateModel, 0x00000002, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x00000002, 0x000001C2, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802472E4_AE2184 -.word 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFFFFFEB6, 0x00000000, 0xFFFFFFE2, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFFFFFEB6, 0x00000000, 0xFFFFFFE2, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF24F8E80, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24ABE80, 0xF24A4E80, 0x00000043, 0x00000004, SetCamPosA, 0x00000000, 0xF245A280, 0xF24AFA80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000066, 0x00000000, 0x00000008, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0x0000006E, 0x00000000, 0xFFFFFF42, 0x00000043, 0x00000003, SetNpcYaw, 0xFFFFFFFC, 0x0000010E, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000010E, 0x00000000, 0x00000046, 0x00000001, D_802472E4_AE2184, 0x00000044, 0x00000001, D_80247028_AE1EC8, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, SetNpcPos, 0x00000000, 0xFFFFFE2A, 0x00000000, 0xFFFFFFE2, 0x00000043, 0x00000004, SetNpcVar, 0x00000000, 0x00000000, 0x00000001, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00800004, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000000, 0xF24A8680, 0x00000043, 0x00000005, NpcMoveTo, 0x00000000, 0xFFFFFFE2, 0x0000001E, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00800002, 0x00000043, 0x00000004, SetNpcVar, 0x00000000, 0x00000000, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x0000001E, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, GetNpcVar, 0x00000000, 0x00000000, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00800007, 0x00800007, 0x00000000, 0x0014005C, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00800002, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, EndSpeech, 0x00000000, 0x00800006, 0x00800002, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x000C0012, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000005A, 0x00000003, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFE, 0x000C0013, 0x000C0012, 0x00000005, 0x0014005D, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00800007, 0x00800007, 0x00000005, 0x0014005E, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00800002, 0x00000043, 0x00000005, EndSpeech, 0x00000000, 0x00800006, 0x00800002, 0x00000005, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, SetPlayerAnimation, 0x000A0001, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000010E, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000000, 0x0000010E, 0x00000000, 0x00000046, 0x00000001, D_802472E4_AE2184, 0x00000008, 0x00000001, 0x00000005, 0x00000044, 0x00000001, D_80247184_AE2024, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000046, 0x00000000, 0x00000008, 0x00000043, 0x00000005, SetNpcPos, 0x00000001, 0xFFFFFE2A, 0x00000000, 0xFFFFFFE2, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00600003, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000001, 0xF24A8E80, 0x00000043, 0x00000005, NpcMoveTo, 0x00000001, 0xFFFFFEAC, 0xFFFFFFE2, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00600001, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000007, SpeakToNpc, 0x00000001, 0x00600004, 0x00600001, 0x00000000, 0x00000000, 0x0014005F, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x0000015E, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFFFFFFE2, 0x00000000, 0xFFFFFFE2, 0x00000043, 0x00000004, SetCamPosA, 0x00000000, 0xFFFFFEE1, 0x00000020, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00600003, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000001, 0xF24A8E80, 0x00000043, 0x00000005, NpcMoveTo, 0x00000001, 0xFFFFFF92, 0x0000001E, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00600001, 0x00000043, 0x00000007, SpeakToNpc, 0x00000001, 0x00600004, 0x00600001, 0x00000000, 0x00000000, 0x00140060, 0x00000043, 0x00000007, SpeakToNpc, 0x00000000, 0x00800006, 0x00800002, 0x00000000, 0x00000001, 0x00140061, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00600002, 0x00000043, 0x00000005, NpcMoveTo, 0x00000001, 0xFFFFFFA6, 0x00000028, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00600001, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000007, SpeakToNpc, 0x00000001, 0x00600004, 0x00600001, 0x00000000, 0x00000000, 0x00140062, 0x00000043, 0x00000005, GetNpcPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x0080000D, 0x00000043, 0x00000006, NpcJump0, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00800002, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000007, SpeakToNpc, 0x00000000, 0x00800006, 0x00800002, 0x00000000, 0x00000001, 0x00140063, 0x00000043, 0x00000007, SpeakToNpc, 0x00000001, 0x00600004, 0x00600001, 0x00000000, 0x00000000, 0x00140064, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x0080000C, 0x00000008, 0x00000001, 0x00000032, 0x00000043, 0x00000007, SpeakToNpc, 0x00000000, 0x00800006, 0x00800002, 0x00000000, 0x00000001, 0x00140065, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00800004, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000000, 0xF24A8680, 0x00000043, 0x00000005, NpcMoveTo, 0x00000000, 0xFFFFFE2A, 0xFFFFFFE2, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000004, SetNpcVar, 0x00000001, 0x00000000, 0x00000001, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00600002, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000001, 0xF24A8680, 0x00000043, 0x00000005, NpcMoveTo, 0x00000001, 0xFFFFFE2A, 0xFFFFFFE2, 0x00000000, 0x00000043, 0x00000004, SetNpcVar, 0x00000001, 0x00000000, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x0000015E, 0x00000190, 0x00000064, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, GetNpcVar, 0x00000001, 0x00000000, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000044, 0x00000001, D_80247234_AE20D4, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000073, 0x00000000, 0x00000008, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x0000012C, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x00000014, 0x00000000, 0x0000001E, 0x00000008, 0x00000001, 0x00000003, 0x00000056, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000C, 0x00000002, 0xFE363C80, 0xFFFFFFC6, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0x0000005A, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000005, LoadPath, 0x00000050, D_80246FE0_AE1E80, 0x00000006, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, GetNextPathPos, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, SetPlayerAnimation, 0x000C0000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, SetPlayerAnimation, 0x000C0026, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFE, 0x000C0001, 0x000C0026, 0x00000005, 0x00140066, 0x00000043, 0x00000002, SetPlayerAnimation, 0x000C0002, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, SetPlayerAnimation, 0x000A0001, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x00200009, 0x00200001, 0x00000000, 0x00140067, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFE, 0x000D0004, 0x000A0001, 0x00000005, 0x00140068, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x00200009, 0x00200001, 0x00000000, 0x00140069, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFE, 0x000D0004, 0x000A0001, 0x00000005, 0x0014006A, 0x00000044, 0x00000001, 0x802405C0, 0x00000043, 0x00000003, ResetCam, 0x00000000, 0xF24A8A80, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80247F10_AE2DB0 -.word 0xC2200000, 0x42B40000, 0x00000000, 0xC1200000, 0x42820000, 0xC1A00000, 0x41A00000, 0x428C0000, 0xC1200000 - -dlabel D_80247F34_AE2DD4 -.word 0x41A00000, 0x428C0000, 0xC1200000, 0xC1F00000, 0x42340000, 0xC1A00000, 0xC2A00000, 0x42480000, 0xC1200000 - -dlabel D_80247F58_AE2DF8 -.word 0xC2A00000, 0x42480000, 0xC1200000, 0xC28C0000, 0x420C0000, 0xC0A00000, 0xC2700000, 0x41F00000, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000010E, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFFFFFFD8, 0x0000005A, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0x0000005A, 0x00000000, 0x00000043, 0x00000007, AdjustCam, 0x00000000, 0xF24BE280, 0xFFFFFFEC, 0x000000FA, 0xF24ABE80, 0xF24A4E80, 0x00000043, 0x00000005, LoadPath, 0x00000018, D_80247F10_AE2DB0, 0x00000003, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, GetNextPathPos, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000003, NpcFacePlayer, 0xFFFFFFFC, 0x00000005, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000005, LoadPath, 0x0000001E, D_80247F34_AE2DD4, 0x00000003, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, GetNextPathPos, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000003, NpcFacePlayer, 0xFFFFFFFC, 0x00000005, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000005, LoadPath, 0x0000000A, D_80247F58_AE2DF8, 0x00000003, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, GetNextPathPos, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000003, NpcFacePlayer, 0xFFFFFFFC, 0x00000005, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x00200009, 0x00200001, 0x00000000, 0x0014007E, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFE, 0x000D0004, 0x000A0001, 0x00000005, 0x0014007F, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x00200009, 0x00200001, 0x00000000, 0x00140080, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFE, 0x000D0004, 0x000A0001, 0x00000005, 0x00140081, 0x00000043, 0x00000003, ResetCam, 0x00000000, 0xF24A8280, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kkj/kkj_14/AE3160.data.s b/ver/us/asm/data/world/area_kkj/kkj_14/AE3160.data.s deleted file mode 100644 index 6dabaa04db..0000000000 --- a/ver/us/asm/data/world/area_kkj/kkj_14/AE3160.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802482C0_AE3160 -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000010E, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFFFFFFC4, 0x0000001E, 0x00000000, 0x00000043, 0x00000003, SetNpcYaw, 0xFFFFFFFC, 0x0000005A, 0x00000043, 0x00000007, AdjustCam, 0x00000000, 0xF24BE280, 0xFFFFFFEC, 0x000000FA, 0xF24ABE80, 0xF24A4E80, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFE, 0x000D0004, 0x000A0001, 0x00000005, 0x00140097, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x00200009, 0x00200001, 0x00000000, 0x00140098, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFE, 0x000D0004, 0x000A0001, 0x00000005, 0x00140099, 0x00000056, 0x00000000, 0x00000043, 0x00000008, NpcFlyTo, 0xFFFFFFFC, 0xFFFFFFE2, 0x00000037, 0x0000001E, 0x0000001E, 0xFFFFFFFB, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000057, 0x00000000, 0x00000043, 0x00000003, ResetCam, 0x00000000, 0xF24A8280, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kkj/kkj_14/AE32D0.data.s b/ver/us/asm/data/world/area_kkj/kkj_14/AE32D0.data.s deleted file mode 100644 index d2eaebc15e..0000000000 --- a/ver/us/asm/data/world/area_kkj/kkj_14/AE32D0.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80248430_AE32D0 -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000010E, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFFFFFF56, 0x00000028, 0xFFFFFFFB, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0x0000005A, 0x00000000, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFFFFFF74, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFFFFFF74, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF24EC680, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24ABE80, 0xF24A4E80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A7CE7, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000057, 0x00000000, 0x00000005, 0x00000001, 0x00000002, 0x00000043, 0x00000004, PlayerMoveTo, 0xFFFFFF92, 0x00000000, 0x00000019, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000004, PlayerMoveTo, 0xFFFFFF7E, 0x00000000, 0x00000019, 0x00000008, 0x00000001, 0x00000005, 0x00000006, 0x00000000, 0x00000043, 0x00000004, PlayerMoveTo, 0xFFFFFF92, 0x00000000, 0x00000019, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000010E, 0x00000005, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFE, 0x000D0004, 0x000A0001, 0x00000005, 0x001400EB, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x00200009, 0x00200001, 0x00000000, 0x001400EC, 0x00000043, 0x00000002, SetPlayerAnimation, 0x000C0000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, SetPlayerAnimation, 0x000C0026, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFE, 0x000C0001, 0x000C0026, 0x00000005, 0x001400ED, 0x00000043, 0x00000002, SetPlayerAnimation, 0x000C0002, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, SetPlayerAnimation, 0x000A0001, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x00200009, 0x00200001, 0x00000000, 0x001400EE, 0x00000056, 0x00000000, 0x00000043, 0x00000008, NpcFlyTo, 0xFFFFFFFC, 0xFFFFFF74, 0x00000037, 0x00000000, 0x0000001E, 0xFFFFFFFB, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000057, 0x00000000, 0x00000043, 0x00000003, ResetCam, 0x00000000, 0xF24A8280, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kkj/kkj_14/AE3610.data.s b/ver/us/asm/data/world/area_kkj/kkj_14/AE3610.data.s deleted file mode 100644 index 0b91b74741..0000000000 --- a/ver/us/asm/data/world/area_kkj/kkj_14/AE3610.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80248770_AE3610 -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000010E, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFFFFFF74, 0x00000019, 0x00000000, 0x00000043, 0x00000003, SetNpcYaw, 0xFFFFFFFC, 0x0000005A, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFFFFFF9C, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFFFFFF9C, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF24E6280, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8280, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x000C0000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, SetPlayerAnimation, 0x000C0026, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFE, 0x000C0001, 0x000C0026, 0x00000005, 0x0014012F, 0x00000043, 0x00000002, SetPlayerAnimation, 0x000C0002, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, SetPlayerAnimation, 0x000A0001, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x00200009, 0x00200001, 0x00000000, 0x00140130, 0x00000056, 0x00000000, 0x00000043, 0x00000008, NpcFlyTo, 0xFFFFFFFC, 0xFFFFFFA6, 0x00000037, 0x00000000, 0x0000001E, 0xFFFFFFFB, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000057, 0x00000000, 0x00000043, 0x00000003, ResetCam, 0x00000000, 0xF24A8280, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kkj/kkj_14/AE3850.data.s b/ver/us/asm/data/world/area_kkj/kkj_14/AE3850.data.s deleted file mode 100644 index f2bfbdc17d..0000000000 --- a/ver/us/asm/data/world/area_kkj/kkj_14/AE3850.data.s +++ /dev/null @@ -1,33 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802489B0_AE3850 -.word 0x43DC0000, 0x42820000, 0x00000000, 0x43D20000, 0x42F00000, 0xC1A00000, 0x43C80000, 0x42A00000, 0xC20C0000, 0x43BB8000, 0x42A00000, 0xC2480000, 0x43BB8000, 0x42C80000, 0xC2480000 - -dlabel D_802489EC_AE388C -.word 0x43BB8000, 0x42C80000, 0xC2480000, 0x43BB8000, 0x42A00000, 0xC2480000, 0x43C30000, 0x42B40000, 0x41200000 - -dlabel D_80248A10_AE38B0 -.word 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000056, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C80, 0x0000001A, 0x00000028, 0x00000002, 0xFE363C82, 0x00000002, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00580006, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000001, 0xF24A8E80, 0x00000043, 0x00000005, NpcMoveTo, 0x00000001, 0xFE363C80, 0x00000046, 0x00000000, 0x00000043, 0x00000003, NpcFacePlayer, 0x00000001, 0x00000005, 0x00000043, 0x00000005, NpcMoveTo, 0x00000001, 0xFE363C80, 0xFE363C82, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00580001, 0x00000057, 0x00000000, 0x00000043, 0x00000004, SetNpcVar, 0x00000002, 0x00000000, 0x00000001, 0x00000056, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x0000001A, 0x00000027, 0x00000002, 0xFE363C82, 0x00000002, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x00580006, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000002, 0xF24A8E80, 0x00000043, 0x00000005, NpcMoveTo, 0x00000002, 0xFE363C80, 0x00000046, 0x00000000, 0x00000043, 0x00000003, NpcFacePlayer, 0x00000002, 0x00000005, 0x00000043, 0x00000005, NpcMoveTo, 0x00000002, 0xFE363C80, 0xFE363C82, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x00580001, 0x00000043, 0x00000004, SetNpcVar, 0x00000002, 0x00000000, 0x00000000, 0x00000057, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000004, GetNpcVar, 0x00000002, 0x00000000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80248C9C_AE3B3C -.word 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00580018, 0x00000043, 0x00000005, GetNpcPos, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000005, 0x00000001, 0x00000005, 0x00000005, 0x00000001, 0x00000005, 0x00000027, 0x00000002, 0xFE363C80, 0x00000002, 0x00000043, 0x00000005, SetNpcPos, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x00000028, 0x00000002, 0xFE363C80, 0x00000002, 0x00000043, 0x00000005, SetNpcPos, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00580001, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x00580018, 0x00000043, 0x00000005, GetNpcPos, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000005, 0x00000001, 0x00000005, 0x00000005, 0x00000001, 0x00000005, 0x00000028, 0x00000002, 0xFE363C80, 0x00000002, 0x00000043, 0x00000005, SetNpcPos, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x00000027, 0x00000002, 0xFE363C80, 0x00000002, 0x00000043, 0x00000005, SetNpcPos, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x00580001, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C80, 0x00000010, 0x00000005, 0x00000001, 0x00000032, 0x00000043, 0x00000003, RandInt, 0x00000020, 0xFE363C83, 0x00000043, 0x00000003, RandInt, 0x00000032, 0xFE363C84, 0x00000027, 0x00000002, 0xFE363C83, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C84, 0xFE363C81, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000001, 0xFE363C83, 0xFE363C84, 0xFE363C82, 0x00000001, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x000C0005, 0x00000008, 0x00000001, 0x0000000A, 0x00000056, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x000C0006, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, ShowMessageAtWorldPos, 0x0014016D, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000057, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x0000002D, 0x00000005, 0x00000001, 0x00000014, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C80, 0x00000000, 0x00000027, 0x00000002, 0xFE363C80, 0xFE363C81, 0x00000027, 0x00000002, 0xFE363C81, 0x00000002, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x000C001E, 0x00000005, 0x00000001, 0x00000014, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C80, 0x00000000, 0x00000027, 0x00000002, 0xFE363C80, 0xFE363C81, 0x00000028, 0x00000002, 0xFE363C81, 0x00000002, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000010E, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802490EC_AE3F8C -.word 0x00000056, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00580012, 0x00000027, 0x00000002, 0xFE363C80, 0x0000000A, 0x00000043, 0x00000005, NpcMoveTo, 0x00000001, 0xFE363C80, 0xFE363C82, 0x0000000A, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x00580012, 0x00000028, 0x00000002, 0xFE363C80, 0x0000000A, 0x00000043, 0x00000005, NpcMoveTo, 0x00000002, 0xFE363C80, 0xFE363C82, 0x0000000A, 0x00000057, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000005, 0x00000001, 0x00000004, 0x00000027, 0x00000002, 0xFE363C81, 0x00000002, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x000D0008, 0x00000005, 0x00000001, 0x00000005, 0x00000027, 0x00000002, 0xFE363C81, 0x00000004, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80249298_AE4138 -.word 0x00000043, 0x00000004, InterpNpcYaw, 0x00000001, 0x0000010E, 0x00000003, 0x00000008, 0x00000001, 0x0000000A, 0x00000056, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C80, 0x00000016, 0x00000027, 0x00000002, 0xFE363C81, 0x0000001E, 0x00000027, 0x00000002, 0xFE363C82, 0x00000002, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00580014, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000001, 0xF24A8E80, 0x00000043, 0x00000005, NpcMoveTo, 0x00000001, 0x0000016C, 0x00000044, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0x00000001, 0x00000054, 0x00000044, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x00580014, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000002, 0xF24A8E80, 0x00000043, 0x00000005, NpcMoveTo, 0x00000002, 0x0000018C, 0x00000048, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0x00000002, 0x00000074, 0x00000048, 0x00000000, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80249440_AE42E0 -.word 0x00000043, 0x00000004, PlaySoundAtCollider, 0x00000002, 0x000001C1, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x00000078, 0x0000000E, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateModel, 0x00000002, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000005, MakeLerp, 0x00000078, 0x00000000, 0x00000008, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateModel, 0x00000002, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x00000002, 0x000001C2, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024959C_AE443C -.word 0x00000043, 0x00000004, PlaySoundAtCollider, 0x00000002, 0x000001C1, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x00000078, 0x0000000E, 0x00000008, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateModel, 0x00000002, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024964C_AE44EC -.word 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFFFFFEAC, 0x00000000, 0xFFFFFFE2, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFFFFFEAC, 0x00000000, 0xFFFFFFE2, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF24EC680, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24ABE80, 0xF24A4680, 0x00000043, 0x00000004, SetCamPosA, 0x00000000, 0xF245A280, 0xF24AFA80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80249718_AE45B8 -.word 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x0000017C, 0x0000001E, 0x0000000A, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x0000017C, 0x0000001E, 0x0000000A, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF24FF280, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000066, 0x00000000, 0x00000008, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0x000001B8, 0x00000041, 0x00000000, 0x00000043, 0x00000003, SetNpcYaw, 0xFFFFFFFC, 0x0000010E, 0x00000043, 0x00000006, RotateModel, 0x0000007D, 0x00000050, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000080, 0x00000050, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x0000007C, 0x00000050, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x0000007F, 0x00000050, 0x00000000, 0x00000001, 0x00000000, 0x00000046, 0x00000001, D_8024964C_AE44EC, 0x00000008, 0x00000001, 0x0000001E, 0x00000044, 0x00000001, D_80249440_AE42E0, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00800004, 0x00000043, 0x00000005, SetNpcPos, 0x00000000, 0xFFFFFE2A, 0x00000000, 0xFFFFFFE2, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000000, 0xF24A8680, 0x00000043, 0x00000005, NpcMoveTo, 0x00000000, 0xFFFFFEDE, 0xFFFFFFE2, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00800002, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00800006, 0x00800002, 0x00000000, 0x00140161, 0x00000008, 0x00000001, 0x0000000A, 0x00000046, 0x00000001, D_80249718_AE45B8, 0x00000043, 0x00000005, LoadPath, 0x0000001E, D_802489B0_AE3850, 0x00000005, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, GetNextPathPos, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00200002, 0x00000043, 0x00000005, SetNpcPos, 0x00000000, 0x00000064, 0x00000000, 0x00000014, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000000, 0x00000200, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00800004, 0x00000043, 0x00000005, NpcMoveTo, 0x00000000, 0x0000012C, 0x00000014, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00800002, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF24F8E80, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24ABE80, 0xF24A4E80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8E80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00800006, 0x00800002, 0x00000000, 0x00140162, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000005A, 0x00000005, 0x00000043, 0x00000002, SetPlayerAnimation, 0x000C0012, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFE, 0x000C0013, 0x000C0012, 0x00000005, 0x00140163, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00800006, 0x00800002, 0x00000005, 0x00140164, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000010E, 0x00000005, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFE, 0x000C0013, 0x000C0012, 0x00000005, 0x00140165, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00800007, 0x00800007, 0x00000005, 0x00140166, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00800002, 0x00000043, 0x00000005, EndSpeech, 0x00000000, 0x00800006, 0x00800002, 0x00000005, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFE, 0x000C0013, 0x000C0012, 0x00000005, 0x00140167, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x000A0001, 0x00000046, 0x00000001, D_8024964C_AE44EC, 0x00000044, 0x00000001, D_8024959C_AE443C, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000003, 0x00600003, 0x00000043, 0x00000005, SetNpcPos, 0x00000003, 0xFFFFFE2A, 0x00000000, 0xFFFFFFE2, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000000, 0xF24A8E80, 0x00000043, 0x00000005, NpcMoveTo, 0x00000003, 0xFFFFFEAC, 0xFFFFFFE2, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000003, 0x00600001, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000007, SpeakToNpc, 0x00000003, 0x00600004, 0x00600001, 0x00000000, 0x00000000, 0x00140168, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00800002, 0x00000043, 0x00000003, SetNpcYaw, 0x00000000, 0x0000010E, 0x00000043, 0x00000003, SetNpcYaw, 0xFFFFFFFC, 0x0000010E, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x000000FA, 0x0000001E, 0x0000000A, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x000000FA, 0x0000001E, 0x0000000A, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF24F8E80, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24ABE80, 0xF24A4E80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, SetNpcPos, 0x00000003, 0x00000032, 0x00000000, 0xFFFFFFF6, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000003, 0x00600003, 0x00000043, 0x00000005, NpcMoveTo, 0x00000003, 0x000000B4, 0xFFFFFFF6, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000003, 0x00600001, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000007, SpeakToNpc, 0x00000000, 0x00800006, 0x00800002, 0x00000000, 0x00000003, 0x00140169, 0x00000043, 0x00000007, SpeakToNpc, 0x00000003, 0x00600004, 0x00600001, 0x00000000, 0x00000000, 0x0014016A, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x0080000D, 0x00000043, 0x00000005, GetNpcPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, NpcJump0, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00800002, 0x00000043, 0x00000007, SpeakToNpc, 0x00000000, 0x00800006, 0x00800002, 0x00000000, 0x00000003, 0x0014016B, 0x00000008, 0x00000001, 0x0000000A, 0x00000056, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8A80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000057, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000000, 0x0000010E, 0x0000000A, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00800006, 0x00800002, 0x00000000, 0x0014016C, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, SetNpcPos, 0x00000001, 0x00000030, 0x00000000, 0x00000046, 0x00000043, 0x00000005, SetNpcPos, 0x00000002, 0x00000064, 0x00000000, 0x00000046, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000001, 0x00000200, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000002, 0x00000200, 0x00000001, 0x00000008, 0x00000001, 0x0000000A, 0x00000046, 0x00000001, D_80248A10_AE38B0, 0x00000046, 0x00000001, D_80248C9C_AE3B3C, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00200008, 0x00000043, 0x00000005, LoadPath, 0x0000000F, D_802489EC_AE388C, 0x00000003, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, GetNextPathPos, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x0020000A, 0x00200002, 0x00000005, 0x0014016E, 0x00000043, 0x00000004, SetNpcVar, 0x00000000, 0x00000000, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000008, NpcFlyTo, 0xFFFFFFFC, 0x0000019A, 0x00000050, 0x0000000A, 0x00000007, 0x00000000, 0x00000000, 0x00000005, 0x00000001, 0x00000002, 0x00000043, 0x00000008, NpcFlyTo, 0xFFFFFFFC, 0x00000190, 0x00000046, 0x0000000A, 0x00000005, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000006, 0x00000000, 0x00000190, 0x00000046, 0x0000000A, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000008, NpcFlyTo, 0xFFFFFFFC, 0x0000019A, 0x00000050, 0x0000000A, 0x00000005, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000008, NpcFlyTo, 0xFFFFFFFC, 0x00000168, 0x00000050, 0x0000000A, 0x00000007, 0x00000000, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000008, NpcFlyTo, 0xFFFFFFFC, 0x00000168, 0x00000046, 0x0000000A, 0x00000005, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000006, 0x00000000, 0x00000168, 0x00000046, 0x0000000A, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000008, NpcFlyTo, 0xFFFFFFFC, 0x0000015E, 0x00000050, 0x0000000A, 0x00000005, 0x00000000, 0x00000000, 0x00000043, 0x00000004, GetNpcVar, 0x00000000, 0x00000000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000004, SetNpcVar, 0x00000000, 0x00000000, 0x00000002, 0x00000057, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00800006, 0x00800002, 0x00000005, 0x0014016F, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00800008, 0x00800002, 0x00000005, 0x00140170, 0x00000043, 0x00000004, SetNpcVar, 0x00000000, 0x00000000, 0x00000001, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000004, GetNpcVar, 0x00000000, 0x00000000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000002, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00800004, 0x00000043, 0x00000005, NpcMoveTo, 0x00000000, 0x00000136, 0x00000014, 0x00000005, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00800016, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000005A, 0x00000000, 0x00000043, 0x00000006, PlaySoundAt, 0x000000E1, 0x00000000, 0x0000015E, 0x00000050, 0x0000000A, 0x00000043, 0x0000000F, PlayEffect, 0x00000043, 0x00000000, 0x0000015E, 0x00000050, 0x0000000A, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000040, 0x00000001, 0x00000043, 0x00000003, SetNpcSpeed, 0xFFFFFFFC, 0xF24A9880, 0x00000043, 0x00000008, NpcFlyTo, 0xFFFFFFFC, 0x000001F4, 0x00000082, 0x0000000A, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFE, 0x000C001E, 0x000C001E, 0x00000005, 0x00140171, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00800002, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00800006, 0x00800002, 0x00000005, 0x00140172, 0x00000008, 0x00000001, 0x0000000A, 0x00000058, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000003, NpcFacePlayer, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000059, 0x00000000, 0x00000046, 0x00000001, D_802490EC_AE3F8C, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFE, 0x000D0008, 0x000D0008, 0x00000005, 0x00140173, 0x00000046, 0x00000001, D_80249298_AE4138, 0x00000008, 0x00000001, 0x0000001E, 0x00000046, 0x00000001, 0x802407A0, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kkj/kkj_15/AE5BA0.data.s b/ver/us/asm/data/world/area_kkj/kkj_15/AE5BA0.data.s deleted file mode 100644 index 2b4c5344a4..0000000000 --- a/ver/us/asm/data/world/area_kkj/kkj_15/AE5BA0.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240610_AE5BA0 -.word 0x43610000, 0x00000000, 0xC2A00000, 0x43870000, 0x42480000, 0x41200000, 0xC3160000, 0x43870000, 0xC36D0000, 0x00000000, 0xC0A00000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80240B60, D_80240610_AE5BA0, 0x00000003, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00190010, 0x00000014, 0x00000001, 0xF5DE0180, 0x0000001D, 0x00000001, 0xFFFFFF97, 0x0000001D, 0x00000001, 0xFFFFFFB4, 0x0000001D, 0x00000001, 0xFFFFFFF2, 0x0000001D, 0x00000001, 0x00000058, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000073, 0x00000000, 0x00000008, 0x00000020, 0x00000000, 0x0000001D, 0x00000001, 0xFFFFFFCA, 0x0000001D, 0x00000001, 0x00000006, 0x0000001D, 0x00000001, 0x00000026, 0x0000001D, 0x00000001, 0x0000003A, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000074, 0x00000000, 0x00000008, 0x00000020, 0x00000000, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kkj/kkj_15/AE5CE0.data.s b/ver/us/asm/data/world/area_kkj/kkj_15/AE5CE0.data.s deleted file mode 100644 index c08052838c..0000000000 --- a/ver/us/asm/data/world/area_kkj/kkj_15/AE5CE0.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240750_AE5CE0 -.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, kkj_15_UpdateTexturePanSmooth, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, kkj_15_UpdateTexturePanStepped, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kkj/kkj_15/AE5D80.data.s b/ver/us/asm/data/world/area_kkj/kkj_15/AE5D80.data.s deleted file mode 100644 index ce09d05cd0..0000000000 --- a/ver/us/asm/data/world/area_kkj/kkj_15/AE5D80.data.s +++ /dev/null @@ -1,15 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802407F0_AE5D80 -.word 0xE7000000, 0x00000000, 0xD7000002, 0xFFFFFFFF, 0xE3000A01, 0x00100000, 0xE3000C00, 0x00080000, 0xE3000D01, 0x00000000, 0xE3000F00, 0x00000000, 0xE3001001, 0x00000000, 0xE3001201, 0x00002000, 0xE3001402, 0x00000C00, 0xFA000000, 0x4B1F13FF, 0xFB000000, 0xFF764D00, 0xFC10E5E0, 0x230B1D52, 0xE200001C, 0x0C184B50, 0xD9FDFFFF, 0x00000000, 0xD9FFFFFF, 0x00200404, 0xDF000000, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0xF5DE01CE, 0x00000043, 0x00000001, func_8024030C_AE589C, 0x00000043, 0x00000002, PlaySound, 0x000000DC, 0x00000043, 0x00000004, GotoMapSpecial, 0x80247E50, 0x00000000, 0x0000000C, 0x00000008, 0x00000001, 0x00000064, 0x00000024, 0x00000002, 0xFE363C80, 0xF5DE01CE, 0x00000043, 0x00000001, func_8024030C_AE589C, 0x00000043, 0x00000002, PlaySound, 0x000000DC, 0x00000043, 0x00000004, GotoMapSpecial, 0x80247E58, 0x00000005, 0x0000000C, 0x00000008, 0x00000001, 0x00000064, 0x00000024, 0x00000002, 0xFE363C80, 0xF5DE01CE, 0x00000043, 0x00000001, func_8024030C_AE589C, 0x00000043, 0x00000002, PlaySound, 0x000000DC, 0x00000043, 0x00000004, GotoMapSpecial, 0x80247E60, 0x00000003, 0x0000000C, 0x00000008, 0x00000001, 0x00000064 - -dlabel D_80240960_AE5EF0 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000002, 0x00000024, 0x00000002, 0xFE363C82, 0x00000002, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFFFF, 0x00000044, 0x00000001, ExitSingleDoor, 0x00000008, 0x00000001, 0x00000011, 0x00000043, 0x00000003, GotoMap, 0x80247E68, 0x00000003, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240A04_AE5F94 -.word 0x00000047, 0x00000005, D_80240960_AE5EF0, 0x00000100, 0x00000002, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240A30_AE5FC0 -.word 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x00000002, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFFFF, 0x00000046, 0x00000001, EnterSingleDoor, 0x00000044, 0x00000001, D_80240A04_AE5F94, 0x00000016, 0x00000001, 0x00000001, 0x00000014, 0x00000001, 0xF5DE0180, 0x00000016, 0x00000001, 0xFFFFFFB4, 0x00000044, 0x00000001, 0x80241550, 0x00000044, 0x00000001, 0x80244AF4, 0x00000016, 0x00000001, 0xFFFFFFCA, 0x00000044, 0x00000001, 0x80241550, 0x00000044, 0x00000001, 0x80244C70, 0x00000016, 0x00000001, 0xFFFFFFF2, 0x00000044, 0x00000001, 0x802453F4, 0x0000001C, 0x00000000, 0x00000044, 0x00000001, 0x80241550, 0x00000044, 0x00000001, D_80240A04_AE5F94, 0x00000023, 0x00000000, 0x00000016, 0x00000001, 0x00000002, 0x00000044, 0x00000001, 0x80241A70, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0329, 0x0000001A, 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, 0x00000002, GetEntryID, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000002, 0x00000024, 0x00000002, 0xF5DE0180, 0xFFFFFF94, 0x00000023, 0x00000000, 0x00000014, 0x00000001, 0xF5DE0180, 0x00000016, 0x00000001, 0xFFFFFF94, 0x00000043, 0x00000003, MakeNpcs, 0x00000000, 0x80246F08, 0x00000016, 0x00000001, 0xFFFFFFB4, 0x00000043, 0x00000003, MakeNpcs, 0x00000000, 0x8024757C, 0x00000016, 0x00000001, 0xFFFFFFF2, 0x00000043, 0x00000003, MakeNpcs, 0x00000000, 0x80247E34, 0x00000023, 0x00000000, 0x0000000B, 0x00000002, 0xF5DE0180, 0xFFFFFFB4, 0x00000043, 0x00000003, EnableModel, 0x00000013, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x0000000A, 0x7FFFFE00, 0x00000013, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000020, 0x7FFFFE00, 0x00000043, 0x00000003, SetTexPanner, 0x0000004A, 0x00000000, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x00000028, 0x00000024, 0x00000002, 0xFE363C84, 0x00000384, 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_80240750_AE5CE0, 0x00000057, 0x00000000, 0x00000043, 0x00000004, SetModelCustomGfx, 0x0000004A, 0x00000000, 0xFFFFFFFF, 0x00000043, 0x00000004, SetCustomGfx, 0x00000000, D_802407F0_AE5D80, 0x00000000, 0x00000043, 0x00000003, SetTexPanner, 0x0000004E, 0x00000000, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x00000028, 0x00000024, 0x00000002, 0xFE363C84, 0x00000384, 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_80240750_AE5CE0, 0x00000057, 0x00000000, 0x00000043, 0x00000004, SetModelCustomGfx, 0x0000004E, 0x00000000, 0xFFFFFFFF, 0x00000043, 0x00000004, SetCustomGfx, 0x00000000, D_802407F0_AE5D80, 0x00000000, 0x00000043, 0x00000002, UseDoorSounds, 0x00000000, 0x00000044, 0x00000001, 0x80240680, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x0000000A, 0x00000002, 0xF5DE0180, 0xFFFFFFF2, 0x00000043, 0x00000002, StopSound, 0x00000093, 0x00000012, 0x00000000, 0x00000043, 0x00000006, PlaySoundAt, 0x00000093, 0x00000000, 0x00000032, 0x00000005, 0xFFFFFF38, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000044, 0x00000001, D_80240A30_AE5FC0, 0x00000008, 0x00000001, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kkj/kkj_15/AE65A0.data.s b/ver/us/asm/data/world/area_kkj/kkj_15/AE65A0.data.s deleted file mode 100644 index 04baa05877..0000000000 --- a/ver/us/asm/data/world/area_kkj/kkj_15/AE65A0.data.s +++ /dev/null @@ -1,15 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80241010_AE65A0 -.word 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x0000001A, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000005, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0x0000001C, 0x7FFFFE00, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C87, 0xFE363C80, 0xFE363C88, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C89, 0xFE363C80, 0xFE363C8A, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x000000B4, 0x00000043, 0x00000002, SetPlayerAnimation, 0x000C0011, 0x00000057, 0x00000000, 0x00000043, 0x00000006, PlaySoundAt, 0x00000093, 0x00000000, 0x00000032, 0x00000005, 0xFFFFFF38, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0xFFFFF8F8, 0x00000168, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000026, 0x00000002, 0xFE363C82, 0xFE363C80, 0x0000002F, 0x00000002, 0xFE363C82, 0x0000000A, 0x00000043, 0x00000006, RotateGroup, 0x0000005F, 0xFE363C82, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000001, func_80240340_AE58D0, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000002, StopSound, 0x00000093, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0x00000020, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0x00000005, 0x7FFFFE00, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802411DC_AE676C -.word 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x0000001A, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000005, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0x0000001C, 0x7FFFFE00, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C87, 0xFE363C80, 0xFE363C88, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C89, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000005, MakeLerp, 0xFFFFFABA, 0xFFFFF8F8, 0x0000005A, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000026, 0x00000002, 0xFE363C82, 0xFE363C80, 0x0000002F, 0x00000002, 0xFE363C82, 0x0000000A, 0x00000043, 0x00000006, RotateGroup, 0x0000005F, 0xFE363C82, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000001, func_80240340_AE58D0, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000002, StopSound, 0x00000093, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0x00000020, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0x00000005, 0x7FFFFE00, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024135C_AE68EC -.word 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x00000032, 0x0000000A, 0xFFFFFFDD, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x00000190, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x00000032, 0x0000000A, 0xFFFFFFDD, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000046, 0x00000001, D_802411DC_AE676C, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241408_AE6998 -.word 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x00000032, 0x0000000A, 0xFFFFFFDD, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x00000032, 0x00000023, 0xFFFFFFDD, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x000000C8, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000056, 0x00000000, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x00000032, 0x0000000A, 0xFFFFFFDD, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x00000190, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A7DB4, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000057, 0x00000000, 0x00000046, 0x00000001, D_802411DC_AE676C, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x00200009, 0x00200001, 0x00000000, 0x00140049, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetPlayerPos, 0x00000032, 0x0000000A, 0xFFFFFF06, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0x0000000A, 0x0000001E, 0xFFFFFF06, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000200, 0x00000000, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000010E, 0x00000000, 0x00000014, 0x00000001, 0xF5DE0180, 0x00000016, 0x00000001, 0xFFFFFFB4, 0x00000046, 0x00000001, D_80241408_AE6998, 0x0000001C, 0x00000000, 0x00000046, 0x00000001, D_8024135C_AE68EC, 0x00000023, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kkj/kkj_15/AE6BF0.data.s b/ver/us/asm/data/world/area_kkj/kkj_15/AE6BF0.data.s deleted file mode 100644 index 5bfe146a28..0000000000 --- a/ver/us/asm/data/world/area_kkj/kkj_15/AE6BF0.data.s +++ /dev/null @@ -1,21 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80241660_AE6BF0 -.word 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000006, PlaySoundAt, 0x00000055, 0x00000000, 0x00000064, 0x00000000, 0xFFFFFFD8, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000006, PlaySoundAt, 0x00000356, 0x00000000, 0x00000064, 0x00000000, 0xFFFFFFD8, 0x00000008, 0x00000001, 0x0000003C, 0x00000043, 0x00000006, PlaySoundAt, 0x0000037C, 0x00000000, 0x00000064, 0x00000000, 0xFFFFFFD8, 0x00000008, 0x00000001, 0x0000001E, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241708_AE6C98 -.word 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x0000001E, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x0000001E, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF250BA80, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24ABE80, 0xF24A4E80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802417BC_AE6D4C -.word 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFFFFFFCE, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFFFFFFCE, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF24F2A80, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24ABE80, 0xF24A4680, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241870_AE6E00 -.word 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x00000073, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x00000073, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF24E3A80, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24ABE80, 0xF24A4E80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241910_AE6EA0 -.word 0x00000043, 0x00000004, PlaySoundAtCollider, 0x00000002, 0x000001C1, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x00000078, 0x0000000E, 0x00000004, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateModel, 0x00000002, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802419C0_AE6F50 -.word 0x00000043, 0x00000005, MakeLerp, 0x00000078, 0x00000000, 0x00000008, 0x00000004, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateModel, 0x00000002, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x00000002, 0x000001C2, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000066, 0x00000000, 0x00000008, 0x00000043, 0x00000005, SetNpcPos, 0x00000000, 0xFFFFFFBA, 0x00000000, 0xFFFFFFC9, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000000, 0x0000005A, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00800002, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x000000ED, 0x00000000, 0xFFFFFFB6, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x000000ED, 0x00000000, 0xFFFFFFB6, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000008, 0x00000001, 0x0000001E, 0x00000044, 0x00000001, D_80241910_AE6EA0, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, SetNpcPos, 0x00000001, 0x0000010E, 0x00000000, 0xFFFFFFB2, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00600002, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000001, 0xF24A8680, 0x00000043, 0x00000005, NpcMoveTo, 0x00000001, 0x000000B4, 0xFFFFFFC9, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00600001, 0x00000046, 0x00000001, D_802419C0_AE6F50, 0x00000043, 0x00000007, SpeakToNpc, 0x00000001, 0x00600004, 0x00600001, 0x00000000, 0x00000000, 0x00140000, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00600002, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000001, 0xF24A8680, 0x00000043, 0x00000005, NpcMoveTo, 0x00000001, 0x00000000, 0xFFFFFFC9, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00600001, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000046, 0x00000001, D_802417BC_AE6D4C, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000007, SpeakToNpc, 0x00000000, 0x00800006, 0x00800002, 0x00000000, 0x00000001, 0x00140001, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFFFFFFEC, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF24DFE80, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24ABE80, 0xF24A4680, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8E80, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000007, SpeakToNpc, 0x00000001, 0x00600004, 0x00600001, 0x00000000, 0x00000000, 0x00140002, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFFFFFFCE, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF24E6280, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24ABE80, 0xF24A3680, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8280, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00800010, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000007, SpeakToNpc, 0x00000000, 0x00800009, 0x00800003, 0x00000000, 0x00000001, 0x00140003, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00800002, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000007, SpeakToNpc, 0x00000000, 0x00800006, 0x00800002, 0x00000000, 0x00000001, 0x00140004, 0x00000046, 0x00000001, D_802417BC_AE6D4C, 0x00000043, 0x00000007, SpeakToNpc, 0x00000001, 0x00600004, 0x00600001, 0x00000000, 0x00000000, 0x00140005, 0x00000043, 0x00000007, SpeakToNpc, 0x00000000, 0x00800006, 0x00800002, 0x00000000, 0x00000001, 0x00140006, 0x00000043, 0x00000003, FadeOutMusic, 0x00000000, 0x000007D0, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x00140007, 0x0000012C, 0x00000014, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000000, 0x00000262, 0x00000000, 0x00000043, 0x0000000A, ShowEmote, 0x00000000, 0x00000000, 0xFFFFFFD3, 0x00000014, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000001, 0x00000262, 0x00000000, 0x00000043, 0x0000000A, ShowEmote, 0x00000001, 0x00000000, 0xFFFFFFD3, 0x00000014, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000056, 0x00000000, 0x00000005, 0x00000001, 0x00000002, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000001, 0x0000005A, 0x00000007, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000001, 0x0000010E, 0x00000007, 0x00000008, 0x00000001, 0x00000005, 0x00000006, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000001, 0x0000005A, 0x00000007, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000056, 0x00000000, 0x00000005, 0x00000001, 0x00000002, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000000, 0x0000010E, 0x00000007, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000000, 0x0000005A, 0x00000007, 0x00000008, 0x00000001, 0x00000005, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000032, 0x00000046, 0x00000001, D_80241708_AE6C98, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000052, 0x00000000, 0x00000008, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x00140008, 0x0000012C, 0x00000014, 0x00000008, 0x00000001, 0x00000014, 0x00000056, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000003, 0x0000012C, 0x000000B4, 0xFFFFFFC4, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000003, 0x00660112, 0x00000043, 0x00000003, EnableNpcBlur, 0x00000003, 0x00000001, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000003, 0xF24A7C80, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000003, 0x00000200, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000003, 0x00000008, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0x00000003, 0x00000064, 0xFFFFFFD8, 0x00000012, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000003, 0x000003E9, 0x00010000, 0x00000043, 0x0000000F, PlayEffect, 0x00000006, 0x00000001, 0x00000064, 0x00000000, 0xFFFFFFD8, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, EnableNpcBlur, 0x00000003, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000003, 0x00660105, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000005, SetNpcPos, 0x00000002, 0x00000148, 0x000000B4, 0xFFFFFFF1, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x00660012, 0x00000043, 0x00000003, EnableNpcBlur, 0x00000002, 0x00000001, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000002, 0xF24A7C80, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000002, 0x00000200, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000002, 0x00000008, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0x00000002, 0x00000080, 0xFFFFFFF1, 0x00000012, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000002, 0x000003E9, 0x00010000, 0x00000043, 0x0000000F, PlayEffect, 0x00000006, 0x00000001, 0x00000080, 0x00000000, 0xFFFFFFF1, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, EnableNpcBlur, 0x00000002, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x00660005, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, SetNpcPos, 0x00000004, 0x00000154, 0x000000B4, 0xFFFFFFA6, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000004, 0x00660212, 0x00000043, 0x00000003, EnableNpcBlur, 0x00000004, 0x00000001, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000004, 0xF24A7C80, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000004, 0x00000200, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000004, 0x00000008, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0x00000004, 0x0000008C, 0xFFFFFFA6, 0x00000012, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000004, 0x000003E9, 0x00010000, 0x00000043, 0x0000000F, PlayEffect, 0x00000006, 0x00000001, 0x0000008C, 0x00000000, 0xFFFFFFA6, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, EnableNpcBlur, 0x00000004, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000004, 0x00660205, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000005, SetNpcPos, 0x00000005, 0x00000170, 0x000000B4, 0xFFFFFFD3, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000005, 0x00660312, 0x00000043, 0x00000003, EnableNpcBlur, 0x00000005, 0x00000001, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000005, 0xF24A7C80, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000005, 0x00000200, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000005, 0x00000008, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0x00000005, 0x000000A8, 0xFFFFFFD3, 0x00000012, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000005, 0x000003E9, 0x00010000, 0x00000043, 0x0000000F, PlayEffect, 0x00000006, 0x00000001, 0x000000A8, 0x00000000, 0xFFFFFFD3, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, EnableNpcBlur, 0x00000005, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000005, 0x00660305, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000032, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x00000080, 0x00000000, 0xFFFFFFF1, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x00000080, 0x00000000, 0xFFFFFFF1, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF24E3A80, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24ABE80, 0xF24A4E80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x0000000F, 0x00000056, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000003, 0x000020F3, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000003, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000005, 0x00000027, 0x00000002, 0xFE363C81, 0x0000001E, 0x00000043, 0x0000000F, PlayEffect, 0x0000001A, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000003, 0x0066011A, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000002, 0x000020F3, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000005, 0x00000027, 0x00000002, 0xFE363C81, 0x0000001E, 0x00000043, 0x0000000F, PlayEffect, 0x0000001A, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x0066001A, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000004, 0x000020F3, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000005, 0x00000027, 0x00000002, 0xFE363C81, 0x0000001E, 0x00000043, 0x0000000F, PlayEffect, 0x0000001A, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000004, 0x0066021A, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000005, 0x000020F3, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000005, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000005, 0x00000027, 0x00000002, 0xFE363C81, 0x0000001E, 0x00000043, 0x0000000F, PlayEffect, 0x0000001A, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000005, 0x0066031A, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000002D, 0x00000043, 0x00000007, SpeakToNpc, 0x00000003, 0x0066011A, 0x0066011A, 0x00000000, 0x00000000, 0x00140009, 0x00000008, 0x00000001, 0x0000000A, 0x00000046, 0x00000001, D_802417BC_AE6D4C, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000001, 0x0000010E, 0x00000000, 0x00000043, 0x00000007, SpeakToNpc, 0x00000000, 0x00800006, 0x00800002, 0x00000000, 0x00000001, 0x0014000A, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000003, 0x00660104, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x00660004, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000004, 0x00660204, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000005, 0x00660304, 0x00000046, 0x00000001, D_80241870_AE6E00, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000003, 0x00660102, 0x00000043, 0x00000005, NpcMoveTo, 0x00000003, 0x00000050, 0xFFFFFFD8, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000003, 0x00660104, 0x00000043, 0x00000007, SpeakToNpc, 0x00000003, 0x00660114, 0x00660104, 0x00000000, 0x00000000, 0x0014000B, 0x00000046, 0x00000001, D_80241708_AE6C98, 0x00000043, 0x00000005, SetNpcPos, 0x00000003, 0x00000050, 0x00000000, 0xFFFFFFD8, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000001, 0x0000005A, 0x00000005, 0x00000043, 0x00000007, SpeakToNpc, 0x00000001, 0x00600004, 0x00600001, 0x00000000, 0x00000002, 0x0014000C, 0x00000043, 0x00000007, SpeakToNpc, 0x00000003, 0x00660114, 0x00660104, 0x00000000, 0x00000000, 0x0014000D, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000003, 0x0000005A, 0x00000005, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000003, 0x00660114, 0x00660104, 0x00000005, 0x0014000E, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFFFFFFCE, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFFFFFFCE, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF24D9A80, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24ABE80, 0xF24A3280, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A7F4D, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x00000028, 0x00000045, 0x00000002, D_80241660_AE6BF0, 0xFE363C8B, 0x00000043, 0x00000004, func_80240500_AE5A90, 0x00000064, 0x00000000, 0xFFFFFFD8, 0x00000043, 0x00000002, EnableSpriteShading, 0x00000001, 0x00000043, 0x0000000F, PlayEffect, 0x00000035, 0x00000003, 0x00000064, 0x00000000, 0xFFFFFFD8, 0x00000001, 0xFE363C8A, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000007, SpeakToNpc, 0x00000000, 0x00800006, 0x00800002, 0x00000000, 0x00000002, 0x0014000F, 0x00000008, 0x00000001, 0x00000014, 0x00000049, 0x00000001, 0xFE363C8B, 0x00000043, 0x00000002, func_802D7B10, 0xFE363C8A, 0x00000043, 0x00000002, EnableSpriteShading, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000046, 0x00000001, D_80241870_AE6E00, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000007, SpeakToNpc, 0x00000003, 0x00660114, 0x00660104, 0x00000000, 0x00000000, 0x00140010, 0x00000046, 0x00000001, D_80241708_AE6C98, 0x00000043, 0x00000007, SpeakToNpc, 0x00000000, 0x00800006, 0x00800002, 0x00000000, 0x00000002, 0x00140011, 0x00000043, 0x00000007, SpeakToNpc, 0x00000003, 0x00660114, 0x00660104, 0x00000000, 0x00000000, 0x00140012, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFFFFFFCE, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF24E6280, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24ABE80, 0xF24A3680, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000007, SpeakToNpc, 0x00000000, 0x00800006, 0x00800002, 0x00000000, 0x00000002, 0x00140013, 0x00000046, 0x00000001, D_80241870_AE6E00, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, FadeOutMusic, 0x00000000, 0x000001F4, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000004, 0x00000262, 0x00000000, 0x00000043, 0x0000000A, ShowEmote, 0x00000004, 0x00000000, 0xFFFFFFD3, 0x00000014, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000003, 0x00000262, 0x00000000, 0x00000043, 0x0000000A, ShowEmote, 0x00000003, 0x00000000, 0xFFFFFFD3, 0x00000014, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000005, 0x00000262, 0x00000000, 0x00000043, 0x0000000A, ShowEmote, 0x00000005, 0x00000000, 0xFFFFFFD3, 0x00000014, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000002, 0x00000262, 0x00000000, 0x00000043, 0x0000000A, ShowEmote, 0x00000002, 0x00000000, 0xFFFFFFD3, 0x00000014, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000007, SpeakToNpc, 0x00000003, 0x00660114, 0x00660104, 0x00000000, 0x00000000, 0x00140014, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x0000001E, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x00000190, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24ABE80, 0xF24A4E80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8E80, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000003, 0x0066010A, 0x00000043, 0x00000006, NpcJump0, 0x00000003, 0x00000050, 0x00000000, 0xFFFFFFD8, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000003, 0x00660104, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x0066000A, 0x00000043, 0x00000006, NpcJump0, 0x00000002, 0x00000080, 0x00000000, 0xFFFFFFF1, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x00660004, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000004, 0x0066020A, 0x00000043, 0x00000006, NpcJump0, 0x00000004, 0x0000008C, 0x00000000, 0xFFFFFFA6, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000004, 0x00660204, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000005, 0x0066030A, 0x00000043, 0x00000006, NpcJump0, 0x00000005, 0x000000A8, 0x00000000, 0xFFFFFFD3, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000005, 0x00660304, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x0000001E, 0xF24A7E80, 0x00000057, 0x00000000, 0x00000043, 0x00000007, SpeakToNpc, 0x00000000, 0x00800006, 0x00800002, 0x00000000, 0x00000003, 0x00140015, 0x00000056, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000003, 0x00000173, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000003, 0x0000005A, 0x00000000, 0x00000043, 0x00000003, EnableNpcBlur, 0x00000003, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000003, 0x00660103, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000003, 0x00000174, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0x00000003, 0x000000C8, 0xFFFFFFC4, 0x0000000A, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000002, 0x0000005A, 0x00000000, 0x00000043, 0x00000003, EnableNpcBlur, 0x00000002, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x00660003, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000003, EnableNpcBlur, 0x00000002, 0x00000001, 0x00000043, 0x00000005, NpcMoveTo, 0x00000002, 0x000000C8, 0xFFFFFFC4, 0x0000000A, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000004, 0x0000005A, 0x00000000, 0x00000043, 0x00000003, EnableNpcBlur, 0x00000004, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000004, 0x00660203, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000003, EnableNpcBlur, 0x00000004, 0x00000001, 0x00000043, 0x00000005, NpcMoveTo, 0x00000004, 0x000000C8, 0xFFFFFFC4, 0x0000000A, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000005, 0x0000005A, 0x00000000, 0x00000043, 0x00000003, EnableNpcBlur, 0x00000005, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000005, 0x00660303, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000003, EnableNpcBlur, 0x00000005, 0x00000001, 0x00000043, 0x00000005, NpcMoveTo, 0x00000005, 0x000000C8, 0xFFFFFFC4, 0x0000000A, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000046, 0x00000001, 0x80240870, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kkj/kkj_15/AE8A50.data.s b/ver/us/asm/data/world/area_kkj/kkj_15/AE8A50.data.s deleted file mode 100644 index 51b8cd9628..0000000000 --- a/ver/us/asm/data/world/area_kkj/kkj_15/AE8A50.data.s +++ /dev/null @@ -1,24 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802434C0_AE8A50 -.word 0xC28C0000, 0x42F00000, 0xC28C0000, 0xC2200000, 0x42DC0000, 0xC28C0000, 0xC1200000, 0x42F00000, 0xC28C0000, 0x41A00000, 0x42DC0000, 0xC28C0000, 0x42480000, 0x42F00000, 0xC28C0000, 0x42A00000, 0x42DC0000, 0xC28C0000, 0x42DC0000, 0x42F00000, 0xC28C0000, 0x430C0000, 0x42DC0000, 0xC28C0000, 0x432A0000, 0x42F00000, 0xC28C0000, 0x43480000, 0x42DC0000, 0xC28C0000, 0x43660000, 0x42F00000, 0xC28C0000 - -dlabel D_80243544_AE8AD4 -.word 0x43660000, 0x42F00000, 0xC28C0000, 0x435C0000, 0x42700000, 0xC28C0000, 0x437A0000, 0x42200000, 0xC28C0000 - -dlabel D_80243568_AE8AF8 -.word 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C80, 0x0000000A, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, SetNpcVar, 0x00000001, 0x00000000, 0x00000001, 0x00000056, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C80, 0x0000001A, 0x00000028, 0x00000002, 0xFE363C82, 0x00000002, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00580006, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000001, 0xF24A8E80, 0x00000043, 0x00000005, NpcMoveTo, 0x00000001, 0xFE363C80, 0xFE363C82, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00580001, 0x00000043, 0x00000003, NpcFacePlayer, 0x00000001, 0x00000005, 0x00000043, 0x00000004, SetNpcVar, 0x00000001, 0x00000000, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x0000001A, 0x00000027, 0x00000002, 0xFE363C82, 0x00000002, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x00580006, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000002, 0xF24A8E80, 0x00000043, 0x00000005, NpcMoveTo, 0x00000002, 0xFE363C80, 0xFE363C82, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x00580001, 0x00000043, 0x00000003, NpcFacePlayer, 0x00000002, 0x00000005, 0x00000057, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000004, GetNpcVar, 0x00000001, 0x00000000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802437CC_AE8D5C -.word 0x00000056, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000005, 0x00000043, 0x00000005, NpcMoveTo, 0x00000001, 0xFE363C80, 0xFE363C82, 0x00000005, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00580012, 0x00000027, 0x00000002, 0xFE363C80, 0x00000005, 0x00000043, 0x00000005, NpcMoveTo, 0x00000001, 0xFE363C80, 0xFE363C82, 0x00000005, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C80, 0x00000005, 0x00000043, 0x00000005, NpcMoveTo, 0x00000002, 0xFE363C80, 0xFE363C82, 0x00000005, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x00580012, 0x00000028, 0x00000002, 0xFE363C80, 0x00000005, 0x00000043, 0x00000005, NpcMoveTo, 0x00000002, 0xFE363C80, 0xFE363C82, 0x00000005, 0x00000057, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, SetPlayerAnimation, 0x000C0005, 0x00000008, 0x00000001, 0x00000001, 0x00000005, 0x00000001, 0x00000004, 0x00000027, 0x00000002, 0xFE363C81, 0x00000002, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x000C0018, 0x00000028, 0x00000002, 0xFE363C80, 0x0000000A, 0x00000005, 0x00000001, 0x00000005, 0x00000027, 0x00000002, 0xFE363C81, 0x00000004, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802439F0_AE8F80 -.word 0x00000043, 0x00000004, InterpNpcYaw, 0x00000002, 0x0000005A, 0x00000003, 0x00000008, 0x00000001, 0x0000000A, 0x00000056, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x0000000A, 0x00000027, 0x00000002, 0xFE363C82, 0x00000002, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0x0000001E, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000004, SetNpcVar, 0x00000001, 0x00000000, 0x00000001, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00580014, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000001, 0xF24A9880, 0x00000043, 0x00000005, NpcMoveTo, 0x00000001, 0x000000F9, 0xFFFFFFB8, 0x00000000, 0x00000043, 0x00000004, SetNpcVar, 0x00000001, 0x00000000, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x00580014, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000002, 0xF24A9880, 0x00000043, 0x00000005, NpcMoveTo, 0x00000002, 0x00000119, 0xFFFFFFBC, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0x00000000, 0xFE363C82, 0x00000043, 0x00000004, GetNpcVar, 0x00000001, 0x00000000, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80243C20_AE91B0 -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x00200009, 0x00200001, 0x00000000, 0x0014004A, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80243C8C_AE921C -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000003, SetCamLeadPlayer, 0x00000000, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x00000032, 0x00000000, 0x00000025, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFFFFFF13, 0x00000000, 0x00000025, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x0000012C, 0x00000043, 0x00000004, SetCamPosA, 0x00000000, 0xFFFFFF4C, 0xFFFFFFEC, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000057, 0x00000000, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00200000, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFFFFFF5C, 0x00000000, 0xFFFFFFCB, 0x00000043, 0x00000003, InterpPlayerYaw, 0x000000E1, 0x00000000, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00200000, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFC, 0xFFFFFF1F, 0x00000032, 0xFFFFFFB0, 0x00000014, 0x00000043, 0x00000003, NpcFacePlayer, 0xFFFFFFFC, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x00200009, 0x00200001, 0x00000005, 0x0014004B, 0x00000043, 0x00000002, SetPlayerAnimation, 0x000C000C, 0x00000043, 0x00000002, ShowChoice, 0x001E0022, 0x00000043, 0x00000002, SetPlayerAnimation, 0x000A0001, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFC, 0x00200009, 0x00200001, 0x00000005, 0x0014004C, 0x00000043, 0x00000008, NpcFlyTo, 0xFFFFFFFC, 0xFFFFFF2E, 0x00000028, 0xFFFFFFBA, 0x00000014, 0x00000000, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x00200009, 0x00200001, 0x00000000, 0x0014004D, 0x00000043, 0x00000002, SetPlayerAnimation, 0x000C000C, 0x00000043, 0x00000002, ShowChoice, 0x001E0023, 0x00000043, 0x00000002, SetPlayerAnimation, 0x000A0001, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFC, 0x00200009, 0x00200001, 0x00000000, 0x0014004E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x000C0005, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x0020000E, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFC, 0xFFFFFF2E, 0x00000028, 0xFFFFFFBA, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00200001, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x0020000C, 0x0020000C, 0x00000000, 0x0014004F, 0x00000043, 0x00000002, SetPlayerAnimation, 0x000A0001, 0x00000043, 0x00000002, ShowChoice, 0x001E0024, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFC, 0x00200009, 0x00200001, 0x00000000, 0x00140050, 0x00000043, 0x00000002, ShowChoice, 0x001E0025, 0x00000013, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFC, 0x00200009, 0x00200001, 0x00000000, 0x00140051, 0x00000043, 0x00000002, SetPlayerAnimation, 0x000C0005, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x0020000E, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFC, 0xFFFFFF2E, 0x00000028, 0xFFFFFFBA, 0x0000000A, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFC, 0xFFFFFF2E, 0x00000028, 0xFFFFFFBA, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x0020000C, 0x0020000C, 0x00000000, 0x00140052, 0x00000043, 0x00000002, SetPlayerAnimation, 0x000A0001, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFE, 0x000C0007, 0x000C0008, 0x00000005, 0x00140053, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x0020000C, 0x0020000C, 0x00000000, 0x00140054, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000005A, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00200005, 0x00000043, 0x00000008, NpcFlyTo, 0xFFFFFFFC, 0xFFFFFF4C, 0x00000028, 0xFFFFFF9C, 0x0000000A, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000066, 0x00000000, 0x00000008, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x000000ED, 0x00000000, 0x00000025, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24ABE80, 0xF24A4A80, 0x00000043, 0x00000004, SetCamPosB, 0x00000000, 0x000000AA, 0xFFFFFFEC, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000008, 0x00000001, 0x0000001E, 0x00000056, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x00000002, 0x000001C1, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x00000078, 0x00000014, 0x00000008, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateModel, 0x00000002, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, SetNpcPos, 0x00000000, 0x00000118, 0x00000000, 0xFFFFFFBA, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00800004, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000000, 0xF24A8680, 0x00000043, 0x00000005, NpcMoveTo, 0x00000000, 0x000000AA, 0xFFFFFFD8, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00800002, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00800006, 0x00800002, 0x00000005, 0x00140055, 0x00000056, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x000C0011, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFFFFFF92, 0x00000000, 0xFFFFFFD8, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF24F2A80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x0020000E, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFC, 0xFFFFFF58, 0x00000026, 0xFFFFFF90, 0x0000000A, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x000C000E, 0x00000057, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00800004, 0x00000043, 0x00000005, NpcMoveTo, 0x00000000, 0xFFFFFFBA, 0xFFFFFFD8, 0x00000050, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00800002, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x0080000D, 0x00000043, 0x00000006, NpcJump0, 0x00000000, 0xFFFFFFBA, 0x00000000, 0xFFFFFFD8, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00800008, 0x00800002, 0x00000000, 0x00140056, 0x00000043, 0x00000006, NpcJump0, 0x00000000, 0xFFFFFFBA, 0x00000000, 0xFFFFFFD8, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00800002, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00800008, 0x00800002, 0x00000000, 0x00140057, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x000000F0, 0x00000000, 0x00000025, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x000000F0, 0x00000000, 0x00000025, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF250BA80, 0x00000043, 0x00000004, SetCamPosB, 0x00000000, 0x00000086, 0xFFFFFFEC, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000005, SetNpcPos, 0x00000000, 0xFFFFFF9C, 0x00000000, 0xFFFFFFBA, 0x00000043, 0x00000003, SetNpcYaw, 0x00000000, 0x0000005A, 0x00000043, 0x00000005, SetNpcPos, 0x00000001, 0x00000118, 0x00000000, 0xFFFFFFBA, 0x00000043, 0x00000005, SetNpcPos, 0x00000002, 0x00000136, 0x00000000, 0xFFFFFFBA, 0x00000043, 0x00000004, SetPlayerPos, 0xFFFFFF78, 0x00000000, 0xFFFFFFEC, 0x00000056, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000004, NpcFaceNpc, 0x00000000, 0x00000002, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000004, SetNpcVar, 0x00000001, 0x00000000, 0x00000001, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00580006, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000001, 0xF24A8E80, 0x00000043, 0x00000005, NpcMoveTo, 0x00000001, 0xFFFFFFCE, 0xFFFFFFE2, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00580001, 0x00000043, 0x00000004, SetNpcVar, 0x00000001, 0x00000000, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x00580006, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000002, 0xF24A8E80, 0x00000043, 0x00000005, NpcMoveTo, 0x00000002, 0xFFFFFFEC, 0xFFFFFFE2, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x00580001, 0x00000057, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C80, 0x00000028, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000004, GetNpcVar, 0x00000001, 0x00000000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000007, SpeakToNpc, 0x00000001, 0x00580008, 0x00580001, 0x00000005, 0x00000000, 0x00140058, 0x00000043, 0x00000007, SpeakToNpc, 0x00000000, 0x00800006, 0x00800002, 0x00000005, 0x00000001, 0x00140059, 0x00000043, 0x00000007, SpeakToNpc, 0x00000001, 0x00580008, 0x00580001, 0x00000005, 0x00000000, 0x0014005A, 0x00000046, 0x00000001, D_80243568_AE8AF8, 0x00000046, 0x00000001, D_802437CC_AE8D5C, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFE, 0x000C0018, 0x000C0018, 0x00000005, 0x0014005B, 0x00000046, 0x00000001, D_802439F0_AE8F80, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFFFFFFBA, 0x00000078, 0xFFFFFFBA, 0x00000043, 0x00000005, LoadPath, 0x00000050, D_802434C0_AE8A50, 0x0000000B, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, GetNextPathPos, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00200010, 0x00000005, 0x00000001, 0x00000002, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0x0000010E, 0x00000007, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0x0000005A, 0x00000007, 0x00000008, 0x00000001, 0x00000005, 0x00000006, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0x0000010E, 0x00000007, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00200005, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0x0000005A, 0x00000007, 0x00000043, 0x00000005, LoadPath, 0x0000000F, D_80243544_AE8AD4, 0x00000003, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, GetNextPathPos, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000003, FadeOutMusic, 0x00000000, 0x000003E8, 0x00000046, 0x00000001, 0x802408C0, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80243C8C_AE921C, 0x00000100, 0x00000008, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80243C20_AE91B0, 0x00000100, 0x00000002, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kkj/kkj_15/AEA0D0.data.s b/ver/us/asm/data/world/area_kkj/kkj_15/AEA0D0.data.s deleted file mode 100644 index a9df870bb5..0000000000 --- a/ver/us/asm/data/world/area_kkj/kkj_15/AEA0D0.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80244B40_AEA0D0 -.word 0x0000000A, 0x00000002, 0xF9718886, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x00200009, 0x00200001, 0x00000000, 0x0014006B, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000002, 0x00000024, 0x00000002, 0xFE363C82, 0x00000002, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFFFF, 0x00000044, 0x00000001, ExitSingleDoor, 0x00000008, 0x00000001, 0x00000011, 0x0000000A, 0x00000002, 0xF9718886, 0x00000000, 0x00000043, 0x00000003, GotoMap, 0x80247E70, 0x00000007, 0x00000012, 0x00000000, 0x00000043, 0x00000003, GotoMap, 0x80247E70, 0x00000003, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80244B40_AEA0D0, 0x00000100, 0x00000002, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kkj/kkj_15/AEA230.data.s b/ver/us/asm/data/world/area_kkj/kkj_15/AEA230.data.s deleted file mode 100644 index ab4cd19c55..0000000000 --- a/ver/us/asm/data/world/area_kkj/kkj_15/AEA230.data.s +++ /dev/null @@ -1,21 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80244CA0_AEA230 -.word 0x42C80000, 0x42480000, 0xC3200000, 0x41F00000, 0x42F00000, 0xC2F00000, 0x42480000, 0x43480000, 0xC2A00000 - -dlabel D_80244CC4_AEA254 -.word 0x42480000, 0x43480000, 0xC28C0000, 0x42A00000, 0x42DC0000, 0xC28C0000, 0x42DC0000, 0x42F00000, 0xC28C0000, 0x430C0000, 0x42DC0000, 0xC28C0000, 0x432A0000, 0x42F00000, 0xC28C0000, 0x43480000, 0x42DC0000, 0xC28C0000, 0x43660000, 0x42F00000, 0xC28C0000 - -dlabel D_80244D18_AEA2A8 -.word 0x43660000, 0x42F00000, 0xC28C0000, 0x435C0000, 0x42700000, 0xC28C0000, 0x437A0000, 0x42200000, 0xC28C0000 - -dlabel D_80244D3C_AEA2CC -.word 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C80, 0x0000000A, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, SetNpcVar, 0x00000002, 0x00000000, 0x00000001, 0x00000056, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C80, 0x0000001A, 0x00000028, 0x00000002, 0xFE363C82, 0x00000002, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x00580006, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000002, 0xF24A8E80, 0x00000043, 0x00000005, NpcMoveTo, 0x00000002, 0xFE363C80, 0xFE363C82, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x00580001, 0x00000043, 0x00000003, NpcFacePlayer, 0x00000002, 0x00000005, 0x00000043, 0x00000004, SetNpcVar, 0x00000002, 0x00000000, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x0000001A, 0x00000027, 0x00000002, 0xFE363C82, 0x00000002, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000003, 0x00580006, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000003, 0xF24A8E80, 0x00000043, 0x00000005, NpcMoveTo, 0x00000003, 0xFE363C80, 0xFE363C82, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000003, 0x00580001, 0x00000043, 0x00000003, NpcFacePlayer, 0x00000003, 0x00000005, 0x00000057, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000004, GetNpcVar, 0x00000002, 0x00000000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80244FA0_AEA530 -.word 0x00000056, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000005, 0x00000043, 0x00000005, NpcMoveTo, 0x00000002, 0xFE363C80, 0xFE363C82, 0x00000005, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x00580012, 0x00000027, 0x00000002, 0xFE363C80, 0x00000005, 0x00000043, 0x00000005, NpcMoveTo, 0x00000002, 0xFE363C80, 0xFE363C82, 0x00000005, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000003, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C80, 0x00000005, 0x00000043, 0x00000005, NpcMoveTo, 0x00000003, 0xFE363C80, 0xFE363C82, 0x00000005, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000003, 0x00580012, 0x00000028, 0x00000002, 0xFE363C80, 0x00000005, 0x00000043, 0x00000005, NpcMoveTo, 0x00000003, 0xFE363C80, 0xFE363C82, 0x00000005, 0x00000057, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, SetPlayerAnimation, 0x000C0005, 0x00000008, 0x00000001, 0x00000001, 0x00000005, 0x00000001, 0x00000004, 0x00000027, 0x00000002, 0xFE363C81, 0x00000002, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x000C0018, 0x00000028, 0x00000002, 0xFE363C80, 0x0000000A, 0x00000005, 0x00000001, 0x00000005, 0x00000027, 0x00000002, 0xFE363C81, 0x00000004, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802451C4_AEA754 -.word 0x00000043, 0x00000004, InterpNpcYaw, 0x00000003, 0x0000005A, 0x00000003, 0x00000008, 0x00000001, 0x0000000A, 0x00000056, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x0000000A, 0x00000027, 0x00000002, 0xFE363C82, 0x00000002, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0x0000001E, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000004, SetNpcVar, 0x00000002, 0x00000000, 0x00000001, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x00580014, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000002, 0xF24A9880, 0x00000043, 0x00000005, NpcMoveTo, 0x00000002, 0x000000F9, 0xFFFFFFB8, 0x00000000, 0x00000043, 0x00000004, SetNpcVar, 0x00000002, 0x00000000, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000003, 0x00580014, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000003, 0xF24A9880, 0x00000043, 0x00000005, NpcMoveTo, 0x00000003, 0x00000119, 0xFFFFFFBC, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0x00000000, 0xFE363C82, 0x00000043, 0x00000004, GetNpcVar, 0x00000002, 0x00000000, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000066, 0x00000000, 0x00000008, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000010E, 0x00000000, 0x00000043, 0x00000004, SetPlayerPos, 0x00000032, 0x0000000A, 0xFFFFFF06, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0x0000000A, 0x00000032, 0xFFFFFF06, 0x00000043, 0x00000005, SetNpcPos, 0x00000000, 0xFFFFFFCE, 0x00000000, 0xFFFFFFEC, 0x00000043, 0x00000005, SetNpcPos, 0x00000001, 0xFFFFFF7E, 0x00000000, 0xFFFFFFEC, 0x00000043, 0x00000003, SetNpcYaw, 0x00000000, 0x0000010E, 0x00000043, 0x00000003, SetNpcYaw, 0x00000001, 0x0000005A, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFFFFFFCE, 0x00000000, 0xFFFFFFEC, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFFFFFFCE, 0x00000000, 0xFFFFFFEC, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x0000012C, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000007, SpeakToNpc, 0x00000000, 0x00800008, 0x00800002, 0x00000000, 0x00000001, 0x00140082, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8E80, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x00000190, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFFFFFFCE, 0x00000000, 0xFFFFFFEC, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000007, SpeakToNpc, 0x00000001, 0x00600004, 0x00600001, 0x00000000, 0x00000000, 0x00140083, 0x00000056, 0x00000000, 0x00000046, 0x00000001, D_80241010_AE65A0, 0x00000043, 0x00000002, SetPlayerAnimation, 0x000C0005, 0x00000043, 0x00000003, PlaySoundAtPlayer, 0x00000262, 0x00000000, 0x00000043, 0x0000000A, ShowEmote, 0x00000000, 0x00000000, 0x00000000, 0x0000001E, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x000C0011, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000168, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0x00000064, 0x00000032, 0xFFFFFF60, 0x00000043, 0x00000005, LoadPath, 0x0000001E, D_80244CA0_AEA230, 0x00000003, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, GetNextPathPos, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000007, SpeakToNpc, 0x00000000, 0x00800008, 0x00800002, 0x00000000, 0x00000001, 0x00140084, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x0080000F, 0x00000008, 0x00000001, 0x0000003C, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x0080000C, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00800002, 0x00000043, 0x00000007, SpeakToNpc, 0x00000000, 0x00800006, 0x00800002, 0x00000000, 0x00000001, 0x00140085, 0x00000043, 0x00000007, SpeakToNpc, 0x00000001, 0x00600004, 0x00600001, 0x00000000, 0x00000000, 0x00140086, 0x00000043, 0x00000007, SpeakToNpc, 0x00000000, 0x00800006, 0x00800002, 0x00000000, 0x00000001, 0x00140087, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x0080000C, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000000, 0x0000005A, 0x00000007, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000000, 0x0000010E, 0x00000007, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000000, 0x0000005A, 0x00000007, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00800002, 0x00000043, 0x00000007, SpeakToNpc, 0x00000000, 0x00800006, 0x00800002, 0x00000000, 0x00000000, 0x00140088, 0x00000043, 0x00000002, SetPlayerAnimation, 0x000C0009, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000000, 0x00000262, 0x00000000, 0x00000043, 0x0000000A, ShowEmote, 0x00000000, 0x00000000, 0xFFFFFFD3, 0x0000001E, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000001, 0x00000262, 0x00000000, 0x00000043, 0x0000000A, ShowEmote, 0x00000001, 0x00000000, 0xFFFFFFD3, 0x0000001E, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000004, SetNpcVar, 0x00000000, 0x00000000, 0x00000001, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x0080000D, 0x00000043, 0x00000006, NpcJump0, 0x00000000, 0xFFFFFFCE, 0x00000000, 0xFFFFFFEC, 0x0000000A, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00600005, 0x00000043, 0x00000006, NpcJump0, 0x00000001, 0xFFFFFF7E, 0x00000000, 0xFFFFFFEC, 0x0000000A, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x000C0005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x000C0011, 0x00000008, 0x00000001, 0x0000003C, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000001, func_802405D0_AE5B60, 0x00000043, 0x00000002, SetPlayerAnimation, 0x000C000E, 0x00000043, 0x00000004, func_802D1270, 0x0000001E, 0xFFFFFFF6, 0xF24A8280, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000001, func_802405EC_AE5B7C, 0x00000043, 0x00000004, SetNpcVar, 0x00000000, 0x00000000, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x0080000D, 0x0080000D, 0x00000000, 0x00140089, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00800002, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00600001, 0x00000043, 0x00000006, ContinueSpeech, 0x00000000, 0x00800008, 0x00800002, 0x00000000, 0x0014008A, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000004, GetNpcVar, 0x00000000, 0x00000000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x0080000C, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00800002, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00800006, 0x00800002, 0x00000000, 0x0014008B, 0x00000043, 0x00000002, ShowChoice, 0x001E0026, 0x00000024, 0x00000002, 0xF5DE0258, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000002, 0x00000024, 0x00000002, 0xF9718888, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0x00000000, 0x00800006, 0x00800002, 0x00000000, 0x0014008C, 0x00000043, 0x00000002, ShowChoice, 0x001E0027, 0x00000024, 0x00000002, 0xF5DE0259, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000002, 0x00000024, 0x00000002, 0xF9718888, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0x00000000, 0x00800006, 0x00800002, 0x00000000, 0x0014008D, 0x00000043, 0x00000002, ShowChoice, 0x001E0028, 0x00000024, 0x00000002, 0xF5DE025A, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000002, 0x00000024, 0x00000002, 0xF9718888, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0x00000000, 0x00800007, 0x00800002, 0x00000000, 0x0014008E, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000000, 0x0000010E, 0x00000007, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00800006, 0x00800002, 0x00000005, 0x0014008F, 0x0000000A, 0x00000002, 0xF9718888, 0x00000000, 0x00000043, 0x00000007, SpeakToNpc, 0x00000001, 0x00600004, 0x00600001, 0x00000000, 0x00000000, 0x00140090, 0x00000012, 0x00000000, 0x00000043, 0x00000007, SpeakToNpc, 0x00000001, 0x00600004, 0x00600001, 0x00000000, 0x00000000, 0x00140091, 0x00000013, 0x00000000, 0x00000043, 0x00000007, SpeakToNpc, 0x00000000, 0x00800007, 0x00800002, 0x00000000, 0x00000001, 0x00140092, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00800002, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000000, 0x0000005A, 0x00000007, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, ContinueSpeech, 0x00000000, 0x00800006, 0x00800002, 0x00000005, 0x00140093, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00800002, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000000, 0x0000005A, 0x00000007, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x00600004, 0x00600001, 0x00000005, 0x00140094, 0x00000043, 0x00000006, RotateModel, 0x00000002, 0x00000078, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000002, 0x000000F9, 0x00000000, 0xFFFFFFBA, 0x00000043, 0x00000005, SetNpcPos, 0x00000003, 0x00000119, 0x00000000, 0xFFFFFFBA, 0x00000043, 0x00000007, SpeakToNpc, 0x00000002, 0x00580008, 0x00580001, 0x00000000, 0x00000000, 0x00140095, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000005A, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x000A0001, 0x00000046, 0x00000001, D_80244D3C_AEA2CC, 0x00000046, 0x00000001, D_80244FA0_AEA530, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFE, 0x000C0018, 0x000C0018, 0x00000005, 0x00140096, 0x00000046, 0x00000001, D_802451C4_AEA754, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0x0000005A, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x0020000E, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000001, 0x00000043, 0x00000005, LoadPath, 0x00000050, D_80244CC4_AEA254, 0x00000007, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, GetNextPathPos, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00200010, 0x00000005, 0x00000001, 0x00000002, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0x0000010E, 0x00000007, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0x0000005A, 0x00000007, 0x00000008, 0x00000001, 0x00000005, 0x00000006, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0x0000010E, 0x00000007, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00200005, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0x0000005A, 0x00000007, 0x00000043, 0x00000005, LoadPath, 0x0000000F, D_80244D18_AEA2A8, 0x00000003, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, GetNextPathPos, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000003, FadeOutMusic, 0x00000000, 0x000003E8, 0x00000046, 0x00000001, 0x80240910, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kkj/kkj_15/AEB820.data.s b/ver/us/asm/data/world/area_kkj/kkj_15/AEB820.data.s deleted file mode 100644 index e00179909e..0000000000 --- a/ver/us/asm/data/world/area_kkj/kkj_15/AEB820.data.s +++ /dev/null @@ -1,39 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80246290_AEB820 -.word 0x00000000, 0x004B0048, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000 - -dlabel D_802462BC_AEB84C -.word 0x00000000, 0x0028001E, 0x00000000, 0x00000000, 0x00000000, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x001A0000 - -dlabel D_802462E8_AEB878 -.word 0x00000000, 0x00220018, 0x00000000, 0x00000000, 0x00000000, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00630000 - -dlabel D_80246314_AEB8A4 -.word 0x00800000, 0x00800002, 0x00800003, 0x00800006, 0x00800009, 0x00800010, 0xFFFFFFFF - -dlabel D_80246330_AEB8C0 -.word 0x00600001, 0x00600002, 0x00600004, 0xFFFFFFFF - -dlabel D_80246340_AEB8D0 -.word 0x00660002, 0x00660003, 0x00660004, 0x00660005, 0x0066000A, 0x00660011, 0x00660012, 0x00660014, 0x0066001A, 0xFFFFFFFF - -dlabel D_80246368_AEB8F8 -.word 0x00000000, D_80246290_AEB820, 0x00000000, 0xC3FA0000, 0x00000000, 0x00000D0D, 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, 0x00800002, 0x00800002, 0x00800002, 0x00800002, 0x00800002, 0x00800002, 0x00800002, 0x00800002, 0x00800002, 0x00800002, 0x00800002, 0x00800002, 0x00800002, 0x00800002, 0x00800002, 0x00800002, 0x00000000, 0x00000000, D_80246314_AEB8A4, 0x00000000, 0x00000001, D_802462BC_AEB84C, 0x00000000, 0xC3FA0000, 0x00000000, 0x00000D0D, 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, 0x00600001, 0x00600002, 0x00600003, 0x00600003, 0x00600001, 0x00600001, 0x00600000, 0x00600000, 0x00600003, 0x00600003, 0x00600003, 0x00600003, 0x00600003, 0x00600003, 0x00600003, 0x00600003, 0x00000000, 0x00000000, D_80246330_AEB8C0, 0x00000000, 0x00000002, D_802462E8_AEB878, 0x00000000, 0xC3FA0000, 0x00000000, 0x00000F0D, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00660004, 0x00660002, 0x00660003, 0x00660003, 0x00660004, 0x00660004, 0x0066000A, 0x0066000A, 0x00660003, 0x00660003, 0x00660003, 0x00660003, 0x00660003, 0x00660003, 0x00660003, 0x00660003, 0x00000000, 0x00000000, D_80246340_AEB8D0, 0x00000000, 0x00000003, D_802462E8_AEB878, 0x00000000, 0xC3FA0000, 0x00000000, 0x00000F0D, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00660104, 0x00660102, 0x00660103, 0x00660103, 0x00660104, 0x00660104, 0x0066010A, 0x0066010A, 0x00660103, 0x00660103, 0x00660103, 0x00660103, 0x00660103, 0x00660103, 0x00660103, 0x00660103, 0x00000000, 0x00000000, D_80246340_AEB8D0, 0x00000000, 0x00000004, D_802462E8_AEB878, 0x00000000, 0xC3FA0000, 0x00000000, 0x00000F0D, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00660204, 0x00660202, 0x00660203, 0x00660203, 0x00660204, 0x00660204, 0x0066020A, 0x0066020A, 0x00660203, 0x00660203, 0x00660203, 0x00660203, 0x00660203, 0x00660203, 0x00660203, 0x00660203, 0x00000000, 0x00000000, D_80246340_AEB8D0, 0x00000000, 0x00000005, D_802462E8_AEB878, 0x00000000, 0xC3FA0000, 0x00000000, 0x00000F0D, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00660304, 0x00660302, 0x00660303, 0x00660303, 0x00660304, 0x00660304, 0x0066030A, 0x0066030A, 0x00660303, 0x00660303, 0x00660303, 0x00660303, 0x00660303, 0x00660303, 0x00660303, 0x00660303, 0x00000000, 0x00000000, D_80246340_AEB8D0, 0x00000000, 0x00000006, D_80246368_AEB8F8, 0x00000000, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_80246F20_AEC4B0 -.word 0x00000000, 0x004B0048, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000 - -dlabel D_80246F4C_AEC4DC -.word 0x00000000, 0x00280018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00190000 - -dlabel D_80246F78_AEC508 -.word 0x00800000, 0x00800002, 0x00800004, 0x00800006, 0x0080000D, 0x00800008, 0xFFFFFFFF - -dlabel D_80246F94_AEC524 -.word 0x00580001, 0x00580006, 0x00580008, 0x00580012, 0x00580014, 0xFFFFFFFF - -dlabel D_80246FAC_AEC53C -.word 0x00000000, D_80246F20_AEC4B0, 0x00000000, 0xC3FA0000, 0x00000000, 0x00000D0D, 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, 0x00800002, 0x00800002, 0x00800002, 0x00800002, 0x00800002, 0x00800002, 0x00800002, 0x00800002, 0x00800002, 0x00800002, 0x00800002, 0x00800002, 0x00800002, 0x00800002, 0x00800002, 0x00800002, 0x00000000, 0x00000000, D_80246F78_AEC508, 0x00000000, 0x00000001, D_80246F4C_AEC4DC, 0x00000000, 0xC3FA0000, 0x00000000, 0x00000F0D, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00580001, 0x00580004, 0x00580006, 0x00580006, 0x00580001, 0x00580001, 0x00580010, 0x00580010, 0x0058000C, 0x0058000B, 0x0058000D, 0x00580001, 0x00580001, 0x00580001, 0x00580001, 0x00580001, 0x00000000, 0x00000000, D_80246F94_AEC524, 0x00000000, 0x00000002, D_80246F4C_AEC4DC, 0x00000000, 0xC3FA0000, 0x00000000, 0x00000F0D, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00580001, 0x00580004, 0x00580006, 0x00580006, 0x00580001, 0x00580001, 0x00580010, 0x00580010, 0x0058000C, 0x0058000B, 0x0058000D, 0x00580001, 0x00580001, 0x00580001, 0x00580001, 0x00580001, 0x00000000, 0x00000000, D_80246F94_AEC524, 0x00000000, 0x00000003, D_80246FAC_AEC53C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kkj/kkj_15/AECB30.data.s b/ver/us/asm/data/world/area_kkj/kkj_15/AECB30.data.s deleted file mode 100644 index 6556a77eb2..0000000000 --- a/ver/us/asm/data/world/area_kkj/kkj_15/AECB30.data.s +++ /dev/null @@ -1,24 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802475A0_AECB30 -.word 0x00000000, 0x004B0048, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000 - -dlabel D_802475CC_AECB5C -.word 0x00000000, 0x0028001E, 0x00000000, 0x00000000, 0x00000000, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x001A0000 - -dlabel D_802475F8_AECB88 -.word 0x00000000, 0x00280018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00190000 - -dlabel D_80247624_AECBB4 -.word 0x00800000, 0x00800002, 0x00800006, 0x00800007, 0x00800008, 0x0080000F, 0x0080000C, 0x0080000D, 0xFFFFFFFF - -dlabel D_80247648_AECBD8 -.word 0x00600001, 0x00600002, 0x00600004, 0x00600005, 0xFFFFFFFF - -dlabel D_8024765C_AECBEC -.word 0x00580001, 0x00580006, 0x00580008, 0x00580012, 0x00580014, 0xFFFFFFFF - -dlabel D_80247674_AECC04 -.word 0x00000000, D_802475A0_AECB30, 0x00000000, 0xC3FA0000, 0x00000000, 0x00000D0D, 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, 0x00800002, 0x00800002, 0x00800002, 0x00800002, 0x00800002, 0x00800002, 0x00800002, 0x00800002, 0x00800002, 0x00800002, 0x00800002, 0x00800002, 0x00800002, 0x00800002, 0x00800002, 0x00800002, 0x00000000, 0x00000000, D_80247624_AECBB4, 0x00000000, 0x00000001, D_802475CC_AECB5C, 0x00000000, 0xC3FA0000, 0x00000000, 0x00000D0D, 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, 0x00600001, 0x00600002, 0x00600003, 0x00600003, 0x00600001, 0x00600001, 0x00600000, 0x00600000, 0x00600003, 0x00600003, 0x00600003, 0x00600003, 0x00600003, 0x00600003, 0x00600003, 0x00600003, 0x00000000, 0x00000000, D_80247648_AECBD8, 0x00000000, 0x00000002, D_802475F8_AECB88, 0x00000000, 0xC3FA0000, 0x00000000, 0x00000F0D, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00580001, 0x00580004, 0x00580006, 0x00580006, 0x00580001, 0x00580001, 0x00580010, 0x00580010, 0x0058000C, 0x0058000B, 0x0058000D, 0x00580001, 0x00580001, 0x00580001, 0x00580001, 0x00580001, 0x00000000, 0x00000000, D_8024765C_AECBEC, 0x00000000, 0x00000003, D_802475F8_AECB88, 0x00000000, 0xC3FA0000, 0x00000000, 0x00000F0D, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00580001, 0x00580004, 0x00580006, 0x00580006, 0x00580001, 0x00580001, 0x00580010, 0x00580010, 0x0058000C, 0x0058000B, 0x0058000D, 0x00580001, 0x00580001, 0x00580001, 0x00580001, 0x00580001, 0x00000000, 0x00000000, D_8024765C_AECBEC, 0x00000000, 0x00000004, D_80247674_AECC04, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kkj/kkj_16/AEE490.data.s b/ver/us/asm/data/world/area_kkj/kkj_16/AEE490.data.s deleted file mode 100644 index b47b82ccaa..0000000000 --- a/ver/us/asm/data/world/area_kkj/kkj_16/AEE490.data.s +++ /dev/null @@ -1,15 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80241080_AEE490 -.word 0x43D98000, 0x00000000, 0xC1C80000, 0x43870000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80241254_AEE664, D_80241080_AEE490, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00190011, 0x00000024, 0x00000002, 0xFE363C80, 0xF5DE01CE, 0x00000043, 0x00000001, func_80240000_AED410, 0x00000043, 0x00000002, PlaySound, 0x000000DC, 0x00000043, 0x00000004, GotoMapSpecial, 0x80244800, 0x00000005, 0x0000000C, 0x00000008, 0x00000001, 0x00000064 - -dlabel D_80241120_AEE530 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000002, 0x00000024, 0x00000002, 0xFE363C82, 0x00000002, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFFFF, 0x00000044, 0x00000001, ExitSingleDoor, 0x00000008, 0x00000001, 0x00000011, 0x00000043, 0x00000003, GotoMap, 0x80244808, 0x00000002, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802411C4_AEE5D4 -.word 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x00000002, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFFFF, 0x00000046, 0x00000001, EnterSingleDoor, 0x00000023, 0x00000000, 0x0000000A, 0x00000002, 0xF5DE0180, 0xFFFFFFCA, 0x00000044, 0x00000001, 0x80243CD4, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241254_AEE664 -.word 0x00000024, 0x00000002, 0xF5DE0329, 0x0000001A, 0x00000043, 0x00000002, SetSpriteShading, 0xFFFFFFFF, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000014, 0x00000001, 0xF5DE0180, 0x0000001D, 0x00000001, 0xFFFFFFCA, 0x0000001D, 0x00000001, 0x00000006, 0x0000001D, 0x00000001, 0x00000026, 0x00000043, 0x00000003, MakeNpcs, 0x00000000, 0x802426D8, 0x00000020, 0x00000000, 0x00000016, 0x00000001, 0x0000003A, 0x00000043, 0x00000002, func_80240028_AED438, 0x00000002, 0x00000043, 0x00000003, MakeNpcs, 0x00000000, 0x802435A0, 0x00000023, 0x00000000, 0x00000046, 0x00000001, 0x8024476C, 0x0000000C, 0x00000002, 0xF5DE0180, 0x0000005F, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000075, 0x00000000, 0x00000008, 0x00000013, 0x00000000, 0x00000043, 0x00000002, UseDoorSounds, 0x00000000, 0x00000047, 0x00000005, D_80241120_AEE530, 0x00000100, 0x00000002, 0x00000001, 0x00000000, 0x00000044, 0x00000001, D_802411C4_AEE5D4, 0x00000008, 0x00000001, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kkj/kkj_16/AEE7F0.data.s b/ver/us/asm/data/world/area_kkj/kkj_16/AEE7F0.data.s deleted file mode 100644 index 9f0edb1eef..0000000000 --- a/ver/us/asm/data/world/area_kkj/kkj_16/AEE7F0.data.s +++ /dev/null @@ -1,87 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802413E0_AEE7F0 -.word 0x00000000, 0x00240018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x001B0000 - -dlabel D_8024140C_AEE81C -.word 0x00000000, 0x00280018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00190000 - -dlabel D_80241438_AEE848 -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x0000004D, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000001, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFFFFFFFF, 0x00000262, 0x00000000, 0x00000043, 0x0000000A, ShowEmote, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000014, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, NpcFacePlayer, 0xFFFFFFFF, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, PlayerFaceNpc, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x000C0005, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00580001, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00580008, 0x00580001, 0x00000000, 0x00140174, 0x00000043, 0x00000005, kkj_16_UnkGooberFunc50, 0xFFFFFFFF, 0xFE363C83, 0xFE363C80, 0xFE363C82, 0x0000000B, 0x00000002, 0xFE363C83, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00580006, 0x00000043, 0x00000003, SetNpcSpeed, 0xFFFFFFFF, 0xF24A8E80, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0xFE363C80, 0xFE363C82, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00580001, 0x00000013, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00580008, 0x00580001, 0x00000000, 0x00140175, 0x00000043, 0x00000002, SetPlayerAnimation, 0x000C0017, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000004, GotoMapSpecial, 0x80244828, 0x0000000B, 0x0000000D, 0x00000008, 0x00000001, 0x00000064, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241630_AEEA40 -.word 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00580004, 0x00000056, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, kkj_16_UnkPhysicsFunc, 0xFE363C80, 0x00000055, 0x0000003C, 0x00000026, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000003, BindNpcAI, 0xFFFFFFFF, D_80241438_AEE848, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000003, SetNpcSpeed, 0xFFFFFFFF, 0xF24A814D, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00580001, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFF, 0x0000005A, 0x0000000F, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00580004, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0x00000118, 0x00000032, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00580001, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFF, 0x0000010E, 0x0000000F, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00580004, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0x00000050, 0x00000032, 0x00000000, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802417CC_AEEBDC -.word 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00580004, 0x00000056, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, kkj_16_UnkPhysicsFunc, 0xFE363C80, 0x00000055, 0x0000003C, 0x00000026, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000003, BindNpcAI, 0xFFFFFFFF, D_80241438_AEE848, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000003, SetNpcSpeed, 0xFFFFFFFF, 0xF24A8280, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0xFFFFFF08, 0xFFFFFFB0, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0xFFFFFFAC, 0xFFFFFFB0, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0xFFFFFFAC, 0xFFFFFFF1, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0xFFFFFFA8, 0xFFFFFFF1, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0xFFFFFFA8, 0x00000032, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0xFFFFFF04, 0x00000032, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0xFFFFFF04, 0xFFFFFFF1, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0xFFFFFF08, 0xFFFFFFF1, 0x00000000, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241978_AEED88 -.word 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00580004, 0x00000056, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, kkj_16_UnkPhysicsFunc, 0xFE363C80, 0x00000055, 0x0000003C, 0x00000026, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000003, BindNpcAI, 0xFFFFFFFF, D_80241438_AEE848, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000003, SetNpcSpeed, 0xFFFFFFFF, 0xF24A814D, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00580001, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFF, 0x0000010E, 0x0000000F, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00580004, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0xFFFFFDA8, 0x00000032, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00580001, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFF, 0x0000005A, 0x0000000F, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00580004, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0xFFFFFE5C, 0x00000032, 0x00000000, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241B14_AEEF24 -.word 0x0000000B, 0x00000002, 0xF5DE0180, 0xFFFFFFCA, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0xFFFFFD44, 0x00000000, 0x00000032, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFF, 0x0000010E, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241B88_AEEF98 -.word 0x0000000B, 0x00000002, 0xF5DE0180, 0xFFFFFFCA, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0xFFFFFD1C, 0x00000000, 0x00000032, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFF, 0x0000005A, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241BFC_AEF00C -.word 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x000000B4, 0x00000000, 0x00000032, 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, D_80241630_AEEA40, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241C3C_AEF04C -.word 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000008, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000200, 0x00000001, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0xFFFFFF06, 0x00000000, 0xFFFFFFF1, 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, D_802417CC_AEEBDC, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241CAC_AEF0BC -.word 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0xFFFFFE02, 0x00000000, 0x00000032, 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, D_80241978_AEED88, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241CEC_AEF0FC -.word 0x005A0000, 0x005A0002, 0x005A0004, 0x005A0008, 0x005A000A, 0x005A0013, 0xFFFFFFFF - -dlabel D_80241D08_AEF118 -.word 0x00580000, 0x00580001, 0x00580004, 0x00580006, 0x00580008, 0x00580012, 0x00580014, 0xFFFFFFFF - -dlabel D_80241D28_AEF138 -.word 0x00000000, D_802413E0_AEE7F0, 0x00000000, 0xC3FA0000, 0x00000000, 0x00000F0D, D_80241B14_AEEF24, 0x00000000, 0x00000000, 0x00000000, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x005A0002, 0x005A0004, 0x005A0007, 0x005A0007, 0x005A0002, 0x005A0002, 0x005A000E, 0x005A000E, 0x005A0018, 0x005A0019, 0x005A0002, 0x005A0002, 0x005A0002, 0x005A0002, 0x005A0002, 0x005A0002, 0x00000000, 0x00000000, D_80241CEC_AEF0FC, 0x00000000, 0x00000001, D_8024140C_AEE81C, 0x00000000, 0xC3FA0000, 0x00000000, 0x00000F0D, D_80241B88_AEEF98, 0x00000000, 0x00000000, 0x00000000, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00580001, 0x00580004, 0x00580006, 0x00580006, 0x00580001, 0x00580001, 0x00580010, 0x00580010, 0x0058000C, 0x0058000B, 0x0058000D, 0x00580001, 0x00580001, 0x00580001, 0x00580001, 0x00580001, 0x00000000, 0x00000000, D_80241D08_AEF118, 0x00000000, 0x00000002, D_8024140C_AEE81C, 0x00000000, 0xC3FA0000, 0x00000000, 0x00000F0D, D_80241BFC_AEF00C, 0x00000000, 0x00000000, 0x00000000, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00580001, 0x00580004, 0x00580006, 0x00580006, 0x00580001, 0x00580001, 0x00580010, 0x00580010, 0x0058000C, 0x0058000B, 0x0058000D, 0x00580001, 0x00580001, 0x00580001, 0x00580001, 0x00580001, 0x00000000, 0x00000000, D_80241D08_AEF118, 0x00000000, 0x00000003, D_8024140C_AEE81C, 0x00000000, 0xC3FA0000, 0x00000000, 0x00000F0D, D_80241C3C_AEF04C, 0x00000000, 0x00000000, 0x00000000, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00580001, 0x00580004, 0x00580006, 0x00580006, 0x00580001, 0x00580001, 0x00580010, 0x00580010, 0x0058000C, 0x0058000B, 0x0058000D, 0x00580001, 0x00580001, 0x00580001, 0x00580001, 0x00580001, 0x00000000, 0x00000000, D_80241D08_AEF118, 0x00000000, 0x00000004, D_8024140C_AEE81C, 0x00000000, 0xC3FA0000, 0x00000000, 0x00000F0D, D_80241CAC_AEF0BC, 0x00000000, 0x00000000, 0x00000000, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00580001, 0x00580004, 0x00580006, 0x00580006, 0x00580001, 0x00580001, 0x00580010, 0x00580010, 0x0058000C, 0x0058000B, 0x0058000D, 0x00580001, 0x00580001, 0x00580001, 0x00580001, 0x00580001, 0x00000000, 0x00000000, D_80241D08_AEF118, 0x00000000, 0x00000005, D_80241D28_AEF138, 0x00000000, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_802426F0_AEFB00 -.word 0x00000000, 0x00240018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x001B0000 - -dlabel D_8024271C_AEFB2C -.word 0x005A0000, 0x005A0002, 0x005A0003, 0x005A0004, 0x005A0006, 0x005A0007, 0x005A0009, 0x005A000A, 0x005A000B, 0x005A001A, 0xFFFFFFFF - -dlabel D_80242748_AEFB58 -.word 0x0000000A, 0x00000002, 0xF8405D65, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x005A000A, 0x005A0002, 0x00000010, 0x0014013A, 0x00000043, 0x00000004, ShowGotItem, 0x00000083, 0x00000001, 0x00000002, 0x00000024, 0x00000002, 0xF8405D65, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x005A000A, 0x005A0002, 0x00000010, 0x0014013B, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802427E0_AEFBF0 -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000003, GetSelfVar, 0x00000000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x005A000A, 0x005A0002, 0x00000000, 0x00140136, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x005A000A, 0x005A0002, 0x00000000, 0x00140137, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802428AC_AEFCBC -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000003, GetSelfVar, 0x00000000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x005A000A, 0x005A0002, 0x00000000, 0x00140138, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x005A000A, 0x005A0002, 0x00000000, 0x00140139, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242978_AEFD88 -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000001, func_80240EF4_AEE304, 0x0000004D, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000001, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFFFFFFFF, 0x00000262, 0x00000000, 0x00000043, 0x0000000A, ShowEmote, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000014, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, NpcFacePlayer, 0xFFFFFFFF, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, PlayerFaceNpc, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x000C0005, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x005A0002, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x005A000A, 0x005A0002, 0x00000000, 0x00140174, 0x00000043, 0x00000005, dup_kkj_16_UnkGooberFunc50, 0xFFFFFFFF, 0xFE363C83, 0xFE363C80, 0xFE363C82, 0x0000000B, 0x00000002, 0xFE363C83, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x005A0007, 0x00000043, 0x00000003, SetNpcSpeed, 0xFFFFFFFF, 0xF24A8E80, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0xFE363C80, 0xFE363C82, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x005A0002, 0x00000013, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x005A000A, 0x005A0002, 0x00000000, 0x00140175, 0x00000043, 0x00000002, SetPlayerAnimation, 0x000C0017, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000004, GotoMapSpecial, 0x80244848, 0x0000000B, 0x0000000D, 0x00000008, 0x00000001, 0x00000064, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242B7C_AEFF8C -.word 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000002, kkj_16_GetPeachDisguise, 0xFE363C81, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000043, 0x00000003, SetSelfEnemyFlagBits, 0x08000000, 0x00000001, 0x00000043, 0x00000005, dup_kkj_16_UnkPhysicsFunc, 0xFE363C80, 0x00000055, 0x0000003C, 0x00000026, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000003, BindNpcAI, 0xFFFFFFFF, D_80242978_AEFD88, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000003, SetSelfEnemyFlagBits, 0x08000000, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242C54_AF0064 -.word 0x00000044, 0x00000001, D_80242B7C_AEFF8C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242C70_AF0080 -.word 0x00000044, 0x00000001, D_80242B7C_AEFF8C, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x005A0004, 0x00000043, 0x00000003, SetNpcSpeed, 0xFFFFFFFF, 0xF24A814D, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x005A0002, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFF, 0x0000005A, 0x0000000F, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x005A0004, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0x00000118, 0x00000032, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x005A0002, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFF, 0x0000010E, 0x0000000F, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x005A0004, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0x00000050, 0x00000032, 0x00000000, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242D98_AF01A8 -.word 0x00000044, 0x00000001, D_80242B7C_AEFF8C, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x005A0004, 0x00000043, 0x00000003, SetNpcSpeed, 0xFFFFFFFF, 0xF24A814D, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x005A0002, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFF, 0x0000010E, 0x0000000F, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x005A0004, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0xFFFFFDA8, 0x00000032, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x005A0002, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFF, 0x0000005A, 0x0000000F, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x005A0004, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0xFFFFFE5C, 0x00000032, 0x00000000, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242EC0_AF02D0 -.word 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0xFFFFFD44, 0x00000000, 0x00000032, 0x00000043, 0x00000003, SetNpcYaw, 0xFFFFFFFF, 0x0000005A, 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, D_80242C54_AF0064, 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, D_80242748_AEFB58, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242F28_AF0338 -.word 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x000000B4, 0x00000000, 0x00000032, 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, D_80242C70_AF0080, 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, D_802427E0_AEFBF0, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242F7C_AF038C -.word 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0xFFFFFE02, 0x00000000, 0x00000032, 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, D_80242D98_AF01A8, 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, D_802428AC_AEFCBC, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242FD0_AF03E0 -.word 0x00000000, D_802426F0_AEFB00, 0x00000000, 0xC3FA0000, 0x00000000, 0x00400D0D, D_80242EC0_AF02D0, 0x00000000, 0x00000000, 0x00000000, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x005A0002, 0x005A0004, 0x005A0007, 0x005A0007, 0x005A0002, 0x005A0002, 0x005A000E, 0x005A000E, 0x005A0018, 0x005A0019, 0x005A0002, 0x005A0002, 0x005A0002, 0x005A0002, 0x005A0002, 0x005A0002, 0x00000000, 0x00000000, D_8024271C_AEFB2C, 0x00000000, 0x00000001, D_802426F0_AEFB00, 0x00000000, 0xC3FA0000, 0x00000000, 0x00000D0D, D_80242F28_AF0338, 0x00000000, 0x00000000, 0x00000000, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x005A0002, 0x005A0004, 0x005A0007, 0x005A0007, 0x005A0002, 0x005A0002, 0x005A000E, 0x005A000E, 0x005A0018, 0x005A0019, 0x005A0002, 0x005A0002, 0x005A0002, 0x005A0002, 0x005A0002, 0x005A0002, 0x00000000, 0x00000000, D_8024271C_AEFB2C, 0x00000000, 0x00000002, D_802426F0_AEFB00, 0x00000000, 0xC3FA0000, 0x00000000, 0x00000D0D, D_80242F7C_AF038C, 0x00000000, 0x00000000, 0x00000000, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x005A0002, 0x005A0004, 0x005A0007, 0x005A0007, 0x005A0002, 0x005A0002, 0x005A000E, 0x005A000E, 0x005A0018, 0x005A0019, 0x005A0002, 0x005A0002, 0x005A0002, 0x005A0002, 0x005A0002, 0x005A0002, 0x00000000, 0x00000000, D_8024271C_AEFB2C, 0x00000000, 0x00000003, D_80242FD0_AF03E0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kkj/kkj_16/AF09D0.data.s b/ver/us/asm/data/world/area_kkj/kkj_16/AF09D0.data.s deleted file mode 100644 index 839b161329..0000000000 --- a/ver/us/asm/data/world/area_kkj/kkj_16/AF09D0.data.s +++ /dev/null @@ -1,21 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802435C0_AF09D0 -.word 0xC43C0000, 0x42700000, 0xC25C0000, 0xC43CC000, 0x42F00000, 0xC2700000, 0xC4408000, 0x430C0000, 0xC3020000 - -dlabel D_802435E4_AF09F4 -.word 0xC4408000, 0x430C0000, 0xC3020000, 0xC43CC000, 0x43070000, 0xC2B40000, 0xC4278000, 0x42DC0000, 0xC2A00000 - -dlabel D_80243608_AF0A18 -.word 0xC4278000, 0x42DC0000, 0xC2A00000, 0xC41D8000, 0x42C80000, 0xC2A00000, 0xC3EB0000, 0x42B40000, 0xC2A00000 - -dlabel D_8024362C_AF0A3C -.word 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C80, 0x0000000A, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, SetNpcVar, 0x00000000, 0x00000000, 0x00000001, 0x00000056, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C80, 0x0000001A, 0x00000028, 0x00000002, 0xFE363C82, 0x00000002, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x005A0007, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000000, 0xF24A8E80, 0x00000043, 0x00000005, NpcMoveTo, 0x00000000, 0xFE363C80, 0xFE363C82, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x005A0002, 0x00000043, 0x00000003, NpcFacePlayer, 0x00000000, 0x00000005, 0x00000043, 0x00000004, SetNpcVar, 0x00000000, 0x00000000, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x0000001A, 0x00000027, 0x00000002, 0xFE363C82, 0x00000002, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00580006, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000001, 0xF24A8E80, 0x00000043, 0x00000005, NpcMoveTo, 0x00000001, 0xFE363C80, 0xFE363C82, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00580001, 0x00000043, 0x00000003, NpcFacePlayer, 0x00000001, 0x00000005, 0x00000057, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000004, GetNpcVar, 0x00000000, 0x00000000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80243890_AF0CA0 -.word 0x00000056, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000005, 0x00000043, 0x00000005, NpcMoveTo, 0x00000000, 0xFE363C80, 0xFE363C82, 0x00000005, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x005A0013, 0x00000027, 0x00000002, 0xFE363C80, 0x00000005, 0x00000043, 0x00000005, NpcMoveTo, 0x00000000, 0xFE363C80, 0xFE363C82, 0x00000005, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C80, 0x00000005, 0x00000043, 0x00000005, NpcMoveTo, 0x00000001, 0xFE363C80, 0xFE363C82, 0x00000005, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00580012, 0x00000028, 0x00000002, 0xFE363C80, 0x00000005, 0x00000043, 0x00000005, NpcMoveTo, 0x00000001, 0xFE363C80, 0xFE363C82, 0x00000005, 0x00000057, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, SetPlayerAnimation, 0x000C0005, 0x00000008, 0x00000001, 0x00000001, 0x00000005, 0x00000001, 0x00000004, 0x00000027, 0x00000002, 0xFE363C81, 0x00000002, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x000C0018, 0x00000027, 0x00000002, 0xFE363C80, 0x0000000A, 0x00000005, 0x00000001, 0x00000005, 0x00000027, 0x00000002, 0xFE363C81, 0x00000004, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80243AB4_AF0EC4 -.word 0x00000043, 0x00000004, InterpNpcYaw, 0x00000001, 0x0000005A, 0x00000003, 0x00000008, 0x00000001, 0x0000000A, 0x00000056, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000020, 0x00000027, 0x00000002, 0xFE363C82, 0x00000002, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0x0000001E, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000004, SetNpcVar, 0x00000000, 0x00000000, 0x00000001, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x005A0008, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000000, 0xF24A8E80, 0x00000043, 0x00000005, NpcMoveTo, 0x00000000, 0xFFFFFDA2, 0xFFFFFFC7, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000000, 0x00000162, 0x00000000, 0x00000000, 0x00000043, 0x00000004, SetNpcVar, 0x00000000, 0x00000000, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00580014, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000001, 0xF24A8E80, 0x00000043, 0x00000005, NpcMoveTo, 0x00000001, 0xFFFFFDC2, 0xFFFFFFCB, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000001, 0x00000182, 0x00000000, 0x00000000, 0x00000057, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000004, GetNpcVar, 0x00000000, 0x00000000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF9718887, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x00200009, 0x00200001, 0x00000000, 0x0014006C, 0x00000024, 0x00000002, 0xF9718887, 0x00000001, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000013, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000E, 0x00000002, 0xFE363C80, 0xFFFFFCFE, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000075, 0x00000000, 0x00000008, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000075, 0x00000000, 0x00000007, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000075, 0x00000000, 0x00000006, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000075, 0x00000000, 0x00000005, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000075, 0x00000000, 0x00000004, 0x00000057, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x000C000D, 0x00000043, 0x00000003, PlaySoundAtPlayer, 0x00000262, 0x00000000, 0x00000043, 0x0000000A, ShowEmote, 0x00000000, 0x00000000, 0x00000000, 0x0000001E, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x000A0001, 0x00000056, 0x00000000, 0x00000043, 0x00000008, NpcFlyTo, 0xFFFFFFFC, 0xFFFFFCF8, 0x00000032, 0xFFFFFFBF, 0x0000000A, 0x00000000, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000004, PlayerMoveTo, 0xFFFFFCF6, 0xFFFFFFC9, 0x0000000A, 0x00000043, 0x00000003, InterpPlayerYaw, 0x000000B9, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000007, SpeakToNpc, 0x00000000, 0x005A000A, 0x005A0002, 0x00000000, 0x00000001, 0x0014006E, 0x00000043, 0x00000007, SpeakToNpc, 0x00000001, 0x00580008, 0x00580001, 0x00000000, 0x00000000, 0x0014006F, 0x00000043, 0x00000007, SpeakToNpc, 0x00000000, 0x005A000A, 0x005A0002, 0x00000000, 0x00000001, 0x00140070, 0x00000043, 0x00000007, SpeakToNpc, 0x00000001, 0x00580008, 0x00580001, 0x00000000, 0x00000000, 0x00140071, 0x00000043, 0x00000007, SpeakToNpc, 0x00000000, 0x005A000A, 0x005A0002, 0x00000000, 0x00000001, 0x00140072, 0x00000043, 0x00000007, SpeakToNpc, 0x00000001, 0x00580008, 0x00580001, 0x00000000, 0x00000000, 0x00140073, 0x00000043, 0x00000007, SpeakToNpc, 0x00000000, 0x005A000A, 0x005A0002, 0x00000000, 0x00000001, 0x00140074, 0x00000043, 0x00000007, SpeakToNpc, 0x00000001, 0x00580008, 0x00580001, 0x00000000, 0x00000000, 0x00140075, 0x00000043, 0x00000007, SpeakToNpc, 0x00000000, 0x005A000A, 0x005A0002, 0x00000000, 0x00000001, 0x00140076, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x0000012C, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24AB680, 0xF24A5080, 0x00000043, 0x00000004, SetCamPosA, 0x00000000, 0xFFFFFCF9, 0xFFFFFFCE, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8680, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFE, 0x000D0004, 0x000A0001, 0x00000005, 0x00140077, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x00200009, 0x00200001, 0x00000005, 0x00140078, 0x00000043, 0x00000003, ResetCam, 0x00000000, 0xF24BE280, 0x00000043, 0x00000007, SpeakToNpc, 0x00000000, 0x005A000A, 0x005A0002, 0x00000000, 0x00000001, 0x00140079, 0x00000043, 0x00000007, SpeakToNpc, 0x00000001, 0x00580008, 0x00580001, 0x00000000, 0x00000000, 0x0014007A, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x005A0007, 0x00000043, 0x00000005, NpcMoveTo, 0x00000000, 0xFFFFFCCC, 0x00000032, 0x0000001E, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x005A0002, 0x00000043, 0x00000003, NpcFacePlayer, 0x00000000, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00580006, 0x00000043, 0x00000005, NpcMoveTo, 0x00000001, 0xFFFFFCB8, 0x0000000A, 0x0000001E, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00580001, 0x00000043, 0x00000003, NpcFacePlayer, 0x00000001, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x0020000E, 0x00000043, 0x00000005, LoadPath, 0x00000014, D_802435C0_AF09D0, 0x00000003, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, GetNextPathPos, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000003, NpcFacePlayer, 0xFFFFFFFC, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, SetPlayerAnimation, 0x000C0005, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, SetPlayerJumpscale, 0xF24A7E80, 0x00000043, 0x00000005, PlayerJump1, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000A, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x005A000A, 0x005A0002, 0x00000000, 0x0014007B, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x00580008, 0x00580001, 0x00000000, 0x0014007C, 0x00000046, 0x00000001, D_8024362C_AF0A3C, 0x00000046, 0x00000001, D_80243890_AF0CA0, 0x00000046, 0x00000001, D_80243AB4_AF0EC4, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFE, 0x000C0018, 0x000C0018, 0x00000005, 0x0014007D, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, LoadPath, 0x00000028, D_802435E4_AF09F4, 0x00000003, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, GetNextPathPos, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00200010, 0x00000005, 0x00000001, 0x00000002, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0x0000010E, 0x00000007, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0x0000005A, 0x00000007, 0x00000008, 0x00000001, 0x00000005, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00200001, 0x00000056, 0x00000000, 0x00000043, 0x00000005, LoadPath, 0x0000001E, D_80243608_AF0A18, 0x00000003, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, GetNextPathPos, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000003, FadeOutMusic, 0x00000000, 0x000003E8, 0x00000046, 0x00000001, 0x802410D0, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kkj/kkj_16/AF1B10.data.s b/ver/us/asm/data/world/area_kkj/kkj_16/AF1B10.data.s deleted file mode 100644 index df2eb78ab3..0000000000 --- a/ver/us/asm/data/world/area_kkj/kkj_16/AF1B10.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80244700_AF1B10 -.word 0x00000005, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF8405D64, 0x00000001, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, RemoveBadge, 0x0000010D, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000007, MakeItemEntity, 0x00000095, 0xFFFFFCB8, 0x0000006E, 0x0000000A, 0x00000011, 0xF8405D78, 0x00000043, 0x00000007, MakeItemEntity, 0x0000010D, 0xFFFFFDDA, 0x00000000, 0xFFFFFF88, 0x00000011, 0xF8405D64, 0x0000000C, 0x00000002, 0xF5DE0180, 0x0000005F, 0x0000000A, 0x00000002, 0xF8405D64, 0x00000000, 0x00000044, 0x00000001, D_80244700_AF1B10, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_kkj/kkj_17/AF2200.data.s b/ver/us/asm/data/world/area_kkj/kkj_17/AF2200.data.s deleted file mode 100644 index 37262e77c4..0000000000 --- a/ver/us/asm/data/world/area_kkj/kkj_17/AF2200.data.s +++ /dev/null @@ -1,15 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802405A0_AF2200 -.word 0xC33B0000, 0x00000000, 0xC20C0000, 0x42B40000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80240700_AF2360, D_802405A0_AF2200, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00190012 - -dlabel D_802405F0_AF2250 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000002, 0x00000024, 0x00000002, 0xFE363C82, 0x00000002, 0x00000024, 0x00000002, 0xFE363C83, 0x00000001, 0x00000044, 0x00000001, ExitSingleDoor, 0x00000008, 0x00000001, 0x00000011, 0x00000043, 0x00000003, GotoMap, 0x80241030, 0x00000005, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240694_AF22F4 -.word 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x00000002, 0x00000024, 0x00000002, 0xFE363C83, 0x00000001, 0x00000046, 0x00000001, EnterSingleDoor, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240700_AF2360 -.word 0x00000024, 0x00000002, 0xF5DE0329, 0x0000001A, 0x00000043, 0x00000002, SetSpriteShading, 0x00050004, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000046, 0x00000001, 0x8024084C, 0x00000044, 0x00000001, 0x80240FF8, 0x00000043, 0x00000002, UseDoorSounds, 0x00000000, 0x00000047, 0x00000005, D_802405F0_AF2250, 0x00000100, 0x00000002, 0x00000001, 0x00000000, 0x00000044, 0x00000001, D_80240694_AF22F4, 0x00000008, 0x00000001, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kkj/kkj_17/AF2440.data.s b/ver/us/asm/data/world/area_kkj/kkj_17/AF2440.data.s deleted file mode 100644 index 6f0de65807..0000000000 --- a/ver/us/asm/data/world/area_kkj/kkj_17/AF2440.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802407E0_AF2440 -.word 0x00000005, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF8405D66, 0x00000001, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, RemoveBadge, 0x00000129, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000007, MakeItemEntity, 0x00000129, 0x00000064, 0x00000000, 0xFFFFFFE2, 0x00000011, 0xF8405D66, 0x0000000C, 0x00000002, 0xF5DE0180, 0x0000005F, 0x0000000A, 0x00000002, 0xF8405D66, 0x00000000, 0x00000044, 0x00000001, D_802407E0_AF2440, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kkj/kkj_17/AF2520.data.s b/ver/us/asm/data/world/area_kkj/kkj_17/AF2520.data.s deleted file mode 100644 index 8f8ee7b5c1..0000000000 --- a/ver/us/asm/data/world/area_kkj/kkj_17/AF2520.data.s +++ /dev/null @@ -1,27 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel kkj_17_varStash -.word 0x00000000, 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_8024092C_AF258C -.word 0x0000010D, 0x00000083, 0x00000129, 0x00000111, 0x000000A2 - -dlabel D_80240940_AF25A0 -.word 0x00000043, 0x00000004, PlaySoundAtCollider, 0x0000000A, 0x0000204A, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x00000050, 0x00000014, 0x00000004, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateGroup, 0x00000017, 0xFE363C80, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802409F0_AF2650 -.word 0x00000043, 0x00000005, MakeLerp, 0x00000050, 0x00000000, 0x00000014, 0x00000004, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateGroup, 0x00000017, 0xFE363C80, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x0000000A, 0x0000204B, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240AA0_AF2700 -.word 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x00200009, 0x00200001, 0x00000000, 0x0014018E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x000C0000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, SetPlayerAnimation, 0x000C0026, 0x00000043, 0x00000007, SpeakToNpc, 0xFFFFFFFE, 0x000C0001, 0x000C0026, 0x00000000, 0xFFFFFFFC, 0x0014018F, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x00200009, 0x00200001, 0x00000000, 0x00140190, 0x00000043, 0x00000007, SpeakToNpc, 0xFFFFFFFE, 0x000C0001, 0x000C0026, 0x00000000, 0xFFFFFFFC, 0x00140191, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x00200009, 0x00200001, 0x00000000, 0x00140192, 0x00000043, 0x00000007, SpeakToNpc, 0xFFFFFFFE, 0x000C0001, 0x000C0026, 0x00000000, 0xFFFFFFFC, 0x00140193, 0x00000043, 0x00000002, SetPlayerAnimation, 0x000C0002, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, SetPlayerAnimation, 0x000A0001, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240BD4_AF2834 -.word 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000001, func_802402BC_AF1F1C, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x00000016, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x00200009, 0x00200001, 0x00000000, 0x00140194, 0x00000043, 0x00000002, SetPlayerAnimation, 0x000C0000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, SetPlayerAnimation, 0x000C0026, 0x00000043, 0x00000007, SpeakToNpc, 0xFFFFFFFE, 0x000C0001, 0x000C0026, 0x00000000, 0xFFFFFFFC, 0x00140195, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x00200009, 0x00200001, 0x00000000, 0x00140196, 0x00000043, 0x00000007, SpeakToNpc, 0xFFFFFFFE, 0x000C0001, 0x000C0026, 0x00000000, 0xFFFFFFFC, 0x00140197, 0x00000043, 0x00000002, SetPlayerAnimation, 0x000C0002, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, SetPlayerAnimation, 0x000A0001, 0x0000001C, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C80, 0x00000046, 0x00000001, D_80240940_AF25A0, 0x00000043, 0x00000002, kkj_17_GetItemName, 0xFE363C89, 0x00000043, 0x00000003, SetMessageText, 0xFE363C89, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x00140198, 0x000000A0, 0x00000028, 0x00000008, 0x00000001, 0x0000000A, 0x00000046, 0x00000001, D_802409F0_AF2650, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240D9C_AF29FC -.word 0x00000046, 0x00000001, D_80240940_AF25A0, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000001, func_802402BC_AF1F1C, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00D4, 0x000000A0, 0x00000028, 0x0000001D, 0x00000001, 0x0000010D, 0x0000001D, 0x00000001, 0x00000129, 0x0000001D, 0x00000001, 0x00000111, 0x0000004D, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000002, 0x00000043, 0x00000004, ShowGotItem, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000000, 0x00000043, 0x00000003, AddBadge, 0xFE363C80, 0xFE363C81, 0x00000043, 0x00000001, func_80240500_AF2160, 0x00000020, 0x00000000, 0x0000001C, 0x00000000, 0x00000043, 0x00000001, kkj_17_GetItemEmptyCount, 0x0000000E, 0x00000002, 0xFE363C81, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00D5, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowGotItem, 0xFE363C80, 0x00000000, 0x00000002, 0x00000043, 0x00000003, AddItem, 0xFE363C80, 0xFE363C81, 0x00000043, 0x00000001, func_80240500_AF2160, 0x00000013, 0x00000000, 0x00000023, 0x00000000, 0x00000046, 0x00000001, D_802409F0_AF2650, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240F38_AF2B98 -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000001, 0x0000000C, 0x00000002, 0xF5DE0180, 0x0000005F, 0x0000000A, 0x00000002, 0xF8405D63, 0x00000000, 0x00000046, 0x00000001, D_80240AA0_AF2700, 0x00000024, 0x00000002, 0xF8405D63, 0x00000001, 0x00000012, 0x00000000, 0x00000046, 0x00000001, D_80240BD4_AF2834, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000046, 0x00000001, D_80240D9C_AF29FC, 0x00000013, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80240F38_AF2B98, 0x00000100, 0x0000000A, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kkj/kkj_18/AF34C0.data.s b/ver/us/asm/data/world/area_kkj/kkj_18/AF34C0.data.s deleted file mode 100644 index 9fddf14b39..0000000000 --- a/ver/us/asm/data/world/area_kkj/kkj_18/AF34C0.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240820_AF34C0 -.word 0xC33B0000, 0x00000000, 0xC20C0000, 0x42B40000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80240DF0, D_80240820_AF34C0, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80200000, 0x00190013, 0x0000000A, 0x00000002, 0xF5DE0180, 0x00000006, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000074, 0x00000000, 0x00000008, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kkj/kkj_18/AF3560.data.s b/ver/us/asm/data/world/area_kkj/kkj_18/AF3560.data.s deleted file mode 100644 index 1a33729e1b..0000000000 --- a/ver/us/asm/data/world/area_kkj/kkj_18/AF3560.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802408C0_AF3560 -.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, kkj_18_UpdateTexturePanSmooth, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, kkj_18_UpdateTexturePanStepped, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kkj/kkj_18/AF3600.data.s b/ver/us/asm/data/world/area_kkj/kkj_18/AF3600.data.s deleted file mode 100644 index 4e5b5c65e3..0000000000 --- a/ver/us/asm/data/world/area_kkj/kkj_18/AF3600.data.s +++ /dev/null @@ -1,15 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240960_AF3600 -.word 0xE7000000, 0x00000000, 0xD7000002, 0xFFFFFFFF, 0xE3000A01, 0x00100000, 0xE3000C00, 0x00080000, 0xE3000D01, 0x00000000, 0xE3000F00, 0x00000000, 0xE3001001, 0x00000000, 0xE3001201, 0x00002000, 0xE3001402, 0x00000C00, 0xFA000000, 0x4B1F13FF, 0xFB000000, 0xFF764D00, 0xFC10E5E0, 0x230B1D52, 0xE200001C, 0x0C184B50, 0xD9FDFFFF, 0x00000000, 0xD9FFFFFF, 0x00200404, 0xDF000000, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0xF5DE01CE, 0x00000043, 0x00000001, func_8024030C_AF2FAC, 0x00000043, 0x00000002, PlaySound, 0x000000DC, 0x00000043, 0x00000004, GotoMapSpecial, 0x80244C80, 0x00000005, 0x0000000C, 0x00000008, 0x00000001, 0x00000064 - -dlabel D_80240A30_AF36D0 -.word 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0xFFFFFFF8, 0x00000008, 0x0000001E, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateGroup, 0x0000002C, 0xFE363C80, 0x00000000, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000008, 0xFFFFFFF8, 0x0000001E, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateGroup, 0x0000002C, 0xFE363C80, 0x00000000, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240B64_AF3804 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000002, 0x00000024, 0x00000002, 0xFE363C82, 0x00000002, 0x00000024, 0x00000002, 0xFE363C83, 0x00000001, 0x00000044, 0x00000001, ExitSingleDoor, 0x00000008, 0x00000001, 0x00000011, 0x0000000A, 0x00000002, 0xF70F2E81, 0x00000000, 0x00000043, 0x00000003, GotoMap, 0x80244C90, 0x00000006, 0x00000012, 0x00000000, 0x00000043, 0x00000003, GotoMap, 0x80244C88, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240C3C_AF38DC -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x0000000B, 0x00000002, 0xF9718891, 0x00000000, 0x00000043, 0x00000004, SetPlayerPos, 0xFFFFFF1D, 0x00000000, 0xFFFFFFDD, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFFFFFF1D, 0x00000000, 0xFFFFFFDD, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x00000002, 0x000001C1, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x00000050, 0x0000000A, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateModel, 0x00000002, 0xFE363C80, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000004, SetPlayerPos, 0xFFFFFF45, 0x00000000, 0xFFFFFFDD, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFFFFFF45, 0x00000000, 0xFFFFFFDD, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x00000002, 0x00000024, 0x00000002, 0xFE363C83, 0x00000001, 0x00000046, 0x00000001, EnterSingleDoor, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000047, 0x00000005, D_80240B64_AF3804, 0x00000100, 0x00000002, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0329, 0x0000001A, 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, 0xF5DE0180, 0x00000006, 0x00000043, 0x00000003, MakeNpcs, 0x00000000, 0x80241EF0, 0x00000013, 0x00000000, 0x00000044, 0x00000001, D_80240A30_AF36D0, 0x00000043, 0x00000003, SetTexPanner, 0x00000017, 0x00000000, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x00000028, 0x00000024, 0x00000002, 0xFE363C84, 0x00000384, 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_802408C0_AF3560, 0x00000057, 0x00000000, 0x00000043, 0x00000004, SetModelCustomGfx, 0x00000017, 0x00000000, 0xFFFFFFFF, 0x00000043, 0x00000004, SetCustomGfx, 0x00000000, D_80240960_AF3600, 0x00000000, 0x00000044, 0x00000001, 0x80240870, 0x00000043, 0x00000002, UseDoorSounds, 0x00000000, 0x00000044, 0x00000001, D_80240C3C_AF38DC, 0x00000008, 0x00000001, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kkj/kkj_18/AF3CB0.data.s b/ver/us/asm/data/world/area_kkj/kkj_18/AF3CB0.data.s deleted file mode 100644 index a62ad15095..0000000000 --- a/ver/us/asm/data/world/area_kkj/kkj_18/AF3CB0.data.s +++ /dev/null @@ -1,39 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80241010_AF3CB0 -.word 0x00000000, 0x0044003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000 - -dlabel D_8024103C_AF3CDC -.word 0x00000000, 0x00180018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000 - -dlabel D_80241068_AF3D08 -.word 0x00000000, 0x0028001E, 0x00000000, 0x00000000, 0x00000000, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x001A0000 - -dlabel D_80241094_AF3D34 -.word 0x00000000, 0x00280018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00190000 - -dlabel D_802410C0_AF3D60 -.word 0x00000043, 0x00000001, WaitForPlayerInputEnabled, 0x00000044, 0x00000001, 0x80244C08, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802410E8_AF3D88 -.word 0x00000043, 0x00000006, SpeakToPlayer, 0x00000003, 0x00C10004, 0x00C10001, 0x00000000, 0x001400A1, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241118_AF3DB8 -.word 0x00000043, 0x00000006, SpeakToPlayer, 0x00000003, 0x00C10004, 0x00C10001, 0x00000000, 0x001400A6, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241148_AF3DE8 -.word 0x00000043, 0x00000003, EnableGroup, 0x0000001E, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000011, 0x7FFFFE00, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000078, 0x00000000, 0xFFFFFFEC, 0x00000043, 0x00000003, SetNpcYaw, 0xFFFFFFFF, 0x0000010E, 0x0000000A, 0x00000002, 0xF9718891, 0x00000000, 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, D_802410E8_AF3D88, 0x00000012, 0x00000000, 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, D_80241118_AF3DB8, 0x00000013, 0x00000000, 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, D_802410C0_AF3D60, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000004, 0x00C10009, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000004, 0x00000002, 0x00000001, 0x00000043, 0x00000003, EnableNpcShadow, 0x00000004, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000004, 0x0000003C, 0x00000028, 0xFFFFFFF1, 0x00000043, 0x00000003, SetNpcYaw, 0x00000004, 0x0000010E, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000005, 0x00C1000A, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000005, 0x00000002, 0x00000001, 0x00000043, 0x00000003, EnableNpcShadow, 0x00000005, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000005, 0x0000007D, 0x00000028, 0xFFFFFFF1, 0x00000043, 0x00000003, SetNpcYaw, 0x00000005, 0x0000010E, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802412F0_AF3F90 -.word 0x00C10001, 0x00C10002, 0x00C10003, 0x00C10004, 0x00C10005, 0x00C10006, 0x00C10007, 0x00C10008, 0x00C1000B, 0x00C1000C, 0x00C10009, 0x00C1000A, 0xFFFFFFFF - -dlabel D_80241324_AF3FC4 -.word 0x00600001, 0x00600002, 0x00600004, 0x00600005, 0xFFFFFFFF - -dlabel D_80241338_AF3FD8 -.word 0x00580001, 0x00580006, 0x00580008, 0x00580012, 0x00580014, 0xFFFFFFFF - -dlabel D_80241350_AF3FF0 -.word 0x00000000, D_80241068_AF3D08, 0x00000000, 0xC3FA0000, 0x00000000, 0x00000D0D, 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, 0x00600001, 0x00600002, 0x00600003, 0x00600003, 0x00600001, 0x00600001, 0x00600000, 0x00600000, 0x00600003, 0x00600003, 0x00600003, 0x00600003, 0x00600003, 0x00600003, 0x00600003, 0x00600003, 0x00000000, 0x00000000, D_80241324_AF3FC4, 0x00000000, 0x00000001, D_80241094_AF3D34, 0x00000000, 0xC3FA0000, 0x00000000, 0x00000F0D, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00580001, 0x00580004, 0x00580006, 0x00580006, 0x00580001, 0x00580001, 0x00580010, 0x00580010, 0x0058000C, 0x0058000B, 0x0058000D, 0x00580001, 0x00580001, 0x00580001, 0x00580001, 0x00580001, 0x00000000, 0x00000000, D_80241338_AF3FD8, 0x00000000, 0x00000002, D_80241094_AF3D34, 0x00000000, 0xC3FA0000, 0x00000000, 0x00000F0D, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00580001, 0x00580004, 0x00580006, 0x00580006, 0x00580001, 0x00580001, 0x00580010, 0x00580010, 0x0058000C, 0x0058000B, 0x0058000D, 0x00580001, 0x00580001, 0x00580001, 0x00580001, 0x00580001, 0x00000000, 0x00000000, D_80241338_AF3FD8, 0x00000000, 0x00000003, D_80241010_AF3CB0, 0xC37A0000, 0x41200000, 0x42AA0000, 0x00000D0D, D_80241148_AF3DE8, 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, 0x00C10001, 0x00C10001, 0x00C10001, 0x00C10001, 0x00C10001, 0x00C10001, 0x00C10001, 0x00C10001, 0x00C10001, 0x00C10001, 0x00C10001, 0x00C10001, 0x00C10001, 0x00C10001, 0x00C10001, 0x00C10001, 0x00000000, 0x00000000, D_802412F0_AF3F90, 0x00000000, 0x00000004, D_8024103C_AF3CDC, 0xC37A0000, 0x41200000, 0x42AA0000, 0x00000F0D, 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, 0x00C10001, 0x00C10001, 0x00C10001, 0x00C10001, 0x00C10001, 0x00C10001, 0x00C10001, 0x00C10001, 0x00C10001, 0x00C10001, 0x00C10001, 0x00C10001, 0x00C10001, 0x00C10001, 0x00C10001, 0x00C10001, 0x00000000, 0x00000000, D_802412F0_AF3F90, 0x00000000, 0x00000005, D_8024103C_AF3CDC, 0xC37A0000, 0x41200000, 0x42AA0000, 0x00000F0D, 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, 0x00C10001, 0x00C10001, 0x00C10001, 0x00C10001, 0x00C10001, 0x00C10001, 0x00C10001, 0x00C10001, 0x00C10001, 0x00C10001, 0x00C10001, 0x00C10001, 0x00C10001, 0x00C10001, 0x00C10001, 0x00C10001, 0x00000000, 0x00000000, D_802412F0_AF3F90, 0x00000000, 0x00000006, D_80241350_AF3FF0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 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 deleted file mode 100644 index 0b9511066f..0000000000 --- a/ver/us/asm/data/world/area_kkj/kkj_18/AF4BB0.data.s +++ /dev/null @@ -1,54 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel kkj_18_ItemChoice_HasSelectedItem -.word 0x00000000 - -dlabel kkj_18_ItemChoice_SelectedItemID -.word 0x00000000 - -dlabel D_80241F18_AF4BB8 -.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, kkj_18_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, kkj_18_ItemChoice_SaveSelected, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_802405F8_AF3298, 0xFE363C80, 0x0000004E, 0x00000006, D_80241F18_AF4BB8, 0x00000010, 0x00000000, kkj_18_D_80244CB0, 0x00000000, 0x00000001, 0x00000043, 0x00000002, kkj_18_ItemChoice_WaitForSelection, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802420AC_AF4D4C -.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, kkj_18_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, kkj_18_ItemChoice_SaveSelected, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_80240694_AF3334, 0xFE363C80, 0x0000004E, 0x00000006, D_802420AC_AF4D4C, 0x00000010, 0x00000000, kkj_18_D_80244E78, 0x00000000, 0x00000001, 0x00000043, 0x00000002, kkj_18_ItemChoice_WaitForSelection, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242230_AF4ED0 -.word 0xC1B80000, 0x41F00000, 0x42100000, 0x41800000, 0x42780000, 0xC1200000, 0x42800000, 0x425C0000, 0x40A00000, 0x42E00000, 0x42380000, 0x41A00000, 0x43200000, 0x42700000, 0xC1C80000 - -dlabel D_8024226C_AF4F0C -.word 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000010, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000004, SetNpcVar, 0x00000001, 0x00000000, 0x00000001, 0x00000056, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C80, 0x0000001A, 0x00000027, 0x00000002, 0xFE363C82, 0x00000002, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00580006, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000001, 0xF24A8E80, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, NpcMoveTo, 0x00000001, 0xFFFFFF7E, 0xFFFFFFE2, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0x00000001, 0xFFFFFF7E, 0x0000001E, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0x00000001, 0xFE363C80, 0xFE363C82, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00580001, 0x00000043, 0x00000003, NpcFacePlayer, 0x00000001, 0x00000005, 0x00000043, 0x00000004, SetNpcVar, 0x00000001, 0x00000000, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x0000001A, 0x00000028, 0x00000002, 0xFE363C82, 0x00000002, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x00580006, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000002, 0xF24A8E80, 0x00000043, 0x00000005, NpcMoveTo, 0x00000002, 0xFFFFFF7E, 0xFFFFFFE2, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0x00000002, 0xFFFFFF7E, 0x0000001E, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0x00000002, 0xFFFFFF9C, 0x0000001E, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0x00000002, 0xFE363C80, 0xFE363C82, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x00580001, 0x00000043, 0x00000003, NpcFacePlayer, 0x00000002, 0x00000005, 0x00000057, 0x00000000, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000010E, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000004, GetNpcVar, 0x00000001, 0x00000000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242598_AF5238 -.word 0x00000056, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000005, 0x00000043, 0x00000005, NpcMoveTo, 0x00000001, 0xFE363C80, 0xFE363C82, 0x00000005, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00580012, 0x00000027, 0x00000002, 0xFE363C80, 0x00000005, 0x00000043, 0x00000005, NpcMoveTo, 0x00000001, 0xFE363C80, 0xFE363C82, 0x00000005, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C80, 0x00000005, 0x00000043, 0x00000005, NpcMoveTo, 0x00000002, 0xFE363C80, 0xFE363C82, 0x00000005, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x00580012, 0x00000028, 0x00000002, 0xFE363C80, 0x00000005, 0x00000043, 0x00000005, NpcMoveTo, 0x00000002, 0xFE363C80, 0xFE363C82, 0x00000005, 0x00000057, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, SetPlayerAnimation, 0x000C0005, 0x00000008, 0x00000001, 0x00000001, 0x00000005, 0x00000001, 0x00000004, 0x00000027, 0x00000002, 0xFE363C81, 0x00000002, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x000C0018, 0x00000027, 0x00000002, 0xFE363C80, 0x0000000A, 0x00000005, 0x00000001, 0x00000005, 0x00000027, 0x00000002, 0xFE363C81, 0x00000004, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802427BC_AF545C -.word 0x00000043, 0x00000004, InterpNpcYaw, 0x00000001, 0x0000010E, 0x00000003, 0x00000008, 0x00000001, 0x0000000A, 0x00000056, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000016, 0x00000028, 0x00000002, 0xFE363C82, 0x00000002, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0x0000001E, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000004, SetNpcVar, 0x00000001, 0x00000000, 0x00000001, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00580014, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000001, 0xF24A8E80, 0x00000043, 0x00000005, NpcMoveTo, 0x00000001, 0xFFFFFF78, 0x00000020, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0x00000001, 0xFFFFFF78, 0xFFFFFFE4, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0x00000001, 0xFFFFFEF6, 0xFFFFFFE4, 0x00000000, 0x00000043, 0x00000004, SetNpcVar, 0x00000001, 0x00000000, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x00580014, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000002, 0xF24A8E80, 0x00000043, 0x00000005, NpcMoveTo, 0x00000002, 0xFFFFFF98, 0x0000001C, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0x00000002, 0xFFFFFF98, 0xFFFFFFE0, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0x00000002, 0xFFFFFF16, 0xFFFFFFE0, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0x00000000, 0xFE363C82, 0x00000043, 0x00000004, GetNpcVar, 0x00000001, 0x00000000, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -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, 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, 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 - -dlabel D_802432A4_AF5F44 -.word 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000003, 0x00000384, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000003, 0x00C1000B, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000003, 0xF24A7A82, 0x00000043, 0x00000005, GetNpcPos, 0x00000003, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, NpcJump0, 0x00000003, 0xFE363C80, 0x000000C8, 0xFE363C82, 0x0000000F, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000003, 0x00C10003, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000003, 0x00000100, 0x00000001, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000003, 0xF24ACA80, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000003, 0x00000384, 0x00000000, 0x00000043, 0x00000005, SetNpcRotation, 0x00000003, 0x00000000, 0x00000000, 0xFFFFFFD3, 0x00000043, 0x00000003, SetNpcYaw, 0x00000003, 0x0000005A, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x00000064, 0x0000001E, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000026, 0x00000002, 0xFE363C82, 0xF24A87B4, 0x00000026, 0x00000002, 0xFE363C83, 0xF24A714D, 0x0000002E, 0x00000002, 0xFE363C82, 0xFE363C80, 0x0000002E, 0x00000002, 0xFE363C83, 0xFE363C80, 0x0000002C, 0x00000002, 0xFE363C82, 0xF248EA80, 0x0000002C, 0x00000002, 0xFE363C83, 0xF24CD280, 0x00000026, 0x00000002, 0xFE363C84, 0xF24C0A80, 0x00000043, 0x00000005, SetNpcPos, 0x00000003, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000005, SetNpcRotation, 0x00000003, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000003, 0x00000384, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000003, 0x00000080, 0x00000001, 0x00000043, 0x00000003, SetNpcYaw, 0x00000003, 0x0000010E, 0x00000043, 0x00000005, SetNpcPos, 0x00000003, 0x000000FA, 0x000000A0, 0x00000032, 0x00000043, 0x00000005, NpcMoveTo, 0x00000003, 0xFFFFFF9C, 0x00000032, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000003, 0x00000080, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000003, 0x00000384, 0x00000000, 0x00000043, 0x00000003, SetNpcYaw, 0x00000003, 0x0000005A, 0x00000043, 0x00000005, SetNpcPos, 0x00000003, 0xFFFFFF9C, 0x00000000, 0x00000046, 0x00000043, 0x00000005, NpcMoveTo, 0x00000003, 0x0000008C, 0x00000046, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000004, SetNpcVar, 0x00000003, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802435FC_AF629C -.word 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000003, 0x00002096, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000003, 0x00C10006, 0x00000043, 0x00000007, MakeItemEntity, 0xFD050F80, 0x00000069, 0x0000001E, 0x00000014, 0x00000001, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x00000064, 0x00000004, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000026, 0x00000002, 0xFE363C82, 0xF24A7B4D, 0x00000026, 0x00000002, 0xFE363C83, 0xF24A794D, 0x00000026, 0x00000002, 0xFE363C84, 0xF24A7C80, 0x0000002E, 0x00000002, 0xFE363C82, 0xFE363C80, 0x0000002E, 0x00000002, 0xFE363C83, 0xFE363C80, 0x0000002E, 0x00000002, 0xFE363C84, 0xFE363C80, 0x0000002C, 0x00000002, 0xFE363C82, 0xF24C1E80, 0x0000002C, 0x00000002, 0xFE363C83, 0xF24AF280, 0x0000002C, 0x00000002, 0xFE363C84, 0xF24ACA80, 0x00000043, 0x00000005, SetItemPos, 0xFE363C8A, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x00000064, 0x00000004, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000026, 0x00000002, 0xFE363C82, 0xF24A7B4D, 0x00000026, 0x00000002, 0xFE363C83, 0xF24A7BB4, 0x00000026, 0x00000002, 0xFE363C84, 0xF24A7C80, 0x0000002E, 0x00000002, 0xFE363C82, 0xFE363C80, 0x0000002E, 0x00000002, 0xFE363C83, 0xFE363C80, 0x0000002E, 0x00000002, 0xFE363C84, 0xFE363C80, 0x0000002C, 0x00000002, 0xFE363C82, 0xF24C6E80, 0x0000002C, 0x00000002, 0xFE363C83, 0xF24A7A80, 0x0000002C, 0x00000002, 0xFE363C84, 0xF24B9280, 0x00000043, 0x00000005, SetItemPos, 0xFE363C8A, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C8A, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000003, 0x00C10001, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000003, 0x00C10004, 0x00C10001, 0x00000005, 0x001400A5, 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, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000014, 0x00000001, 0xF70F2E81, 0x00000016, 0x00000001, 0x00000005, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000003, 0x00C10004, 0x00C10001, 0x00000005, 0x001400AA, 0x00000016, 0x00000001, 0x00000004, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000003, 0x00C10004, 0x00C10001, 0x00000005, 0x001400A9, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000003, 0x00C10004, 0x00C10001, 0x00000005, 0x001400A8, 0x0000001D, 0x00000001, 0x00000001, 0x0000001D, 0x00000001, 0x00000003, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000003, 0x00C10004, 0x00C10001, 0x00000005, 0x001400A7, 0x00000020, 0x00000000, 0x00000023, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000003, 0x00C10002, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000003, 0x00000000, 0x00000043, 0x00000006, NpcJump1, 0x00000003, 0x00000078, 0x00000000, 0xFFFFFFEC, 0x0000000F, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000003, 0x00C10001, 0x00000043, 0x00000003, ResetCam, 0x00000000, 0xF24A7E80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80243A88_AF6728 -.word 0x00000043, 0x00000002, SetPlayerAnimation, 0x000C0005, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000005A, 0x00000005, 0x00000043, 0x00000002, SetPlayerAnimation, 0x000A0001, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000023, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x0000000A, ShowSweat, 0x00000000, 0x00000001, 0xFFFFFFD3, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000D, 0x00000014, 0x00000008, 0x00000001, 0x00000014, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80243B50_AF67F0 -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000003, 0x00C10004, 0x00C10001, 0x00000000, 0x0014009A, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, SetPlayerSpeed, 0xF24A8A80, 0x00000043, 0x00000004, PlayerMoveTo, 0xFFFFFF83, 0x00000028, 0x00000000, 0x00000043, 0x00000004, PlayerMoveTo, 0x00000032, 0x00000028, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFE, 0x000D0004, 0x000A0001, 0x00000005, 0x0014009B, 0x00000043, 0x00000007, AdjustCam, 0x00000000, 0xF24A8A80, 0x00000023, 0x0000012C, 0xF24ABE80, 0xF24A4E80, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000003, 0x00C10004, 0x00C10001, 0x00000005, 0x0014009C, 0x00000043, 0x00000002, SetPlayerAnimation, 0x000C0000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, SetPlayerAnimation, 0x000C0026, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFE, 0x000C0001, 0x000C0026, 0x00000005, 0x0014009D, 0x00000043, 0x00000002, SetPlayerAnimation, 0x000C0002, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, SetPlayerAnimation, 0x000A0001, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000003, 0x00C10004, 0x00C10001, 0x00000005, 0x0014009E, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000003, 0x00C10002, 0x00000043, 0x00000005, NpcMoveTo, 0x00000003, 0x00000064, 0xFFFFFFEC, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000003, 0x00C10001, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000003, 0x00C10004, 0x00C10001, 0x00000005, 0x0014009F, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000003, 0x00C1000C, 0x00000008, 0x00000001, 0x0000001E, 0x00000024, 0x00000002, 0xFE363C80, 0x0000006A, 0x00000043, 0x00000004, ShowGotItem, 0xFE363C80, 0x00000001, 0x00000000, 0x00000043, 0x00000002, AddKeyItem, 0xFE363C80, 0x00000024, 0x00000002, 0xF8405D73, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000003, 0x00C10002, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000003, 0x00000000, 0x00000043, 0x00000006, NpcJump1, 0x00000003, 0x00000078, 0x00000000, 0xFFFFFFEC, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000003, 0x00C10001, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000003, 0x00C10004, 0x00C10001, 0x00000005, 0x001400A0, 0x00000043, 0x00000003, ResetCam, 0x00000000, 0xF24A8A80, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80243E50_AF6AF0 -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x0000000A, 0x00000002, 0xF9718890, 0x00000000, 0x00000024, 0x00000002, 0xFD050F80, 0x00000164, 0x00000024, 0x00000002, 0xFE363C80, 0x000D0002, 0x00000024, 0x00000002, 0xFE363C81, 0x000A0027, 0x00000012, 0x00000000, 0x0000000A, 0x00000002, 0xF971888F, 0x00000000, 0x00000024, 0x00000002, 0xFD050F80, 0x00000165, 0x00000024, 0x00000002, 0xFE363C80, 0x000D0003, 0x00000024, 0x00000002, 0xFE363C81, 0x000A0029, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFD050F80, 0x0000015E, 0x00000024, 0x00000002, 0xFE363C80, 0x000D0000, 0x00000024, 0x00000002, 0xFE363C81, 0x000A0017, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFE, 0xFE363C80, 0xFE363C81, 0x00000005, 0x001400A2, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x00000078, 0x00000000, 0x0000000A, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x00000078, 0x00000000, 0x0000000A, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000003, 0x00C10004, 0x00C10001, 0x00000005, 0x001400A3, 0x00000043, 0x00000003, ResetCam, 0x00000000, 0xF24BE280, 0x00000043, 0x00000002, SetPlayerSpeed, 0xF24A8280, 0x00000043, 0x00000004, PlayerMoveTo, 0xFFFFFF83, 0x00000028, 0x00000000, 0x00000043, 0x00000004, PlayerMoveTo, 0x0000000F, 0x00000028, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000007, MakeItemEntity, 0xFD050F80, 0x00000019, 0x00000019, 0xFFFFFFEC, 0x00000001, 0x00000000, 0x00000043, 0x00000004, SetNpcVar, 0x00000003, 0x00000007, 0xFE363C80, 0x00000024, 0x00000002, 0xF9718891, 0x00000000, 0x00000043, 0x00000002, func_80240730_AF33D0, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000008, NpcFlyTo, 0xFFFFFFFC, 0xFFFFFFE9, 0x0000001E, 0x00000024, 0x00000005, 0x00000000, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0x0000005A, 0x00000005, 0x00000057, 0x00000000, 0x00000043, 0x00000004, PlayerMoveTo, 0x00000011, 0x00000024, 0x00000005, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000005A, 0x00000005, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000003, 0x00C10004, 0x00C10001, 0x00000005, 0x001400A4, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000003, 0x00C10002, 0x00000043, 0x00000005, NpcMoveTo, 0x00000003, 0x0000005A, 0xFFFFFFEC, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000003, 0x00C10001, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x0000005A, 0x00000000, 0x0000000A, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x0000005A, 0x00000000, 0x0000000A, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x000000FA, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0x00000011, 0xFFFFFFF2, 0x00000043, 0x00000004, SetCamPosB, 0x00000000, 0xF24C3280, 0xF24B3080, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8680, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000004, GetNpcVar, 0x00000003, 0x00000007, 0xFE363C8A, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C8A, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000003, 0x00C10005, 0x00000005, 0x00000001, 0x00000006, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000003, 0x00002095, 0x00000000, 0x00000006, 0x00000000, 0x0000000B, 0x00000002, 0xF70F2E81, 0x00000006, 0x00000046, 0x00000001, D_802435FC_AF629C, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, SetEnemyFlagBits, 0x00000003, 0x08000000, 0x00000001, 0x00000046, 0x00000001, D_80242EB4_AF5B54, 0x00000043, 0x00000004, SetNpcVar, 0x00000003, 0x00000000, 0x00000001, 0x00000044, 0x00000001, D_802432A4_AF5F44, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000003, 0x00000000, 0x00000043, 0x00000004, NpcFaceNpc, 0xFFFFFFFC, 0x00000003, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000004, GetNpcVar, 0x00000003, 0x00000000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000044, 0x00000001, 0x80240870, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000003, 0x00C10001, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000003, 0x0000010E, 0x00000005, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000003, 0x00C10004, 0x00C10001, 0x00000000, 0x001400AC, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000003, 0x00C10002, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000003, 0xF24A8280, 0x00000043, 0x00000005, NpcMoveTo, 0x00000003, 0x00000050, 0x00000046, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000003, 0x00C10001, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000003, 0x00C10004, 0x00C10001, 0x00000000, 0x001400AD, 0x00000056, 0x00000000, 0x00000005, 0x00000001, 0x00000064, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000003, 0x00000000, 0x00000043, 0x00000004, NpcFaceNpc, 0xFFFFFFFC, 0x00000003, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000003, 0x00C10002, 0x00000043, 0x00000005, NpcMoveTo, 0x00000003, 0xFFFFFF06, 0x00000046, 0x00000000, 0x00000043, 0x00000007, AdjustCam, 0x00000000, 0xF24A8280, 0xFFFFFFEC, 0x0000012C, 0xF24ABE80, 0xF24A5280, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000010E, 0x00000005, 0x00000043, 0x00000002, SetPlayerAnimation, 0x000C0000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, SetPlayerAnimation, 0x000C0026, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFE, 0x000C0001, 0x000C0026, 0x00000005, 0x001400AE, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x00200009, 0x00200001, 0x00000000, 0x001400AF, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFE, 0x000C0001, 0x000C0026, 0x00000005, 0x001400B0, 0x00000043, 0x00000002, SetPlayerAnimation, 0x000C0002, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, SetPlayerAnimation, 0x000A0001, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x00200009, 0x00200001, 0x00000000, 0x001400B1, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x00000078, 0x00000000, 0x0000000A, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x00000096, 0x00000000, 0x0000000A, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x00000190, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A7F4D, 0x00000043, 0x00000005, LoadPath, 0x0000003C, D_80242230_AF4ED0, 0x00000005, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, GetNextPathPos, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000040, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x00200009, 0x00200001, 0x00000010, 0x001400B2, 0x00000044, 0x00000001, D_80242A5C_AF56FC, 0x00000008, 0x00000001, 0x0000000E, 0x00000043, 0x00000008, NpcFlyTo, 0xFFFFFFFC, 0x000000FA, 0x00000046, 0xFFFFFFE7, 0x0000001E, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000005, SetNpcPos, 0x00000001, 0xFFFFFF06, 0x00000000, 0xFFFFFFE2, 0x00000043, 0x00000005, SetNpcPos, 0x00000002, 0xFFFFFF06, 0x00000000, 0xFFFFFFE2, 0x00000043, 0x00000005, SetNpcPos, 0x00000000, 0xFFFFFF06, 0x00000000, 0xFFFFFFE2, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00600004, 0x00600001, 0x00000000, 0x001400B3, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000046, 0x00000000, 0x00000008, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFFFFFF4C, 0x00000000, 0xFFFFFFE2, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFFFFFF4C, 0x00000000, 0xFFFFFFE2, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF24F2A80, 0x00000043, 0x00000004, SetCamPosA, 0x00000000, 0xF248C280, 0xF24B3080, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8E80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x00000002, 0x000001C1, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0xFFFFFF88, 0x0000000E, 0x00000004, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateModel, 0x00000002, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000003C, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFFFFE2, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x00000190, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A7E80, 0x00000057, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00600002, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000000, 0xF24A8280, 0x00000043, 0x00000005, NpcMoveTo, 0x00000000, 0xFFFFFF7E, 0xFFFFFFE2, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0x00000000, 0xFFFFFF88, 0x00000050, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0x00000000, 0xFFFFFFBA, 0x00000050, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00600001, 0x00000045, 0x00000002, D_80243A88_AF6728, 0xFE363C8A, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00600004, 0x00600001, 0x00000000, 0x001400B4, 0x00000043, 0x00000005, EndSpeech, 0x00000000, 0x00600005, 0x00600005, 0x00000005, 0x00000043, 0x00000007, SpeakToNpc, 0x00000000, 0x00600005, 0x00600001, 0x00000000, 0x00000001, 0x001400B5, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000046, 0x00000001, D_8024226C_AF4F0C, 0x00000046, 0x00000001, D_80242598_AF5238, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFE, 0x000C0018, 0x000C0018, 0x00000005, 0x001400B6, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000000, 0x0000010E, 0x00000005, 0x00000057, 0x00000000, 0x00000046, 0x00000001, D_802427BC_AF545C, 0x00000043, 0x00000003, FadeOutMusic, 0x00000000, 0x000003E8, 0x00000046, 0x00000001, 0x802409E0, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, SetCamLeadPlayer, 0x00000000, 0x00000000, 0x0000000A, 0x00000002, 0xF8405D73, 0x00000000, 0x00000046, 0x00000001, D_80243B50_AF67F0, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF9718891, 0x00000001, 0x00000046, 0x00000001, D_80243E50_AF6AF0, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kkj/kkj_19/AF8660.data.s b/ver/us/asm/data/world/area_kkj/kkj_19/AF8660.data.s deleted file mode 100644 index d21a24b15e..0000000000 --- a/ver/us/asm/data/world/area_kkj/kkj_19/AF8660.data.s +++ /dev/null @@ -1,42 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240D10_AF8660 -.word 0x43F28000, 0x00000000, 0x41C80000, 0x43A50000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_802410C0_AF8A10, D_80240D10_AF8660, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00190014 - -dlabel D_80240D60_AF86B0 -.word 0x0000000A, 0x00000002, 0xF5DE0180, 0xFFFFFF80, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x0000003F, 0x00000001, 0x00000007, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x0000003F, 0x00000001, 0x00000006, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF5DE0180, 0x00000006, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000074, 0x00000000, 0x00000008, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240E10_AF8760 -.word 0x0000005D, 0x00000011, 0x00000000, 0x0000005E, 0x00000012, 0x00000000, 0x0000005F, 0x00000013, 0x00000000, 0x00000061, 0x00000015, 0x00000000, 0x00000060, 0x00000016, 0x00000000, 0x00000062, 0x00000017, 0x00000000, 0x00000063, 0x00000018, 0x00000000, 0x00000064, 0x00000019, 0x00000000, 0x00000065, 0x00000010, 0x00000000, 0x00000066, 0x00000014, 0x00000000 - -dlabel D_80240E88_AF87D8 -.word 0x00000000 - -dlabel D_80240E8C_AF87DC -.word 0x00000000 - -dlabel D_80240E90_AF87E0 -.word 0x00000000 - -dlabel D_80240E94_AF87E4 -.word 0x00000043, 0x00000002, func_80240000_AF7950, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 - -dlabel D_80240EB8_AF8808 -.word 0x00000000, 0x00000000, 0x00000000, ui_box_corners5_png, 0x31100810, 0x08100810, 0x08000000, 0x00000000, 0xFC617E60, 0xF5FFF578, 0xFC612660, 0xF5FFFF78, 0xFFB7B5FF, 0x7A593FFF - -dlabel D_80240EF0_AF8840 -.word 0x0A000064, 0x00420078, 0x001C0000, func_802400E4_AF7A34, 0x00000000, 0xFF000000, 0x00000002, 0x00000000, D_80240EB8_AF8808, 0x0B000020, 0x00B80100, 0x00200000, func_80240178_AF7AC8, 0x00000000, 0xFF000000, 0x00000002, 0x00000000, 0xFFFFFFFF - -dlabel D_80240F38_AF8888 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000002, 0x00000024, 0x00000002, 0xFE363C82, 0x00000002, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFFFF, 0x00000044, 0x00000001, ExitSingleDoor, 0x00000008, 0x00000001, 0x00000011, 0x0000000A, 0x00000002, 0xF5DE0180, 0xFFFFFF80, 0x00000043, 0x00000003, GotoMap, 0x802461A8, 0x00000003, 0x00000012, 0x00000000, 0x00000043, 0x00000003, GotoMap, 0x802461A0, 0x00000003, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241010_AF8960 -.word 0x00000047, 0x00000005, D_80240F38_AF8888, 0x00000100, 0x00000002, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024103C_AF898C -.word 0x0000000A, 0x00000002, 0xF5DE0180, 0x00000006, 0x00000044, 0x00000001, 0x80243F14, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x00000002, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFFFF, 0x00000046, 0x00000001, EnterSingleDoor, 0x00000044, 0x00000001, D_80241010_AF8960, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802410C0_AF8A10 -.word 0x00000024, 0x00000002, 0xF5DE0329, 0x0000001A, 0x00000043, 0x00000002, SetSpriteShading, 0xFFFFFFFF, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000014, 0x00000001, 0xF5DE0180, 0x00000016, 0x00000001, 0xFFFFFF80, 0x00000043, 0x00000003, MakeNpcs, 0x00000000, 0x802416E4, 0x00000016, 0x00000001, 0x00000006, 0x00000043, 0x00000003, MakeNpcs, 0x00000000, 0x80241AF4, 0x00000023, 0x00000000, 0x00000044, 0x00000001, D_80240D60_AF86B0, 0x00000043, 0x00000002, UseDoorSounds, 0x00000000, 0x00000044, 0x00000001, D_8024103C_AF898C, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xF5DE0180, 0x00000006, 0x00000043, 0x00000001, func_802401FC_AF7B4C, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kkj/kkj_19/AF8B40.data.s b/ver/us/asm/data/world/area_kkj/kkj_19/AF8B40.data.s deleted file mode 100644 index 82c446deca..0000000000 --- a/ver/us/asm/data/world/area_kkj/kkj_19/AF8B40.data.s +++ /dev/null @@ -1,21 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802411F0_AF8B40 -.word 0x00000000, 0x001E0018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000, 0x00000000, 0x00170013, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000 - -dlabel D_80241248_AF8B98 -.word 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AA0004, 0x00AA0001, 0x00000000, 0x00000031, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241278_AF8BC8 -.word 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00830004, 0x00830001, 0x00000000, 0x00000032, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802412A8_AF8BF8 -.word 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00AA0001, 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, D_80241248_AF8B98, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802412E0_AF8C30 -.word 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, D_80241278_AF8BC8, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241304_AF8C54 -.word 0x00000000, D_802411F0_AF8B40, 0x43C80000, 0x00000000, 0xC28C0000, 0x00000D09, D_802412A8_AF8BF8, 0x00000000, 0x00000000, 0x0000005A, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00AA0001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, D_802411F0_AF8B40, 0x437A0000, 0x00000000, 0xC2DC0000, 0x00000D09, D_802412E0_AF8C30, 0x00000000, 0x00000000, 0x0000010E, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00830001, 0x00830002, 0x00830003, 0x00830003, 0x00830001, 0x00830001, 0x00830006, 0x00830006, 0x00830003, 0x00830003, 0x00830003, 0x00830003, 0x00830003, 0x00830003, 0x00830003, 0x00830003, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, D_80241304_AF8C54, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kkj/kkj_19/AF9050.data.s b/ver/us/asm/data/world/area_kkj/kkj_19/AF9050.data.s deleted file mode 100644 index 15e30b127a..0000000000 --- a/ver/us/asm/data/world/area_kkj/kkj_19/AF9050.data.s +++ /dev/null @@ -1,18 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80241700_AF9050 -.word 0x00000000, 0x001A0018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000, 0x00000000, 0x00140014, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000, 0x00000000, 0x00160018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000 - -dlabel D_80241784_AF90D4 -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802417A8_AF90F8 -.word 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, GetSelfVar, 0x00000001, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000003, NpcFacePlayer, 0xFFFFFFFC, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241850_AF91A0 -.word 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000002, 0x00000001, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, SetNpcCollisionSize, 0xFFFFFFFF, 0x00000014, 0x00000014, 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, D_80241784_AF90D4, 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, D_802417A8_AF90F8, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241904_AF9254 -.word 0x00000000, D_80241700_AF9050, 0x00000000, 0xC3FA0000, 0x00000000, 0x08000F05, D_80241850_AF91A0, 0x00000000, 0x00000000, 0x00000000, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00200001, 0x00200005, 0x00200008, 0x00200008, 0x00200001, 0x00200001, 0x00200001, 0x00200001, 0x00200001, 0x00200001, 0x00200001, 0x00200001, 0x00200001, 0x00200001, 0x00200001, 0x00200001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, D_80241904_AF9254, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kkj/kkj_19/AF9460.data.s b/ver/us/asm/data/world/area_kkj/kkj_19/AF9460.data.s deleted file mode 100644 index 2b4b29dc2a..0000000000 --- a/ver/us/asm/data/world/area_kkj/kkj_19/AF9460.data.s +++ /dev/null @@ -1,78 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel kkj_19_ItemChoice_HasSelectedItem -.word 0x00000000 - -dlabel kkj_19_ItemChoice_SelectedItemID -.word 0x00000000 - -dlabel D_80241B18_AF9468 -.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, kkj_19_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, kkj_19_ItemChoice_SaveSelected, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_80240568_AF7EB8, 0xFE363C80, 0x0000004E, 0x00000006, D_80241B18_AF9468, 0x00000010, 0x00000000, kkj_19_D_802461F0, 0x00000000, 0x00000001, 0x00000043, 0x00000002, kkj_19_ItemChoice_WaitForSelection, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241CAC_AF95FC -.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, kkj_19_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, kkj_19_ItemChoice_SaveSelected, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_80240604_AF7F54, 0xFE363C80, 0x0000004E, 0x00000006, D_80241CAC_AF95FC, 0x00000010, 0x00000000, D_802463B8_kkj_19, 0x00000000, 0x00000001, 0x00000043, 0x00000002, kkj_19_ItemChoice_WaitForSelection, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241E30_AF9780 -.word 0x0000005D, 0x0000005E, 0x0000005F, 0x00000061, 0x00000060, 0x00000062, 0x00000063, 0x00000064, 0x00000065, 0x00000066 - -dlabel D_80241E58_AF97A8 -.word 0x00000014, 0x00000001, 0xF70F2E81, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000007, MakeItemEntity, 0x00000162, 0x0000011F, 0x00000010, 0xFFFFFFD8, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF70F2E84, 0xFE363C80, 0x00000043, 0x00000007, MakeItemEntity, 0x00000160, 0x000000E6, 0x00000010, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF70F2E85, 0xFE363C80, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000007, MakeItemEntity, 0x00000162, 0x0000011F, 0x00000010, 0xFFFFFFD8, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF70F2E84, 0xFE363C80, 0x00000043, 0x00000007, MakeItemEntity, 0x00000160, 0x000000E6, 0x00000010, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF70F2E85, 0xFE363C80, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000007, MakeItemEntity, 0x00000163, 0x0000011F, 0x00000010, 0xFFFFFFD8, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF70F2E84, 0xFE363C80, 0x00000043, 0x00000007, MakeItemEntity, 0x00000160, 0x000000E6, 0x00000010, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF70F2E85, 0xFE363C80, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000007, MakeItemEntity, 0x00000163, 0x0000011F, 0x00000010, 0xFFFFFFD8, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF70F2E84, 0xFE363C80, 0x00000043, 0x00000007, MakeItemEntity, 0x00000160, 0x000000E6, 0x00000010, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF70F2E85, 0xFE363C80, 0x00000016, 0x00000001, 0x00000004, 0x00000043, 0x00000007, MakeItemEntity, 0x00000163, 0x0000011F, 0x00000010, 0xFFFFFFD8, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF70F2E84, 0xFE363C80, 0x00000043, 0x00000007, MakeItemEntity, 0x00000160, 0x000000E6, 0x00000010, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF70F2E85, 0xFE363C80, 0x00000016, 0x00000001, 0x00000005, 0x00000043, 0x00000007, MakeItemEntity, 0x0000015F, 0x0000011F, 0x00000014, 0xFFFFFFE2, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF70F2E85, 0xFE363C80, 0x00000043, 0x00000007, MakeItemEntity, 0x00000162, 0x000000E6, 0x00000010, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF70F2E84, 0xFE363C80, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242134_AF9A84 -.word 0x00000043, 0x00000002, SetPlayerAnimation, 0x000C0020, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000014, 0x00000001, 0xF70F2E83, 0x00000016, 0x00000001, 0x00000002, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000016, 0x00000001, 0x00000003, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x000C0020, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x000C0021, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000002, SetPlayerAnimation, 0x000C0022, 0x00000024, 0x00000002, 0xFE363C80, 0x00000003, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000002, SetPlayerAnimation, 0x000C0023, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000023, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000013, 0x00000000, 0x00000023, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802422C4_AF9C14 -.word 0x0000000B, 0x00000002, 0xF70F2E82, 0x00000000, 0x00000043, 0x00000003, FindKeyItem, 0xF70F2E82, 0xFE363C80, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C80, 0x00000024, 0x00000002, 0xF70F2E82, 0x00000000, 0x00000043, 0x00000002, func_80240C10_AF8560, 0x00000000, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242340_AF9C90 -.word 0x0000000A, 0x00000002, 0xF70F2E80, 0x00000006, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, kkj_19_GetFloorCollider, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000011, 0x00000024, 0x00000002, 0xFE363C80, 0x0000005D, 0x00000016, 0x00000001, 0x00000012, 0x00000024, 0x00000002, 0xFE363C80, 0x0000005E, 0x00000016, 0x00000001, 0x00000013, 0x00000024, 0x00000002, 0xFE363C80, 0x0000005F, 0x00000016, 0x00000001, 0x00000015, 0x00000024, 0x00000002, 0xFE363C80, 0x00000061, 0x00000016, 0x00000001, 0x00000016, 0x00000024, 0x00000002, 0xFE363C80, 0x00000060, 0x00000016, 0x00000001, 0x00000017, 0x00000024, 0x00000002, 0xFE363C80, 0x00000062, 0x00000016, 0x00000001, 0x00000018, 0x00000024, 0x00000002, 0xFE363C80, 0x00000063, 0x00000016, 0x00000001, 0x00000019, 0x00000024, 0x00000002, 0xFE363C80, 0x00000064, 0x00000016, 0x00000001, 0x00000010, 0x00000024, 0x00000002, 0xFE363C80, 0x00000065, 0x00000016, 0x00000001, 0x00000014, 0x00000024, 0x00000002, 0xFE363C80, 0x00000066, 0x0000001C, 0x00000000, 0x00000002, 0x00000000, 0x00000023, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xF9718892, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C80, 0x0000000A, 0x00000002, 0xF70F2E82, 0x00000000, 0x00000043, 0x00000002, func_80240B8C_AF84DC, 0xFE363C8A, 0x00000043, 0x00000003, SetMessageText, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000002, kkj_19_GetFloorCollider, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000011, 0x00000024, 0x00000002, 0xFE363C80, 0x00000010, 0x00000016, 0x00000001, 0x00000012, 0x00000024, 0x00000002, 0xFE363C80, 0x0000000F, 0x00000016, 0x00000001, 0x00000013, 0x00000024, 0x00000002, 0xFE363C80, 0x00000008, 0x00000016, 0x00000001, 0x00000015, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000016, 0x00000001, 0x00000016, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000016, 0x00000001, 0x00000017, 0x00000024, 0x00000002, 0xFE363C80, 0x00000003, 0x00000016, 0x00000001, 0x00000018, 0x00000024, 0x00000002, 0xFE363C80, 0x00000004, 0x00000016, 0x00000001, 0x00000019, 0x00000024, 0x00000002, 0xFE363C80, 0x00000005, 0x00000016, 0x00000001, 0x00000010, 0x00000024, 0x00000002, 0xFE363C80, 0x00000007, 0x00000016, 0x00000001, 0x00000014, 0x00000024, 0x00000002, 0xFE363C80, 0x00000006, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_80240C10_AF8560, 0xFE363C80, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000000, 0x00000024, 0x00000002, 0xF70F2E82, 0xFE363C8B, 0x00000043, 0x00000002, AddKeyItem, 0xFE363C8B, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001400E7, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000003, FindKeyItem, 0xFE363C80, 0xFE363C81, 0x0000000A, 0x00000002, 0xFE363C81, 0xFFFFFFFF, 0x00000024, 0x00000002, 0xFE363C89, 0xF70F2E82, 0x00000043, 0x00000002, func_80240B8C_AF84DC, 0xFE363C89, 0x00000043, 0x00000002, func_80240B8C_AF84DC, 0xFE363C8A, 0x00000043, 0x00000003, SetMessageText, 0xFE363C89, 0x00000000, 0x00000043, 0x00000003, SetMessageText, 0xFE363C8A, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001400E9, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, ShowChoice, 0x001E002B, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000046, 0x00000001, D_802422C4_AF9C14, 0x00000043, 0x00000002, kkj_19_GetFloorCollider, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000011, 0x00000024, 0x00000002, 0xFE363C80, 0x00000010, 0x00000016, 0x00000001, 0x00000012, 0x00000024, 0x00000002, 0xFE363C80, 0x0000000F, 0x00000016, 0x00000001, 0x00000013, 0x00000024, 0x00000002, 0xFE363C80, 0x00000008, 0x00000016, 0x00000001, 0x00000015, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000016, 0x00000001, 0x00000016, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000016, 0x00000001, 0x00000017, 0x00000024, 0x00000002, 0xFE363C80, 0x00000003, 0x00000016, 0x00000001, 0x00000018, 0x00000024, 0x00000002, 0xFE363C80, 0x00000004, 0x00000016, 0x00000001, 0x00000019, 0x00000024, 0x00000002, 0xFE363C80, 0x00000005, 0x00000016, 0x00000001, 0x00000010, 0x00000024, 0x00000002, 0xFE363C80, 0x00000007, 0x00000016, 0x00000001, 0x00000014, 0x00000024, 0x00000002, 0xFE363C80, 0x00000006, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_80240C10_AF8560, 0xFE363C80, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000000, 0x00000024, 0x00000002, 0xF70F2E82, 0xFE363C8B, 0x00000043, 0x00000002, AddKeyItem, 0xFE363C8B, 0x00000043, 0x00000002, SwitchMessage, 0x001400EA, 0x00000012, 0x00000000, 0x00000043, 0x00000001, CloseMessage, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, func_80240B8C_AF84DC, 0xFE363C8A, 0x00000043, 0x00000003, SetMessageText, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001400E6, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, ShowChoice, 0x001E002B, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000046, 0x00000001, D_802422C4_AF9C14, 0x00000043, 0x00000002, SwitchMessage, 0x001400E8, 0x00000012, 0x00000000, 0x00000043, 0x00000001, CloseMessage, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xF9718892, 0x00000001, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242A18_AFA368 -.word 0x0000000A, 0x00000002, 0xF70F2E80, 0x00000006, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000004D, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000001, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C82, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C82, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000000, 0x00000002, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000000, 0x00000002, 0x00000000, 0x00000023, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000024, 0x00000002, 0xF70F2E82, 0x00000000, 0x00000043, 0x00000002, func_80240C10_AF8560, 0x00000000, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000000, 0x00000014, 0x00000001, 0xF70F2E80, 0x00000016, 0x00000001, 0x00000001, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x0000005D, 0x00000024, 0x00000002, 0xF971888B, 0x00000001, 0x00000016, 0x00000001, 0x0000005F, 0x00000024, 0x00000002, 0xF971888A, 0x00000001, 0x0000001C, 0x00000000, 0x00000024, 0x00000002, 0xF971888E, 0x00000000, 0x00000023, 0x00000000, 0x0000000A, 0x00000002, 0xF70F2E83, 0x00000000, 0x00000043, 0x00000002, RemoveItemEntity, 0xF70F2E84, 0x00000043, 0x00000007, MakeItemEntity, 0x00000163, 0x0000011F, 0x00000010, 0xFFFFFFD8, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF70F2E84, 0xFE363C80, 0x00000013, 0x00000000, 0x0000000D, 0x00000002, 0xF70F2E83, 0x00000001, 0x00000024, 0x00000002, 0xF971888E, 0x00000000, 0x00000013, 0x00000000, 0x00000016, 0x00000001, 0x00000003, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000065, 0x00000024, 0x00000002, 0xF971888C, 0x00000001, 0x00000016, 0x00000001, 0x00000062, 0x00000024, 0x00000002, 0xF971888D, 0x00000001, 0x0000001C, 0x00000000, 0x00000024, 0x00000002, 0xF971888E, 0x00000000, 0x00000023, 0x00000000, 0x0000000D, 0x00000002, 0xF70F2E83, 0x00000001, 0x00000024, 0x00000002, 0xF971888E, 0x00000000, 0x00000013, 0x00000000, 0x00000016, 0x00000001, 0x00000005, 0x00000014, 0x00000001, 0xF70F2E83, 0x00000016, 0x00000001, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000060, 0x00000024, 0x00000002, 0xF9718889, 0x00000001, 0x00000013, 0x00000000, 0x00000016, 0x00000001, 0x00000001, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000061, 0x00000024, 0x00000002, 0xF9718889, 0x00000001, 0x00000013, 0x00000000, 0x0000001C, 0x00000000, 0x00000024, 0x00000002, 0xF9718889, 0x00000001, 0x00000023, 0x00000000, 0x00000043, 0x00000002, RemoveItemEntity, 0xF70F2E85, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000061, 0x0000000A, 0x00000002, 0xF971888F, 0x00000000, 0x00000043, 0x00000007, MakeItemEntity, 0x00000165, 0x0000011F, 0x00000014, 0xFFFFFFE2, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF70F2E85, 0xFE363C80, 0x00000012, 0x00000000, 0x00000043, 0x00000007, MakeItemEntity, 0x0000015E, 0x0000011F, 0x00000014, 0xFFFFFFE2, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF70F2E85, 0xFE363C80, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xF9718890, 0x00000001, 0x0000001C, 0x00000000, 0x00000043, 0x00000007, MakeItemEntity, 0x00000164, 0x0000011F, 0x00000014, 0xFFFFFFE2, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF70F2E85, 0xFE363C80, 0x00000024, 0x00000002, 0xF971888F, 0x00000001, 0x00000024, 0x00000002, 0xF9718890, 0x00000000, 0x00000023, 0x00000000, 0x00000023, 0x00000000, 0x00000027, 0x00000002, 0xF70F2E83, 0x00000001, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242EC4_AFA814 -.word 0x0000004E, 0x00000006, D_80242A18_AFA368, 0x00000800, 0x00000007, D_80241E30_AF9780, 0x00000000, 0x00000000, 0x00000047, 0x00000005, D_80242340_AF9C90, 0x00000800, 0x00000011, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80242340_AF9C90, 0x00000800, 0x00000012, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80242340_AF9C90, 0x00000800, 0x00000013, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80242340_AF9C90, 0x00000800, 0x00000015, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80242340_AF9C90, 0x00000800, 0x00000016, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80242340_AF9C90, 0x00000800, 0x00000017, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80242340_AF9C90, 0x00000800, 0x00000018, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80242340_AF9C90, 0x00000800, 0x00000019, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80242340_AF9C90, 0x00000800, 0x00000010, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80242340_AF9C90, 0x00000800, 0x00000014, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024300C_AFA95C -.word 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x0000005A, 0x0000000A, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateGroup, 0x00000017, 0xFE363C80, 0x00000001, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802430A4_AFA9F4 -.word 0x00000043, 0x00000005, MakeLerp, 0x0000005A, 0x00000000, 0x0000000A, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateGroup, 0x00000017, 0xFE363C80, 0x00000001, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024313C_AFAA8C -.word 0x0000000A, 0x00000002, 0xF9718890, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000011, 0x00000012, 0x00000000, 0x0000000A, 0x00000002, 0xF971888F, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000012, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000009, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, RemoveItemEntity, 0xF70F2E85, 0x00000043, 0x00000002, func_80240C10_AF8560, 0xFE363C80, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000000, 0x00000024, 0x00000002, 0xF9718891, 0x00000001, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80243204_AFAB54 -.word 0x00000047, 0x00000005, D_8024313C_AFAA8C, 0x00000100, 0x0000000D, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80243230_AFAB80 -.word 0x43DC0000, 0x41C80000, 0xC1F00000, 0x43F00000, 0x42700000, 0xC2700000, 0x44098000, 0x42480000, 0xC2B40000, 0x44138000, 0x42200000, 0xC2DC0000, 0x441D8000, 0x42C80000, 0xC2F80000 - -dlabel D_8024326C_AFABBC -.word 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x000000C8, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24ABE80, 0xF24A6880, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8A80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024333C_AFAC8C -.word 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000027, 0x00000002, 0xFE363C80, 0xFE363C83, 0x0000002A, 0x00000002, 0xFE363C80, 0x00000002, 0x00000027, 0x00000002, 0xFE363C81, 0xFE363C84, 0x0000002A, 0x00000002, 0xFE363C81, 0x00000002, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x00000113, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8A80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024344C_AFAD9C -.word 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x00000082, 0x00000000, 0xFFFFFF9C, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x00000082, 0x00000000, 0xFFFFFF9C, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x000000FA, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24ABE80, 0xF24A4680, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80243500_AFAE50 -.word 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x0000014A, 0x00000000, 0xFFFFFFB0, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x0000014A, 0x00000000, 0xFFFFFFB0, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF24F2A80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024359C_AFAEEC -.word 0x00000043, 0x00000004, SetEnemyFlagBits, 0x00000000, 0x08000000, 0x00000001, 0x00000043, 0x00000004, SetNpcVar, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000C, 0x00000002, 0xFE363C80, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C80, 0x00000028, 0x00000012, 0x00000000, 0x00000028, 0x00000002, 0xFE363C80, 0x00000028, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C81, 0x0000001E, 0x00000043, 0x00000008, NpcFlyTo, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000F, 0xFFFFFFFB, 0x00000000, 0x00000043, 0x00000003, NpcFacePlayer, 0xFFFFFFFC, 0x00000005, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024369C_AFAFEC -.word 0x00000043, 0x00000003, SetNpcSpeed, 0xFFFFFFFC, 0xF24A8280, 0x00000043, 0x00000008, NpcFlyTo, 0xFFFFFFFC, 0x00000186, 0x00000032, 0xFFFFFFBA, 0x00000000, 0xFFFFFFFB, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0x0000010E, 0x00000005, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80243700_AFB050 -.word 0x0000000A, 0x00000002, 0xF9718891, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x0000000A, 0x00000002, 0xF70F2E80, 0x00000006, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x00200009, 0x00200001, 0x00000000, 0x001400C1, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x00200009, 0x00200001, 0x00000000, 0x001400BE, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000002, 0x00000024, 0x00000002, 0xFE363C82, 0x00000002, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFFFF, 0x00000044, 0x00000001, ExitSingleDoor, 0x00000008, 0x00000001, 0x00000011, 0x00000043, 0x00000003, GotoMap, 0x802461E4, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80243828_AFB178 -.word 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x00000002, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFFFF, 0x00000046, 0x00000001, EnterSingleDoor, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcSpeed, 0xFFFFFFFC, 0xF24A8280, 0x00000043, 0x00000008, NpcFlyTo, 0xFFFFFFFC, 0x000001B8, 0x00000019, 0xFFFFFFE2, 0x00000000, 0xFFFFFFFB, 0x00000000, 0x00000043, 0x00000003, NpcFacePlayer, 0xFFFFFFFC, 0x00000005, 0x00000057, 0x00000000, 0x00000043, 0x00000002, SetPlayerSpeed, 0xF24A8280, 0x00000043, 0x00000004, PlayerMoveTo, 0x00000190, 0xFFFFFFE2, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x000C0011, 0x00000008, 0x00000001, 0x0000003C, 0x00000043, 0x00000002, SetPlayerAnimation, 0x000A0001, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000005A, 0x00000005, 0x00000043, 0x00000007, AdjustCam, 0x00000000, 0xF24A8A80, 0x00000000, 0xF24F2A80, 0xF24ABE80, 0xF24A5E80, 0x00000043, 0x00000002, SetPlayerAnimation, 0x000C0000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, SetPlayerAnimation, 0x000C0026, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFE, 0x000C0001, 0x000C0026, 0x00000005, 0x001400B9, 0x00000043, 0x00000002, SetPlayerAnimation, 0x000C0002, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, SetPlayerAnimation, 0x000A0001, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x00000276, 0x00000055, 0xFFFFFF74, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x000000C8, 0x00000043, 0x00000004, SetCamPosA, 0x00000000, 0x00000070, 0xFFFFFF38, 0x00000043, 0x00000004, SetCamPosB, 0x00000000, 0x00000262, 0xFFFFFFC4, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000057, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0x0000005A, 0x00000005, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, LoadPath, 0x0000003C, D_80243230_AFAB80, 0x00000005, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, GetNextPathPos, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0x0000010E, 0x00000005, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x00200009, 0x00200001, 0x00000000, 0x001400BA, 0x00000043, 0x00000003, EnableModel, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x0020001C, 0x00000008, 0x00000001, 0x0000001E, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000007, AdjustCam, 0x00000000, 0xF24BE280, 0x00000000, 0x0000012C, 0xF24ABE80, 0xF24A5E80, 0x00000057, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00200001, 0x00000043, 0x00000003, SetNpcSpeed, 0xFFFFFFFC, 0xF24A8680, 0x00000043, 0x00000008, NpcFlyTo, 0xFFFFFFFC, 0x000001B8, 0x00000019, 0xFFFFFFE2, 0x00000000, 0xFFFFFFFB, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x0020001D, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00200004, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, SetPlayerAnimation, 0x000C0000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, SetPlayerAnimation, 0x000C0026, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFE, 0x000C0001, 0x000C0026, 0x00000005, 0x001400BB, 0x00000043, 0x00000002, SetPlayerAnimation, 0x000C0002, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, SetPlayerAnimation, 0x000A0001, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x0020001E, 0x00200004, 0x00000000, 0x001400BC, 0x00000043, 0x00000002, SetPlayerAnimation, 0x000C0000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, SetPlayerAnimation, 0x000C0026, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFE, 0x000C0001, 0x000C0026, 0x00000005, 0x001400BD, 0x00000043, 0x00000002, SetPlayerAnimation, 0x000C0002, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, SetPlayerAnimation, 0x000A0001, 0x00000024, 0x00000002, 0xF70F2E81, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80243DA4_AFB6F4 -.word 0x00000043, 0x00000003, EnableModel, 0x00000056, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x000C0012, 0x00000043, 0x00000004, SetPlayerPos, 0x00000190, 0x00000000, 0xFFFFFFE2, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000005A, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0x000001B8, 0x00000019, 0xFFFFFFE2, 0x00000043, 0x00000003, SetNpcYaw, 0xFFFFFFFC, 0x0000010E, 0x00000043, 0x00000007, AdjustCam, 0x00000000, 0xF24BE280, 0x00000000, 0x0000012C, 0xF24ABE80, 0xF24A5E80, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x00200009, 0x00200001, 0x00000000, 0x001400C2, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFE, 0x000C0013, 0x000C0012, 0x00000005, 0x001400C3, 0x00000043, 0x00000002, SetPlayerAnimation, 0x000A0001, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFE, 0x000D0004, 0x000A0001, 0x00000000, 0x001400C4, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x0020001D, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00200004, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000003, SetCamLeadPlayer, 0x00000000, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000035, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000036, 0x00000000, 0x00000046, 0x00000001, D_80241E58_AF97A8, 0x00000047, 0x00000005, D_80243700_AFB050, 0x00000100, 0x00000002, 0x00000001, 0x00000000, 0x00000044, 0x00000001, D_80242EC4_AFA814, 0x0000000A, 0x00000002, 0xF70F2E81, 0x00000000, 0x00000046, 0x00000001, D_80243828_AFB178, 0x00000012, 0x00000000, 0x00000046, 0x00000001, D_80243DA4_AFB6F4, 0x00000013, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF9718891, 0x00000000, 0x00000024, 0x00000002, 0xF9718889, 0x00000000, 0x00000024, 0x00000002, 0xF70F2E82, 0x00000000, 0x00000043, 0x00000004, SetEnemyFlagBits, 0x00000000, 0x08000000, 0x00000001, 0x00000043, 0x00000004, SetNpcVar, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF70F2E81, 0x00000002, 0x00000046, 0x00000001, D_8024326C_AFABBC, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x0020001E, 0x00200004, 0x00000000, 0x001400C5, 0x00000046, 0x00000001, D_80243500_AFAE50, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000010E, 0x00000005, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x0020001E, 0x00200004, 0x00000005, 0x001400C6, 0x00000043, 0x00000003, ResetCam, 0x00000000, 0xF24BE280, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x0020001F, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00200005, 0x00000008, 0x00000001, 0x00000014, 0x00000044, 0x00000001, D_8024369C_AFAFEC, 0x00000004, 0x00000001, 0x00000015, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF70F2E81, 0x00000003, 0x00000046, 0x00000001, D_8024326C_AFABBC, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x0020001E, 0x00200004, 0x00000000, 0x001400C7, 0x00000046, 0x00000001, D_80243500_AFAE50, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000010E, 0x00000005, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x0020001E, 0x00200004, 0x00000005, 0x001400C8, 0x00000043, 0x00000003, ResetCam, 0x00000000, 0xF24BE280, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x0020001F, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00200005, 0x00000008, 0x00000001, 0x00000014, 0x00000004, 0x00000001, 0x0000003D, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF70F2E81, 0x00000004, 0x00000046, 0x00000001, D_8024326C_AFABBC, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x0020001E, 0x00200004, 0x00000000, 0x001400C9, 0x00000046, 0x00000001, D_80243500_AFAE50, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000010E, 0x00000005, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x0020001E, 0x00200004, 0x00000005, 0x001400CA, 0x00000043, 0x00000003, ResetCam, 0x00000000, 0xF24BE280, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x0020001F, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00200005, 0x00000008, 0x00000001, 0x00000014, 0x00000044, 0x00000001, D_8024369C_AFAFEC, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, func_802D1270, 0xFE363C80, 0xFFFFFFB6, 0xF24A8280, 0x00000043, 0x00000004, func_802D1270, 0x0000011F, 0xFFFFFFB6, 0xF24A8280, 0x00000004, 0x00000001, 0x0000001F, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF70F2E81, 0x00000005, 0x00000046, 0x00000001, D_8024326C_AFABBC, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x0020001E, 0x00200004, 0x00000000, 0x001400CB, 0x00000046, 0x00000001, D_80243500_AFAE50, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000010E, 0x00000005, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x0020001E, 0x00200004, 0x00000005, 0x001400CC, 0x00000043, 0x00000003, ResetCam, 0x00000000, 0xF24BE280, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x0020001F, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00200005, 0x00000008, 0x00000001, 0x00000014, 0x00000056, 0x00000000, 0x00000046, 0x00000001, D_8024369C_AFAFEC, 0x00000043, 0x00000004, SetEnemyFlagBits, 0x00000000, 0x08000000, 0x00000000, 0x00000043, 0x00000004, SetNpcVar, 0x00000000, 0x00000001, 0x00000001, 0x00000057, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000001, 0x00000004, 0x00000001, 0x00000029, 0x00000013, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x00000024, 0x00000002, 0xF70F2E80, 0x00000001, 0x00000024, 0x00000002, 0xF70F2E83, 0x00000000, 0x00000024, 0x00000002, 0xF9718892, 0x00000001, 0x00000024, 0x00000002, 0xF971888B, 0x00000000, 0x00000024, 0x00000002, 0xF971888A, 0x00000000, 0x00000024, 0x00000002, 0xF971888E, 0x00000001, 0x00000046, 0x00000001, D_8024326C_AFABBC, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x0020001E, 0x00200004, 0x00000000, 0x001400D1, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x0020001F, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00200005, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000001, 0x00000056, 0x00000000, 0x00000046, 0x00000001, D_8024369C_AFAFEC, 0x00000043, 0x00000004, SetEnemyFlagBits, 0x00000000, 0x08000000, 0x00000000, 0x00000043, 0x00000004, SetNpcVar, 0x00000000, 0x00000001, 0x00000001, 0x00000057, 0x00000000, 0x00000003, 0x00000001, 0x0000000F, 0x00000043, 0x00000003, ResetCam, 0x00000000, 0xF24A8A80, 0x0000000A, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000004, SetEnemyFlagBits, 0x00000000, 0x08000000, 0x00000000, 0x00000043, 0x00000004, SetNpcVar, 0x00000000, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000004, SetNpcVar, 0x00000000, 0x00000000, 0x00000001, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000004, GetNpcVar, 0x00000000, 0x00000000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000046, 0x00000001, D_8024359C_AFAEEC, 0x00000046, 0x00000001, D_8024333C_AFAC8C, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x00200009, 0x00200001, 0x00000000, 0x001400D2, 0x00000043, 0x00000002, ShowChoice, 0x001E0029, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x0000000A, 0x00000002, 0xF70F2E83, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFC, 0x00200009, 0x00200001, 0x00000000, 0x001400BF, 0x00000043, 0x00000008, NpcFlyTo, 0xFFFFFFFC, 0x00000186, 0x00000032, 0xFFFFFFBA, 0x0000000F, 0xFFFFFFFB, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000004, 0x00000001, 0x0000000F, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFC, 0x00200009, 0x00200001, 0x00000000, 0x001400D3, 0x00000043, 0x00000008, NpcFlyTo, 0xFFFFFFFC, 0x00000186, 0x00000032, 0xFFFFFFBA, 0x0000000F, 0xFFFFFFFB, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000004, 0x00000001, 0x0000000F, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000002, 0x00000004, 0x00000001, 0x00000063, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_802422C4_AF9C14, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000027, 0x00000002, 0xFE363C80, 0xF971888B, 0x00000027, 0x00000002, 0xFE363C80, 0xF971888A, 0x00000027, 0x00000002, 0xFE363C80, 0xF971888E, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000003, 0x00000024, 0x00000002, 0xF9718889, 0x00000001, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF9718889, 0x00000000, 0x00000024, 0x00000002, 0xF70F2E81, 0x00000002, 0x00000013, 0x00000000, 0x00000003, 0x00000001, 0x00000014, 0x00000046, 0x00000001, D_8024326C_AFABBC, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x0020001D, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFC, 0x0020001E, 0x00200004, 0x00000000, 0x001400D4, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x0020001F, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00200005, 0x00000043, 0x00000003, ResetCam, 0x00000000, 0xF24A8280, 0x00000044, 0x00000001, D_8024369C_AFAFEC, 0x00000003, 0x00000001, 0x00000015, 0x00000024, 0x00000002, 0xF70F2E80, 0x00000002, 0x00000024, 0x00000002, 0xF70F2E83, 0x00000000, 0x00000024, 0x00000002, 0xF9718892, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, SetPlayerSpeed, 0xF24A8280, 0x00000043, 0x00000004, PlayerMoveTo, 0xFE363C80, 0xFFFFFFB6, 0x00000000, 0x00000043, 0x00000004, PlayerMoveTo, 0x0000011F, 0xFFFFFFB6, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x000C0014, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x00200009, 0x00200001, 0x00000005, 0x001400D5, 0x00000043, 0x00000002, RemoveItemEntity, 0xF70F2E84, 0x00000045, 0x00000002, D_80242134_AF9A84, 0xFE363C8A, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000071, 0x00000000, 0x00000008, 0x00000043, 0x00000002, PlaySound, 0x00000395, 0x00000056, 0x00000000, 0x00000043, 0x00000007, AdjustCam, 0x00000000, 0xF24A7B4D, 0x00000000, 0x000000FA, 0xF24ABE80, 0xF24A5E80, 0x00000057, 0x00000000, 0x00000043, 0x00000002, func_802406C4_AF8014, 0x0000012C, 0x00000043, 0x00000002, PlaySound, 0x00000395, 0x00000043, 0x00000003, FadeOutMusic, 0x00000000, 0x000001F4, 0x00000049, 0x00000001, 0xFE363C8A, 0x0000000C, 0x00000002, 0xFE363C80, 0x0000001B, 0x00000024, 0x00000002, 0xF9718889, 0x00000001, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000056, 0x00000000, 0x00000043, 0x00000003, ResetCam, 0x00000000, 0xF24A8E80, 0x00000057, 0x00000000, 0x00000043, 0x00000008, NpcFlyTo, 0xFFFFFFFC, 0x00000151, 0x00000023, 0xFFFFFFB6, 0x0000001E, 0xFFFFFFFB, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000044, 0x00000001, D_80240D60_AF86B0, 0x00000046, 0x00000001, D_8024333C_AFAC8C, 0x00000056, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x000C0014, 0x00000043, 0x00000007, MakeItemEntity, 0x00000163, 0x0000011F, 0x00000010, 0xFFFFFFD8, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF70F2E84, 0xFE363C80, 0x00000057, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x00200009, 0x00200001, 0x00000005, 0x001400D6, 0x00000043, 0x00000002, ShowChoice, 0x001E002B, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, EndSpeech, 0xFFFFFFFC, 0x00200009, 0x00200001, 0x00000005, 0x00000012, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFC, 0x00200009, 0x00200001, 0x00000005, 0x001400D7, 0x00000043, 0x00000002, ShowChoice, 0x001E002A, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, EndSpeech, 0xFFFFFFFC, 0x00200009, 0x00200001, 0x00000005, 0x00000012, 0x00000000, 0x00000004, 0x00000001, 0x00000063, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF9718889, 0x00000000, 0x00000024, 0x00000002, 0xF70F2E81, 0x00000003, 0x00000013, 0x00000000, 0x00000003, 0x00000001, 0x0000003C, 0x00000046, 0x00000001, D_8024326C_AFABBC, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x0020001D, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x0020001E, 0x00200004, 0x00000005, 0x001400D8, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x0020001F, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00200005, 0x00000003, 0x00000001, 0x0000003D, 0x00000024, 0x00000002, 0xF70F2E80, 0x00000003, 0x00000024, 0x00000002, 0xF70F2E83, 0x00000000, 0x00000024, 0x00000002, 0xF9718892, 0x00000001, 0x00000024, 0x00000002, 0xF971888C, 0x00000000, 0x00000024, 0x00000002, 0xF971888D, 0x00000000, 0x00000024, 0x00000002, 0xF971888E, 0x00000001, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000001, 0x00000056, 0x00000000, 0x00000046, 0x00000001, D_8024369C_AFAFEC, 0x00000043, 0x00000004, SetEnemyFlagBits, 0x00000000, 0x08000000, 0x00000000, 0x00000043, 0x00000004, SetNpcVar, 0x00000000, 0x00000001, 0x00000001, 0x00000057, 0x00000000, 0x00000003, 0x00000001, 0x00000041, 0x00000043, 0x00000003, ResetCam, 0x00000000, 0xF24A8A80, 0x0000000A, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000004, SetEnemyFlagBits, 0x00000000, 0x08000000, 0x00000000, 0x00000043, 0x00000004, SetNpcVar, 0x00000000, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000004, SetNpcVar, 0x00000000, 0x00000000, 0x00000001, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000004, GetNpcVar, 0x00000000, 0x00000000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000046, 0x00000001, D_8024359C_AFAEEC, 0x00000046, 0x00000001, D_8024333C_AFAC8C, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x00200009, 0x00200001, 0x00000000, 0x001400D9, 0x00000043, 0x00000002, ShowChoice, 0x001E0029, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x0000000A, 0x00000002, 0xF70F2E83, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFC, 0x00200009, 0x00200001, 0x00000000, 0x001400BF, 0x00000043, 0x00000008, NpcFlyTo, 0xFFFFFFFC, 0x00000186, 0x00000032, 0xFFFFFFBA, 0x0000000F, 0xFFFFFFFB, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000004, 0x00000001, 0x00000041, 0x00000012, 0x00000000, 0x00000043, 0x00000005, EndSpeech, 0xFFFFFFFC, 0x00200009, 0x00200001, 0x00000005, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFC, 0x00200009, 0x00200001, 0x00000000, 0x001400DA, 0x00000043, 0x00000008, NpcFlyTo, 0xFFFFFFFC, 0x00000186, 0x00000032, 0xFFFFFFBA, 0x0000000F, 0xFFFFFFFB, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000004, 0x00000001, 0x00000041, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000002, 0x00000004, 0x00000001, 0x00000063, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_802422C4_AF9C14, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000027, 0x00000002, 0xFE363C80, 0xF971888C, 0x00000027, 0x00000002, 0xFE363C80, 0xF971888D, 0x00000027, 0x00000002, 0xFE363C80, 0xF971888E, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000003, 0x00000024, 0x00000002, 0xF9718889, 0x00000001, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF9718889, 0x00000000, 0x00000024, 0x00000002, 0xF70F2E81, 0x00000004, 0x00000013, 0x00000000, 0x00000003, 0x00000001, 0x0000001E, 0x00000046, 0x00000001, D_8024326C_AFABBC, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x00200009, 0x00200001, 0x00000005, 0x001400DB, 0x00000043, 0x00000003, ResetCam, 0x00000000, 0xF24A8280, 0x00000044, 0x00000001, D_8024369C_AFAFEC, 0x00000003, 0x00000001, 0x0000001F, 0x00000024, 0x00000002, 0xF70F2E80, 0x00000004, 0x00000024, 0x00000002, 0xF9718892, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, SetPlayerSpeed, 0xF24A8280, 0x00000043, 0x00000004, PlayerMoveTo, 0xFE363C80, 0xFFFFFFB6, 0x00000000, 0x00000043, 0x00000004, PlayerMoveTo, 0x0000011F, 0xFFFFFFB6, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x000C0014, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, RemoveItemEntity, 0xF70F2E84, 0x00000043, 0x00000002, SetPlayerAnimation, 0x000C001F, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000002, func_80240C10_AF8560, 0x0000000B, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcSpeed, 0xFFFFFFFC, 0xF24A8280, 0x00000043, 0x00000008, NpcFlyTo, 0xFFFFFFFC, 0x00000151, 0x00000023, 0xFFFFFFB6, 0x00000000, 0xFFFFFFFB, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, SetPlayerSpeed, 0xF24A8280, 0x00000043, 0x00000004, PlayerMoveTo, 0x000000BE, 0xFFFFFFBA, 0x00000000, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000005A, 0x00000001, 0x00000043, 0x00000004, PlayerMoveTo, 0x000000BE, 0x00000023, 0x00000000, 0x00000043, 0x00000004, PlayerMoveTo, 0x000000F0, 0x00000023, 0x00000000, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000015E, 0x00000005, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, SetPlayerAnimation, 0x000D000C, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, RemoveItemEntity, 0xF70F2E85, 0x00000043, 0x00000007, MakeItemEntity, 0x00000161, 0x000000E6, 0x00000010, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF70F2E85, 0xFE363C80, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, func_80240C10_AF8560, 0x00000000, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000000, 0x00000043, 0x00000007, MakeItemEntity, 0x00000162, 0x000000FA, 0x00000010, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF70F2E84, 0xFE363C80, 0x00000008, 0x00000001, 0x00000028, 0x00000046, 0x00000001, D_8024326C_AFABBC, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x0020001D, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x0020001E, 0x00200004, 0x00000000, 0x001400DC, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x0020001F, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00200005, 0x00000043, 0x00000003, ResetCam, 0x00000000, 0xF24A8280, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000013B, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, RemoveItemEntity, 0xF70F2E85, 0x00000043, 0x00000002, func_80240C10_AF8560, 0x0000000D, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000044, 0x00000001, D_8024344C_AFAD9C, 0x00000056, 0x00000000, 0x00000043, 0x00000008, NpcFlyTo, 0xFFFFFFFC, 0x000000BE, 0x0000003C, 0xFFFFFF9C, 0x00000032, 0xFFFFFFFB, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, SetPlayerSpeed, 0xF24A8280, 0x00000043, 0x00000004, PlayerMoveTo, 0x000000BE, 0x0000001E, 0x00000000, 0x00000043, 0x00000004, PlayerMoveTo, 0x000000BE, 0xFFFFFF9C, 0x00000000, 0x00000043, 0x00000004, PlayerMoveTo, 0x0000007D, 0xFFFFFF9C, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x00200009, 0x00200001, 0x00000000, 0x001400DD, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000013B, 0x00000005, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000001, func_80240B4C_AF849C, 0x00000046, 0x00000001, D_8024300C_AFA95C, 0x00000043, 0x00000002, func_80240C10_AF8560, 0x00000000, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000000, 0x00000043, 0x00000007, MakeItemEntity, 0x00000161, 0x00000064, 0x00000005, 0xFFFFFF79, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF70F2E85, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFF79, 0x00000005, 0x00000001, 0x0000001E, 0x00000028, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000005, SetItemPos, 0xF70F2E85, 0x00000064, 0x00000005, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000046, 0x00000001, D_802430A4_AFA9F4, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, PlaySoundAt, 0x000000FF, 0x00000000, 0x00000064, 0x00000016, 0xFFFFFF4E, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, FadeOutMusic, 0x00000000, 0x000001F4, 0x00000043, 0x00000006, PlaySoundAt, 0x00000394, 0x00000000, 0x00000064, 0x00000016, 0xFFFFFF4E, 0x00000043, 0x00000001, func_80240B4C_AF849C, 0x00000043, 0x00000002, StopSound, 0x00000394, 0x00000043, 0x00000006, PlaySoundAt, 0x000003F3, 0x00000000, 0x00000064, 0x00000016, 0xFFFFFF4E, 0x00000008, 0x00000001, 0x0000000A, 0x0000000C, 0x00000002, 0xFE363C80, 0x000002B2, 0x00000024, 0x00000002, 0xF9718889, 0x00000001, 0x00000013, 0x00000000, 0x0000000D, 0x00000002, 0xFE363C80, 0x00000438, 0x00000024, 0x00000002, 0xF9718889, 0x00000001, 0x00000013, 0x00000000, 0x00000044, 0x00000001, D_80240D60_AF86B0, 0x00000046, 0x00000001, D_8024300C_AFA95C, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFF5B, 0x00000005, 0x00000001, 0x0000001E, 0x00000008, 0x00000001, 0x00000001, 0x00000027, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000005, SetItemPos, 0xF70F2E85, 0x00000064, 0x00000005, 0xFE363C80, 0x00000006, 0x00000000, 0x00000043, 0x00000002, RemoveItemEntity, 0xF70F2E85, 0x00000043, 0x00000002, func_80240C10_AF8560, 0x0000000D, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000000, 0x00000046, 0x00000001, D_802430A4_AFA9F4, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000005A, 0x00000005, 0x00000046, 0x00000001, D_8024333C_AFAC8C, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x00200009, 0x00200001, 0x00000000, 0x001400DE, 0x00000043, 0x00000002, ShowChoice, 0x001E002B, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFC, 0x00200009, 0x00200001, 0x00000000, 0x001400DF, 0x00000043, 0x00000002, ShowChoice, 0x001E002A, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000004, 0x00000001, 0x00000063, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFC, 0x00200009, 0x00200001, 0x00000000, 0x001400E0, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x0000011F, 0x00000000, 0xFFFFFFB6, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x0000011F, 0x00000000, 0xFFFFFFB6, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A7E80, 0x00000044, 0x00000001, D_8024369C_AFAFEC, 0x00000043, 0x00000004, PlayerMoveTo, 0x0000011F, 0xFFFFFFB6, 0x00000064, 0x00000043, 0x00000002, func_80240C10_AF8560, 0x00000000, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000000, 0x00000043, 0x00000007, MakeItemEntity, 0x00000161, 0x0000011F, 0x00000010, 0xFFFFFFD8, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000043, 0x00000007, MakeItemEntity, 0x0000015F, 0x0000011F, 0x00000014, 0xFFFFFFE2, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF70F2E85, 0xFE363C80, 0x00000008, 0x00000001, 0x0000000A, 0x0000000A, 0x00000002, 0xF9718889, 0x00000000, 0x00000024, 0x00000002, 0xF70F2E81, 0x00000005, 0x00000013, 0x00000000, 0x00000003, 0x00000001, 0x00000028, 0x00000046, 0x00000001, D_8024326C_AFABBC, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x0020001D, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x0020001E, 0x00200004, 0x00000000, 0x001400E1, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x0020001F, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00200005, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000003, 0x00000001, 0x00000029, 0x00000024, 0x00000002, 0xF70F2E80, 0x00000005, 0x00000024, 0x00000002, 0xF70F2E83, 0x00000000, 0x00000024, 0x00000002, 0xF9718892, 0x00000001, 0x00000024, 0x00000002, 0xF971888F, 0x00000000, 0x00000024, 0x00000002, 0xF9718890, 0x00000000, 0x00000003, 0x00000001, 0x0000002D, 0x00000043, 0x00000003, ResetCam, 0x00000000, 0xF24A8A80, 0x0000000A, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000004, SetEnemyFlagBits, 0x00000000, 0x08000000, 0x00000000, 0x00000043, 0x00000004, SetNpcVar, 0x00000000, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000004, SetNpcVar, 0x00000000, 0x00000000, 0x00000001, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000004, GetNpcVar, 0x00000000, 0x00000000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000046, 0x00000001, D_8024359C_AFAEEC, 0x00000046, 0x00000001, D_8024333C_AFAC8C, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x00200009, 0x00200001, 0x00000000, 0x001400E2, 0x00000043, 0x00000002, ShowChoice, 0x001E0029, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x0000000A, 0x00000002, 0xF70F2E83, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFC, 0x00200009, 0x00200001, 0x00000000, 0x001400C0, 0x00000043, 0x00000008, NpcFlyTo, 0xFFFFFFFC, 0x00000186, 0x00000032, 0xFFFFFFBA, 0x0000000F, 0xFFFFFFFB, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000004, 0x00000001, 0x0000002D, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFC, 0x00200009, 0x00200001, 0x00000000, 0x001400E3, 0x00000043, 0x00000008, NpcFlyTo, 0xFFFFFFFC, 0x00000186, 0x00000032, 0xFFFFFFBA, 0x0000000F, 0xFFFFFFFB, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000004, 0x00000001, 0x0000002D, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000002, 0x00000004, 0x00000001, 0x00000063, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_802422C4_AF9C14, 0x0000000A, 0x00000002, 0xF9718890, 0x00000000, 0x00000024, 0x00000002, 0xF9718889, 0x00000001, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF9718889, 0x00000000, 0x00000024, 0x00000002, 0xF70F2E81, 0x00000006, 0x00000013, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x000C0009, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFC, 0x0020000F, 0x0020000F, 0x00000000, 0x001400E4, 0x00000043, 0x00000002, SetPlayerAnimation, 0x000A0001, 0x00000003, 0x00000001, 0x00000032, 0x00000024, 0x00000002, 0xF70F2E80, 0x00000006, 0x00000024, 0x00000002, 0xF9718892, 0x00000000, 0x00000043, 0x00000003, ResetCam, 0x00000000, 0xF24A8E80, 0x00000044, 0x00000001, D_80243204_AFAB54, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000003, 0x00000001, 0x00000063, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFC, 0x00200009, 0x00200001, 0x00000005, 0x001400CD, 0x00000043, 0x00000001, func_80240C4C_AF859C, 0x00000046, 0x00000001, D_802422C4_AF9C14, 0x00000043, 0x00000002, func_80240C10_AF8560, 0x00000000, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000000, 0x00000043, 0x00000002, RemoveItemEntity, 0xF70F2E84, 0x0000000B, 0x00000002, 0xF70F2E80, 0x00000004, 0x00000043, 0x00000002, RemoveItemEntity, 0xF70F2E85, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_80241E58_AF97A8, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0x000001B8, 0x00000019, 0xFFFFFFE2, 0x00000043, 0x00000003, SetNpcYaw, 0xFFFFFFFC, 0x0000010E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x000A0001, 0x00000043, 0x00000004, SetPlayerPos, 0x00000190, 0x00000000, 0xFFFFFFE2, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000005A, 0x00000000, 0x00000043, 0x00000007, AdjustCam, 0x00000000, 0xF24BE280, 0x00000000, 0x0000015E, 0xF24ABE80, 0xF24A5E80, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000001, func_80240CB4_AF8604, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x00200009, 0x00200001, 0x00000000, 0x001400CE, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFE, 0x000C0013, 0x000C0012, 0x00000005, 0x001400CF, 0x00000043, 0x00000002, SetPlayerAnimation, 0x000A0001, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFE, 0x000D0004, 0x000A0001, 0x00000000, 0x001400D0, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x0020001D, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00200004, 0x00000004, 0x00000001, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_kkj/kkj_20/AFE130.data.s b/ver/us/asm/data/world/area_kkj/kkj_20/AFE130.data.s deleted file mode 100644 index 4a228f9bd4..0000000000 --- a/ver/us/asm/data/world/area_kkj/kkj_20/AFE130.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802405F0_AFE130 -.word 0xC3390000, 0x00000000, 0xC1C80000, 0x42B40000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80240790, D_802405F0_AFE130, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00190015, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x0000006B, 0x00000001, 0x00000008, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000088, 0x00000000, 0x00000008, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kkj/kkj_20/AFE1E0.data.s b/ver/us/asm/data/world/area_kkj/kkj_20/AFE1E0.data.s deleted file mode 100644 index 72fbf629d5..0000000000 --- a/ver/us/asm/data/world/area_kkj/kkj_20/AFE1E0.data.s +++ /dev/null @@ -1,9 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802406A0_AFE1E0 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000002, 0x00000024, 0x00000002, 0xFE363C82, 0x00000002, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFFFF, 0x00000044, 0x00000001, ExitSingleDoor, 0x00000008, 0x00000001, 0x00000011, 0x00000043, 0x00000003, GotoMap, 0x80244750, 0x00000004, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240744_AFE284 -.word 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x00000002, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFFFF, 0x00000046, 0x00000001, EnterSingleDoor, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0329, 0x0000001A, 0x00000043, 0x00000002, SetSpriteShading, 0x00050005, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000043, 0x00000003, SetCamLeadPlayer, 0x00000000, 0x00000000, 0x00000043, 0x00000003, MakeNpcs, 0x00000000, 0x80244730, 0x00000046, 0x00000001, 0x80240A70, 0x00000043, 0x00000002, UseDoorSounds, 0x00000000, 0x00000047, 0x00000005, D_802406A0_AFE1E0, 0x00000100, 0x00000002, 0x00000001, 0x00000000, 0x00000044, 0x00000001, D_80240744_AFE284, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kkj/kkj_20/AFE3C0.data.s b/ver/us/asm/data/world/area_kkj/kkj_20/AFE3C0.data.s deleted file mode 100644 index 3c2731a3a2..0000000000 --- a/ver/us/asm/data/world/area_kkj/kkj_20/AFE3C0.data.s +++ /dev/null @@ -1,12 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel kkj_20_varStash -.word 0x00000000 - -dlabel D_80240884_AFE3C4 -.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, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x0000000B, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000046, 0x00000001, D_80240884_AFE3C4, 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_802409CC_AFE50C -.word 0x00000024, 0x00000002, 0xFE363C8A, 0x00000111, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000046, 0x00000001, D_80240884_AFE3C4, 0x0000000F, 0x00000002, 0xF5DE0180, 0x0000005F, 0x00000043, 0x00000003, AddBadge, 0xFE363C8A, 0xFE363C80, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xF8405D67, 0x00000001, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000008, MakeEntity, Entity_Chest, 0x0000005F, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignChestFlag, 0xF8405D67, 0x00000043, 0x00000002, AssignScript, D_802409CC_AFE50C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kkj/kkj_20/AFE610.data.s b/ver/us/asm/data/world/area_kkj/kkj_20/AFE610.data.s deleted file mode 100644 index e860d2b0ec..0000000000 --- a/ver/us/asm/data/world/area_kkj/kkj_20/AFE610.data.s +++ /dev/null @@ -1,117 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240AD0_AFE610 -.word 0x00000000, 0x001E0018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000, 0x00000000, 0x00170013, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000 - -dlabel D_80240B28_AFE668 -.word D_80242440_AFFF80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x02EE0000, D_80240E60_AFE9A0, 0x00000000 - -dlabel D_80240B54_AFE694 -.word D_80242440_AFFF80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80240B28_AFE668, 0x00000000, 0x02BC0000, D_80240E60_AFE9A0, 0x00000000 - -dlabel D_80240B80_AFE6C0 -.word D_80242440_AFFF80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80240B54_AFE694, 0x00000000, 0x028A0000, D_80240E60_AFE9A0, 0x00000000 - -dlabel D_80240BAC_AFE6EC -.word D_80242440_AFFF80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80240B80_AFE6C0, 0x00000000, 0x02580000, D_80240E60_AFE9A0, 0x00000000 - -dlabel D_80240BD8_AFE718 -.word D_80242440_AFFF80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80240BAC_AFE6EC, 0x00000000, 0x02260000, D_80240E60_AFE9A0, 0x00000000 - -dlabel D_80240C04_AFE744 -.word D_80242440_AFFF80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80240BD8_AFE718, 0x00000000, 0x01F40000, D_80240E60_AFE9A0, 0x00000000 - -dlabel D_80240C30_AFE770 -.word D_80242440_AFFF80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80240C04_AFE744, 0x00000000, 0x01C20000, D_80240E60_AFE9A0, 0x00000000 - -dlabel D_80240C5C_AFE79C -.word D_80242440_AFFF80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80240C30_AFE770, 0x00000000, 0x01900000, D_80240E60_AFE9A0, 0x00000000 - -dlabel D_80240C88_AFE7C8 -.word D_80242440_AFFF80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80240C5C_AFE79C, 0x00000000, 0x015E0000, D_80240E60_AFE9A0, 0x00000000 - -dlabel D_80240CB4_AFE7F4 -.word D_80242440_AFFF80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80240C88_AFE7C8, 0x00000000, 0x012C0000, D_80240E60_AFE9A0, 0x00000000 - -dlabel D_80240CE0_AFE820 -.word D_80242440_AFFF80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80240CB4_AFE7F4, 0x00000000, 0x00FA0000, D_80240E60_AFE9A0, 0x00000000 - -dlabel D_80240D0C_AFE84C -.word D_80242440_AFFF80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80240CE0_AFE820, 0x00000000, 0x00C80000, D_80240E60_AFE9A0, 0x00000000 - -dlabel D_80240D38_AFE878 -.word D_80242440_AFFF80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80240D0C_AFE84C, 0x00000000, 0x00960000, D_80240E60_AFE9A0, 0x00000000 - -dlabel D_80240D64_AFE8A4 -.word D_80242440_AFFF80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80240D38_AFE878, 0x00000000, 0x00640000, D_80240E60_AFE9A0, 0x00000000 - -dlabel D_80240D90_AFE8D0 -.word D_80242440_AFFF80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80240D64_AFE8A4, 0x00000000, 0x00320000, D_80240E60_AFE9A0, 0x00000000 - -dlabel D_80240DBC_AFE8FC -.word D_80242440_AFFF80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80240D90_AFE8D0, 0x00000000, 0x00000000, D_80240E60_AFE9A0, 0x00000000 - -dlabel D_80240DE8_AFE928 -.word 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80240DBC_AFE8FC, 0xFFFF0000, 0x00000000, 0x00000000, D_80240DE8_AFE928, D_80240DBC_AFE8FC, D_80240D90_AFE8D0, D_80240D64_AFE8A4, D_80240D38_AFE878, D_80240D0C_AFE84C, D_80240CE0_AFE820, D_80240CB4_AFE7F4, D_80240C88_AFE7C8, D_80240C5C_AFE79C, D_80240C30_AFE770, D_80240C04_AFE744, D_80240BD8_AFE718, D_80240BAC_AFE6EC, D_80240B80_AFE6C0, D_80240B54_AFE694, D_80240B28_AFE668, 0x00000000, 0x00000000 - -dlabel D_80240E60_AFE9A0 -.word 0x00000000, 0x00000000, 0x04000000, 0xDB1396FF, 0x00000000, 0x00000000, 0x04120038, 0xB615A5FF, 0x00000000, 0x00000000, 0x04000038, 0xD05CC5FF, 0x00000000, 0x00000000, 0x03ED0000, 0xF94FB2FF, 0x00000000, 0x00000000, 0x04000071, 0xBB15A1FF, 0x00000000, 0x00000000, 0x03ED0071, 0xD75CC0FF, 0x00000000, 0x00000000, 0x041200AA, 0xB615A5FF, 0x00000000, 0x00000000, 0x040000AA, 0xD05CC5FF, 0x00000000, 0x00000000, 0x040000E3, 0xAE15ACFF, 0x00000000, 0x00000000, 0x03ED00E3, 0xC65BCFFF, 0x00000000, 0x00000000, 0x0412011C, 0xB615A5FF, 0x00000000, 0x00000000, 0x0400011C, 0xD05CC5FF, 0x00000000, 0x00000000, 0x04000155, 0xBF159FFF, 0x00000000, 0x00000000, 0x03ED0155, 0xDC5BBDFF, 0x00000000, 0x00000000, 0x0412018E, 0xB615A5FF, 0x00000000, 0x00000000, 0x0400018E, 0xD05CC5FF, 0x00000000, 0x00000000, 0x040001C7, 0xA515BAFF, 0x00000000, 0x00000000, 0x03ED01C7, 0xBB56DEFF, 0x00000000, 0x00000000, 0x0400041C, 0x8E20F5FF, 0x00000000, 0x00000000, 0x03ED0400, 0xAC55F8FF, 0x00000000, 0x00000000, 0x001201C7, 0x14564BFF, 0x00000000, 0x00000000, 0x001203FF, 0xF85554FF, 0x00000000, 0x00000000, 0x0000041C, 0xF52072FF, 0x00000000, 0x00000000, 0x000001C7, 0x321567FF, 0x00000000, 0x00000000, 0x00000038, 0x305C3BFF, 0x00000000, 0x00000000, 0x00120000, 0x4B4F16FF, 0x00000000, 0x00000000, 0x00120071, 0x365C35FF, 0x00000000, 0x00000000, 0x000000AA, 0x305C3BFF, 0x00000000, 0x00000000, 0x001200E3, 0x245B43FF, 0x00000000, 0x00000000, 0x0000011C, 0x305C3BFF, 0x00000000, 0x00000000, 0x00120155, 0x3A5B31FF, 0x00000000, 0x00000000, 0x0000018E, 0x305C3BFF, 0x00000000, 0x00000000, 0x00120000, 0x4B4F16FF, 0x00000000, 0x00000000, 0x00000038, 0x305C3BFF, 0x00000000, 0x00000000, 0xFFEE0038, 0x4A155BFF, 0x00000000, 0x00000000, 0x00000000, 0x601339FF, 0x00000000, 0x00000000, 0x00120071, 0x365C35FF, 0x00000000, 0x00000000, 0x00000071, 0x4F1557FF, 0x00000000, 0x00000000, 0x000000AA, 0x305C3BFF, 0x00000000, 0x00000000, 0xFFEE00AA, 0x4A155BFF, 0x00000000, 0x00000000, 0x001200E3, 0x245B43FF, 0x00000000, 0x00000000, 0x000000E3, 0x411561FF, 0x00000000, 0x00000000, 0x0000011C, 0x305C3BFF, 0x00000000, 0x00000000, 0xFFEE011C, 0x4A155BFF, 0x00000000, 0x00000000, 0x00120155, 0x3A5B31FF, 0x00000000, 0x00000000, 0x00000155, 0x521554FF, 0x00000000, 0x00000000, 0x0000018E, 0x305C3BFF, 0x00000000, 0x00000000, 0xFFEE018E, 0x4A155BFF, 0x00000000, 0x00000000, 0x001201C7, 0x14564BFF, 0x00000000, 0x00000000, 0x000001C7, 0x321567FF - -dlabel D_80241180_AFECC0 -.word 0xFE6F008C, 0xFE14FE4D, 0x008CFE21, 0xFE5300C8, 0xFE29FE75, 0x00BEFE1B, 0xFE39008C, 0xFE3FFE3F, 0x00BEFE47, 0xFE1C008C, 0xFE49FE22, 0x00C8FE51, 0xFE0C008C, 0xFE64FE12, 0x00BEFE6C, 0xFDE6008C, 0xFE75FDED, 0x00C8FE7C, 0xFDCE008C, 0xFE96FDD4, 0x00BEFE9E, 0xFDB1008C, 0xFEA0FDB7, 0x00C8FEA8, 0xFDA1008C, 0xFEBBFDA8, 0x00BEFEC3, 0xFD2D008C, 0xFF1AFD3B, 0x00BEFF1B, 0xFEF000BE, 0x0055FE84, 0x00BE00AD, 0xFE83008C, 0x00BBFEF6, 0x008C005D, 0xFFAA00C8, 0xFFCDFFBE, 0x00BEFFAE, 0xFF8800BE, 0xFFDAFF79, 0x00C8FFF5, 0xFF5B00BE, 0xFFFFFF43, 0x00C8001F, 0xFF1D00BE, 0x0030FF0E, 0x00C8004B, 0xFFBE00BE, 0xFFAEFFAA, 0x00C8FFCD, 0xFFB0008C, 0xFFD4FFC4, 0x008CFFB6, 0xFF8800BE, 0xFFDAFF8E, 0x008CFFE2, 0xFF7900C8, 0xFFF5FF7F, 0x008CFFFC, 0xFF5B00BE, 0xFFFFFF61, 0x008C0005, 0xFF4300C8, 0x001FFF49, 0x008C0027, 0xFF1D00BE, 0x0030FF23, 0x008C0038, 0xFF0E00C8, 0x004BFF14, 0x008C0053, 0xFEF000BE, 0x0055FEF6, 0x008C005D, 0xFE6F008C, 0xFE14FE4D, 0x008CFE21, 0xFE5300C8, 0xFE29FE75, 0x00BEFE1B, 0xFE39008C, 0xFE3FFE3F, 0x00BEFE47, 0xFE1C008C, 0xFE49FE22, 0x00C8FE51, 0xFE0C008C, 0xFE64FE12, 0x00BEFE6C, 0xFDE6008C, 0xFE75FDED, 0x00C8FE7C, 0xFDCE008C, 0xFE96FDD4, 0x00BEFE9E, 0xFDB1008C, 0xFEA0FDB7, 0x00C8FEA8, 0xFDA1008C, 0xFEBBFDA8, 0x00BEFEC3, 0xFD2D008C, 0xFF1AFD3B, 0x00BEFF1B, 0xFEF000BE, 0x0055FE84, 0x00BE00AD, 0xFE83008C, 0x00BBFEF6, 0x008C005D, 0xFFAA00C8, 0xFFCDFFBE, 0x00BEFFAE, 0xFF8800BE, 0xFFDAFF79, 0x00C8FFF5, 0xFF5B00BE, 0xFFFFFF43, 0x00C8001F, 0xFF1D00BE, 0x0030FF0E, 0x00C8004B, 0xFFBE00BE, 0xFFAEFFAA, 0x00C8FFCD, 0xFFB0008C, 0xFFD4FFC4, 0x008CFFB6, 0xFF8800BE, 0xFFDAFF8E, 0x008CFFE2, 0xFF7900C8, 0xFFF5FF7F, 0x008CFFFC, 0xFF5B00BE, 0xFFFFFF61, 0x008C0005, 0xFF4300C8, 0x001FFF49, 0x008C0027, 0xFF1D00BE, 0x0030FF23, 0x008C0038, 0xFF0E00C8, 0x004BFF14, 0x008C0053, 0xFEF000BE, 0x0055FEF6, 0x008C005D, 0xFE6F008C, 0xFE14FE4D, 0x008CFE21, 0xFE5300C8, 0xFE29FE75, 0x00BEFE1B, 0xFE39008C, 0xFE3FFE3F, 0x00BEFE47, 0xFE1C008C, 0xFE49FE22, 0x00C8FE51, 0xFE0C008C, 0xFE64FE12, 0x00BEFE6C, 0xFDE6008C, 0xFE75FDED, 0x00C8FE7C, 0xFDCE008C, 0xFE96FDD4, 0x00BEFE9E, 0xFDB1008C, 0xFEA0FDB7, 0x00C8FEA8, 0xFDA1008C, 0xFEBBFDA8, 0x00BEFEC3, 0xFD2D008C, 0xFF1AFD3B, 0x00BEFF1B, 0xFEF000BE, 0x0055FE84, 0x00BE00AD, 0xFE83008C, 0x00BBFEF6, 0x008C005D, 0xFFAA00C8, 0xFFCDFFBE, 0x00BEFFAE, 0xFF8800BE, 0xFFDAFF79, 0x00C8FFF5, 0xFF5B00BE, 0xFFFFFF43, 0x00C8001F, 0xFF1D00BE, 0x0030FF0E, 0x00C8004B, 0xFFBE00BE, 0xFFAEFFAA, 0x00C8FFCD, 0xFFB0008C, 0xFFD4FFC4, 0x008CFFB6, 0xFF8800BE, 0xFFDAFF8E, 0x008CFFE2, 0xFF7900C8, 0xFFF5FF7F, 0x008CFFFC, 0xFF5B00BE, 0xFFFFFF61, 0x008C0005, 0xFF4300C8, 0x001FFF49, 0x008C0027, 0xFF1D00BE, 0x0030FF23, 0x008C0038, 0xFF0E00C8, 0x004BFF14, 0x008C0053, 0xFEF000BE, 0x0055FEF6, 0x008C005D, 0xFE6F008C, 0xFE14FE4D, 0x008CFE21, 0xFE5300C8, 0xFE29FE75, 0x00BEFE1B, 0xFE39008C, 0xFE3FFE3F, 0x00BEFE47, 0xFE1C008C, 0xFE49FE22, 0x00C8FE51, 0xFE0C008C, 0xFE64FE12, 0x00BEFE6C, 0xFDE6008C, 0xFE75FDED, 0x00C8FE7C, 0xFDCE008C, 0xFE96FDD4, 0x00BEFE9E, 0xFDB1008C, 0xFEA0FDB7, 0x00C8FEA8, 0xFDA1008C, 0xFEBBFDA8, 0x00BEFEC3, 0xFD2D008C, 0xFF1AFD3B, 0x00BEFF1B, 0xFEF000BE, 0x0055FE84, 0x00BE00AD, 0xFE83008C, 0x00BBFEF6, 0x008C005D, 0xFFAA00C8, 0xFFCDFFBE, 0x00BEFFAE, 0xFF8800BE, 0xFFDAFF79, 0x00C8FFF5, 0xFF5B00BE, 0xFFFFFF43, 0x00C8001F, 0xFF1D00BE, 0x0030FF0E, 0x00C8004B, 0xFFBE00BE, 0xFFAEFFAA, 0x00C8FFCD, 0xFFB0008C, 0xFFD4FFC4, 0x008CFFB6, 0xFF8800BE, 0xFFDAFF8E, 0x008CFFE2, 0xFF7900C8, 0xFFF5FF7F, 0x008CFFFC, 0xFF5B00BE, 0xFFFFFF61, 0x008C0005, 0xFF4300C8, 0x001FFF49, 0x008C0027, 0xFF1D00BE, 0x0030FF23, 0x008C0038, 0xFF0E00C8, 0x004BFF14, 0x008C0053, 0xFEF000BE, 0x0055FEF6, 0x008C005D, 0xFE6F008C, 0xFE14FE4D, 0x008CFE21, 0xFE5300C8, 0xFE29FE75, 0x00BEFE1B, 0xFE39008C, 0xFE3FFE3F, 0x00BEFE47, 0xFE1C008C, 0xFE49FE22, 0x00C8FE51, 0xFE0C008C, 0xFE64FE12, 0x00BEFE6C, 0xFDE6008C, 0xFE75FDED, 0x00C8FE7C, 0xFDCE008C, 0xFE96FDD4, 0x00BEFE9E, 0xFDB1008C, 0xFEA0FDB7, 0x00C8FEA8, 0xFDA1008C, 0xFEBBFDA8, 0x00BEFEC3, 0xFD2D008C, 0xFF1AFD3B, 0x00BEFF1B, 0xFEF000BE, 0x0055FE84, 0x00BE00AD, 0xFE83008C, 0x00BBFEF6, 0x008C005D, 0xFFAA00C8, 0xFFCDFFBE, 0x00BEFFAE, 0xFF8800BE, 0xFFDAFF79, 0x00C8FFF5, 0xFF5B00BE, 0xFFFFFF43, 0x00C8001F, 0xFF1D00BE, 0x0030FF0E, 0x00C8004B, 0xFFBE00BE, 0xFFAEFFAA, 0x00C8FFCD, 0xFFB0008C, 0xFFD4FFC4, 0x008CFFB6, 0xFF8800BE, 0xFFDAFF8E, 0x008CFFE2, 0xFF7900C8, 0xFFF5FF7F, 0x008CFFFC, 0xFF5B00BE, 0xFFFFFF61, 0x008C0005, 0xFF4300C8, 0x001FFF49, 0x008C0027, 0xFF1D00BE, 0x0030FF23, 0x008C0038, 0xFF0E00C8, 0x004BFF14, 0x008C0053, 0xFEF000BE, 0x0055FEF6, 0x008C005D, 0xFE6F008C, 0xFE14FE4D, 0x008CFE21, 0xFE5300C8, 0xFE29FE75, 0x00BEFE1B, 0xFE39008C, 0xFE3FFE3F, 0x00BEFE47, 0xFE1C008C, 0xFE49FE22, 0x00C8FE51, 0xFE0C008C, 0xFE64FE12, 0x00BEFE6C, 0xFDE6008C, 0xFE75FDED, 0x00C8FE7C, 0xFDCE008C, 0xFE96FDD4, 0x00BEFE9E, 0xFDB1008C, 0xFEA0FDB7, 0x00C8FEA8, 0xFDA1008C, 0xFEBBFDA8, 0x00BEFEC3, 0xFD2D008C, 0xFF1AFD3B, 0x00BEFF1B, 0xFEF000BE, 0x0055FE84, 0x00BE00AD, 0xFE83008C, 0x00BBFEF6, 0x008C005D, 0xFFAA00C8, 0xFFCDFFBE, 0x00BEFFAE, 0xFF8800BE, 0xFFDAFF79, 0x00C8FFF5, 0xFF5B00BE, 0xFFFFFF43, 0x00C8001F, 0xFF1D00BE, 0x0030FF0E, 0x00C8004B, 0xFFBE00BE, 0xFFAEFFAA, 0x00C8FFCD, 0xFFB0008C, 0xFFD4FFC4, 0x008CFFB6, 0xFF8800BE, 0xFFDAFF8E, 0x008CFFE2, 0xFF7900C8, 0xFFF5FF7F, 0x008CFFFC, 0xFF5B00BE, 0xFFFFFF61, 0x008C0005, 0xFF4300C8, 0x001FFF49, 0x008C0027, 0xFF1D00BE, 0x0030FF23, 0x008C0038, 0xFF0E00C8, 0x004BFF14, 0x008C0053, 0xFEF000BE, 0x0055FEF6, 0x008C005D, 0xFE6F008C, 0xFE14FE4D, 0x008CFE21, 0xFE5300C8, 0xFE29FE75, 0x00BEFE1B, 0xFE39008C, 0xFE3FFE3F, 0x00BEFE47, 0xFE1C008C, 0xFE49FE22, 0x00C8FE51, 0xFE0C008C, 0xFE64FE12, 0x00BEFE6C, 0xFDE6008C, 0xFE75FDED, 0x00C8FE7C, 0xFDCE008C, 0xFE96FDD4, 0x00BEFE9E, 0xFDB1008C, 0xFEA0FDB7, 0x00C8FEA8, 0xFDA1008C, 0xFEBBFDA8, 0x00BEFEC3, 0xFD2D008C, 0xFF1AFD3B, 0x00BEFF1B, 0xFEF000BE, 0x0055FE84, 0x00BE00AD, 0xFE83008C, 0x00BBFEF6, 0x008C005D, 0xFFAA00C8, 0xFFCDFFBE, 0x00BEFFAE, 0xFF8800BE, 0xFFDAFF79, 0x00C8FFF5, 0xFF5B00BE, 0xFFFFFF43, 0x00C8001F, 0xFF1D00BE, 0x0030FF0E, 0x00C8004B, 0xFFBE00BE, 0xFFAEFFAA, 0x00C8FFCD, 0xFFB0008C, 0xFFD4FFC4, 0x008CFFB6, 0xFF8800BE, 0xFFDAFF8E, 0x008CFFE2, 0xFF7900C8, 0xFFF5FF7F, 0x008CFFFC, 0xFF5B00BE, 0xFFFFFF61, 0x008C0005, 0xFF4300C8, 0x001FFF49, 0x008C0027, 0xFF1D00BE, 0x0030FF23, 0x008C0038, 0xFF0E00C8, 0x004BFF14, 0x008C0053, 0xFEF000BE, 0x0055FEF6, 0x008C005D, 0xFE6F008C, 0xFE14FE4D, 0x008CFE21, 0xFE5300C8, 0xFE29FE75, 0x00BEFE1B, 0xFE39008C, 0xFE3FFE3F, 0x00BEFE47, 0xFE1C008C, 0xFE49FE22, 0x00C8FE51, 0xFE0C008C, 0xFE64FE12, 0x00BEFE6C, 0xFDE6008C, 0xFE75FDED, 0x00C8FE7C, 0xFDCE008C, 0xFE96FDD4, 0x00BEFE9E, 0xFDB1008C, 0xFEA0FDB7, 0x00C8FEA8, 0xFDA1008C, 0xFEBBFDA8, 0x00BEFEC3, 0xFD2D008C, 0xFF1AFD3B, 0x00BEFF1B, 0xFEF000BE, 0x0055FE84, 0x00BE00AD, 0xFE83008C, 0x00BBFEF6, 0x008C005D, 0xFFAA00C8, 0xFFCDFFBE, 0x00BEFFAE, 0xFF8800BE, 0xFFDAFF79, 0x00C8FFF5, 0xFF5B00BE, 0xFFFFFF43, 0x00C8001F, 0xFF1D00BE, 0x0030FF0E, 0x00C8004B, 0xFFBE00BE, 0xFFAEFFAA, 0x00C8FFCD, 0xFFB0008C, 0xFFD4FFC4, 0x008CFFB6, 0xFF8800BE, 0xFFDAFF8E, 0x008CFFE2, 0xFF7900C8, 0xFFF5FF7F, 0x008CFFFC, 0xFF5B00BE, 0xFFFFFF61, 0x008C0005, 0xFF4300C8, 0x001FFF49, 0x008C0027, 0xFF1D00BE, 0x0030FF23, 0x008C0038, 0xFF0E00C8, 0x004BFF14, 0x008C0053, 0xFEF000BE, 0x0055FEF6, 0x008C005D, 0xFE6F008C, 0xFE14FE4D, 0x008CFE21, 0xFE5300C8, 0xFE29FE75, 0x00BEFE1B, 0xFE39008C, 0xFE3FFE3F, 0x00BEFE47, 0xFE1C008C, 0xFE49FE22, 0x00C8FE51, 0xFE0C008C, 0xFE64FE12, 0x00BEFE6C, 0xFDE6008C, 0xFE75FDED, 0x00C8FE7C, 0xFDCE008C, 0xFE96FDD4, 0x00BEFE9E, 0xFDB1008C, 0xFEA0FDB7, 0x00C8FEA8, 0xFDA1008C, 0xFEBBFDA8, 0x00BEFEC3, 0xFD2D008C, 0xFF1AFD3B, 0x00BEFF1B, 0xFEF000BE, 0x0055FE84, 0x00BE00AD, 0xFE83008C, 0x00BBFEF6, 0x008C005D, 0xFFAA00C8, 0xFFCDFFBE, 0x00BEFFAE, 0xFF8800BE, 0xFFDAFF79, 0x00C8FFF5, 0xFF5B00BE, 0xFFFFFF43, 0x00C8001F, 0xFF1D00BE, 0x0030FF0E, 0x00C8004B, 0xFFBE00BE, 0xFFAEFFAA, 0x00C8FFCD, 0xFFB0008C, 0xFFD4FFC4, 0x008CFFB6, 0xFF8800BE, 0xFFDAFF8E, 0x008CFFE2, 0xFF7900C8, 0xFFF5FF7F, 0x008CFFFC, 0xFF5B00BE, 0xFFFFFF61, 0x008C0005, 0xFF4300C8, 0x001FFF49, 0x008C0027, 0xFF1D00BE, 0x0030FF23, 0x008C0038, 0xFF0E00C8, 0x004BFF14, 0x008C0053, 0xFEF000BE, 0x0055FEF6, 0x008C005D, 0xFE6F008C, 0xFE14FE4D, 0x008CFE21, 0xFE5300C8, 0xFE29FE75, 0x00BEFE1B, 0xFE39008C, 0xFE3FFE3F, 0x00BEFE47, 0xFE1C008C, 0xFE49FE22, 0x00C8FE51, 0xFE0C008C, 0xFE64FE12, 0x00BEFE6C, 0xFDE6008C, 0xFE75FDED, 0x00C8FE7C, 0xFDCE008C, 0xFE96FDD4, 0x00BEFE9E, 0xFDB1008C, 0xFEA0FDB7, 0x00C8FEA8, 0xFDA1008C, 0xFEBBFDA8, 0x00BEFEC3, 0xFD2D008C, 0xFF1AFD3B, 0x00BEFF1B, 0xFEF000BE, 0x0055FE84, 0x00BE00AD, 0xFE83008C, 0x00BBFEF6, 0x008C005D, 0xFFAA00C8, 0xFFCDFFBE, 0x00BEFFAE, 0xFF8800BE, 0xFFDAFF79, 0x00C8FFF5, 0xFF5B00BE, 0xFFFFFF43, 0x00C8001F, 0xFF1D00BE, 0x0030FF0E, 0x00C8004B, 0xFFBE00BE, 0xFFAEFFAA, 0x00C8FFCD, 0xFFB0008C, 0xFFD4FFC4, 0x008CFFB6, 0xFF8800BE, 0xFFDAFF8E, 0x008CFFE2, 0xFF7900C8, 0xFFF5FF7F, 0x008CFFFC, 0xFF5B00BE, 0xFFFFFF61, 0x008C0005, 0xFF4300C8, 0x001FFF49, 0x008C0027, 0xFF1D00BE, 0x0030FF23, 0x008C0038, 0xFF0E00C8, 0x004BFF14, 0x008C0053, 0xFEF000BE, 0x0055FEF6, 0x008C005D, 0xFE6F008C, 0xFE14FE4D, 0x008CFE21, 0xFE5300C8, 0xFE29FE75, 0x00BEFE1B, 0xFE39008C, 0xFE3FFE3F, 0x00BEFE47, 0xFE1C008C, 0xFE49FE22, 0x00C8FE51, 0xFE0C008C, 0xFE64FE12, 0x00BEFE6C, 0xFDE6008C, 0xFE75FDED, 0x00C8FE7C, 0xFDCE008C, 0xFE96FDD4, 0x00BEFE9E, 0xFDB1008C, 0xFEA0FDB7, 0x00C8FEA8, 0xFDA1008C, 0xFEBBFDA8, 0x00BEFEC3, 0xFD2D008C, 0xFF1AFD3B, 0x00BEFF1B, 0xFEF000BE, 0x0055FE84, 0x00BE00AD, 0xFE83008C, 0x00BBFEF6, 0x008C005D, 0xFFAA00C8, 0xFFCDFFBE, 0x00BEFFAE, 0xFF8800BE, 0xFFDAFF79, 0x00C8FFF5, 0xFF5B00BE, 0xFFFFFF43, 0x00C8001F, 0xFF1D00BE, 0x0030FF0E, 0x00C8004B, 0xFFBE00BE, 0xFFAEFFAA, 0x00C8FFCD, 0xFFB0008C, 0xFFD4FFC4, 0x008CFFB6, 0xFF8800BE, 0xFFDAFF8E, 0x008CFFE2, 0xFF7900C8, 0xFFF5FF7F, 0x008CFFFC, 0xFF5B00BE, 0xFFFFFF61, 0x008C0005, 0xFF4300C8, 0x001FFF49, 0x008C0027, 0xFF1D00BE, 0x0030FF23, 0x008C0038, 0xFF0E00C8, 0x004BFF14, 0x008C0053, 0xFEF000BE, 0x0055FEF6, 0x008C005D, 0xFE6F008C, 0xFE14FE4D, 0x008CFE21, 0xFE5300C8, 0xFE29FE75, 0x00BEFE1B, 0xFE39008C, 0xFE3FFE3F, 0x00BEFE47, 0xFE1C008C, 0xFE49FE22, 0x00C8FE51, 0xFE0C008C, 0xFE64FE12, 0x00BEFE6C, 0xFDE6008C, 0xFE75FDED, 0x00C8FE7C, 0xFDCE008C, 0xFE96FDD4, 0x00BEFE9E, 0xFDB1008C, 0xFEA0FDB7, 0x00C8FEA8, 0xFDA1008C, 0xFEBBFDA8, 0x00BEFEC3, 0xFD2D008C, 0xFF1AFD3B, 0x00BEFF1B, 0xFEF000BE, 0x0055FE84, 0x00BE00AD, 0xFE83008C, 0x00BBFEF6, 0x008C005D, 0xFFAA00C8, 0xFFCDFFBE, 0x00BEFFAE, 0xFF8800BE, 0xFFDAFF79, 0x00C8FFF5, 0xFF5B00BE, 0xFFFFFF43, 0x00C8001F, 0xFF1D00BE, 0x0030FF0E, 0x00C8004B, 0xFFBE00BE, 0xFFAEFFAA, 0x00C8FFCD, 0xFFB0008C, 0xFFD4FFC4, 0x008CFFB6, 0xFF8800BE, 0xFFDAFF8E, 0x008CFFE2, 0xFF7900C8, 0xFFF5FF7F, 0x008CFFFC, 0xFF5B00BE, 0xFFFFFF61, 0x008C0005, 0xFF4300C8, 0x001FFF49, 0x008C0027, 0xFF1D00BE, 0x0030FF23, 0x008C0038, 0xFF0E00C8, 0x004BFF14, 0x008C0053, 0xFEF000BE, 0x0055FEF6, 0x008C005D, 0xFE6F008C, 0xFE14FE4D, 0x008CFE21, 0xFE5300C8, 0xFE29FE75, 0x00BEFE1B, 0xFE39008C, 0xFE3FFE3F, 0x00BEFE47, 0xFE1C008C, 0xFE49FE22, 0x00C8FE51, 0xFE0C008C, 0xFE64FE12, 0x00BEFE6C, 0xFDE6008C, 0xFE75FDED, 0x00C8FE7C, 0xFDCE008C, 0xFE96FDD4, 0x00BEFE9E, 0xFDB1008C, 0xFEA0FDB7, 0x00C8FEA8, 0xFDA1008C, 0xFEBBFDA8, 0x00BEFEC3, 0xFD2D008C, 0xFF1AFD3B, 0x00BEFF1B, 0xFEF000BE, 0x0055FE84, 0x00BE00AD, 0xFE83008C, 0x00BBFEF6, 0x008C005D, 0xFFAA00C8, 0xFFCDFFBE, 0x00BEFFAE, 0xFF8800BE, 0xFFDAFF79, 0x00C8FFF5, 0xFF5B00BE, 0xFFFFFF43, 0x00C8001F, 0xFF1D00BE, 0x0030FF0E, 0x00C8004B, 0xFFBE00BE, 0xFFAEFFAA, 0x00C8FFCD, 0xFFB0008C, 0xFFD4FFC4, 0x008CFFB6, 0xFF8800BE, 0xFFDAFF8E, 0x008CFFE2, 0xFF7900C8, 0xFFF5FF7F, 0x008CFFFC, 0xFF5B00BE, 0xFFFFFF61, 0x008C0005, 0xFF4300C8, 0x001FFF49, 0x008C0027, 0xFF1D00BE, 0x0030FF23, 0x008C0038, 0xFF0E00C8, 0x004BFF14, 0x008C0053, 0xFEF000BE, 0x0055FEF6, 0x008C005D, 0xFE6F008C, 0xFE14FE4D, 0x008CFE21, 0xFE5300C8, 0xFE29FE75, 0x00BEFE1B, 0xFE39008C, 0xFE3FFE3F, 0x00BEFE47, 0xFE1C008C, 0xFE49FE22, 0x00C8FE51, 0xFE0C008C, 0xFE64FE12, 0x00BEFE6C, 0xFDE6008C, 0xFE75FDED, 0x00C8FE7C, 0xFDCE008C, 0xFE96FDD4, 0x00BEFE9E, 0xFDB1008C, 0xFEA0FDB7, 0x00C8FEA8, 0xFDA1008C, 0xFEBBFDA8, 0x00BEFEC3, 0xFD2D008C, 0xFF1AFD3B, 0x00BEFF1B, 0xFEF000BE, 0x0055FE84, 0x00BE00AD, 0xFE83008C, 0x00BBFEF6, 0x008C005D, 0xFFAA00C8, 0xFFCDFFBE, 0x00BEFFAE, 0xFF8800BE, 0xFFDAFF79, 0x00C8FFF5, 0xFF5B00BE, 0xFFFFFF43, 0x00C8001F, 0xFF1D00BE, 0x0030FF0E, 0x00C8004B, 0xFFBE00BE, 0xFFAEFFAA, 0x00C8FFCD, 0xFFB0008C, 0xFFD4FFC4, 0x008CFFB6, 0xFF8800BE, 0xFFDAFF8E, 0x008CFFE2, 0xFF7900C8, 0xFFF5FF7F, 0x008CFFFC, 0xFF5B00BE, 0xFFFFFF61, 0x008C0005, 0xFF4300C8, 0x001FFF49, 0x008C0027, 0xFF1D00BE, 0x0030FF23, 0x008C0038, 0xFF0E00C8, 0x004BFF14, 0x008C0053, 0xFEF000BE, 0x0055FEF6, 0x008C005D, 0xFE6F008C, 0xFE14FE4D, 0x008CFE21, 0xFE5300C8, 0xFE29FE75, 0x00BEFE1B, 0xFE39008C, 0xFE3FFE3F, 0x00BEFE47, 0xFE1C008C, 0xFE49FE22, 0x00C8FE51, 0xFE0C008C, 0xFE64FE12, 0x00BEFE6C, 0xFDE6008C, 0xFE75FDED, 0x00C8FE7C, 0xFDCE008C, 0xFE96FDD4, 0x00BEFE9E, 0xFDB1008C, 0xFEA0FDB7, 0x00C8FEA8, 0xFDA1008C, 0xFEBBFDA8, 0x00BEFEC3, 0xFD2D008C, 0xFF1AFD3B, 0x00BEFF1B, 0xFEF000BE, 0x0055FE84, 0x00BE00AD, 0xFE83008C, 0x00BBFEF6, 0x008C005D, 0xFFAA00C8, 0xFFCDFFBE, 0x00BEFFAE, 0xFF8800BE, 0xFFDAFF79, 0x00C8FFF5, 0xFF5B00BE, 0xFFFFFF43, 0x00C8001F, 0xFF1D00BE, 0x0030FF0E, 0x00C8004B, 0xFFBE00BE, 0xFFAEFFAA, 0x00C8FFCD, 0xFFB0008C, 0xFFD4FFC4, 0x008CFFB6, 0xFF8800BE, 0xFFDAFF8E, 0x008CFFE2, 0xFF7900C8, 0xFFF5FF7F, 0x008CFFFC, 0xFF5B00BE, 0xFFFFFF61, 0x008C0005, 0xFF4300C8, 0x001FFF49, 0x008C0027, 0xFF1D00BE, 0x0030FF23, 0x008C0038, 0xFF0E00C8, 0x004BFF14, 0x008C0053, 0xFEF000BE, 0x0055FEF6, 0x008C005D, 0xFE6F008C, 0xFE14FE4D, 0x008CFE21, 0xFE5300C8, 0xFE29FE75, 0x00BEFE1B, 0xFE39008C, 0xFE3FFE3F, 0x00BEFE47, 0xFE1C008C, 0xFE49FE22, 0x00C8FE51, 0xFE0C008C, 0xFE64FE12, 0x00BEFE6C, 0xFDE6008C, 0xFE75FDED, 0x00C8FE7C, 0xFDCE008C, 0xFE96FDD4, 0x00BEFE9E, 0xFDB1008C, 0xFEA0FDB7, 0x00C8FEA8, 0xFDA1008C, 0xFEBBFDA8, 0x00BEFEC3, 0xFD2D008C, 0xFF1AFD3B, 0x00BEFF1B, 0xFEF000BE, 0x0055FE84, 0x00BE00AD, 0xFE83008C, 0x00BBFEF6, 0x008C005D, 0xFFAA00C8, 0xFFCDFFBE, 0x00BEFFAE, 0xFF8800BE, 0xFFDAFF79, 0x00C8FFF5, 0xFF5B00BE, 0xFFFFFF43, 0x00C8001F, 0xFF1D00BE, 0x0030FF0E, 0x00C8004B, 0xFFBE00BE, 0xFFAEFFAA, 0x00C8FFCD, 0xFFB0008C, 0xFFD4FFC4, 0x008CFFB6, 0xFF8800BE, 0xFFDAFF8E, 0x008CFFE2, 0xFF7900C8, 0xFFF5FF7F, 0x008CFFFC, 0xFF5B00BE, 0xFFFFFF61, 0x008C0005, 0xFF4300C8, 0x001FFF49, 0x008C0027, 0xFF1D00BE, 0x0030FF23, 0x008C0038, 0xFF0E00C8, 0x004BFF14, 0x008C0053, 0xFEF000BE, 0x0055FEF6, 0x008C005D - -dlabel D_80242440_AFFF80 -.word 0xD7000002, 0xFFFFFFFF, 0xE7000000, 0x00000000, 0xFC121824, 0xFF33FFFF, 0xFD100000, D_802425A8_B000E8, 0xF5100000, 0x07094140, 0xE6000000, 0x00000000, 0xF3000000, 0x071FF200, 0xE7000000, 0x00000000, 0xF5100800, 0x00094140, 0xF2000000, 0x0003C07C, 0xD9FFFFFF, 0x00020000, 0x01020040, D_80241180_AFECC0, 0x06000204, 0x00000406, 0x0602080A, 0x00020A04, 0x06080C0E, 0x00080E0A, 0x060C1012, 0x000C120E, 0x06101416, 0x00101612, 0x0614181A, 0x00141A16, 0x06181C1E, 0x00181E1A, 0x061C2022, 0x001C221E, 0x06202426, 0x00202622, 0x06282A2C, 0x00282C2E, 0x06060430, 0x00063032, 0x06040A34, 0x00043430, 0x060A0E36, 0x000A3634, 0x060E1238, 0x000E3836, 0x0612163A, 0x00123A38, 0x06161A3C, 0x00163C3A, 0x061A1E3E, 0x001A3E3C, 0x061E2228, 0x001E283E, 0x0622262A, 0x00222A28, 0x0626242C, 0x00262C2A, 0x01012024, D_80241180_AFECC0, 0x06000204, 0x00000406, 0x0602080A, 0x00020A04, 0x06080C0E, 0x00080E0A, 0x060C1012, 0x000C120E, 0x06101416, 0x00101612, 0x0614181A, 0x00141A16, 0x06181C1E, 0x00181E1A, 0x061C2022, 0x001C221E, 0xE7000000, 0x00000000, 0xFC323864, 0xFF73FFFF, 0xD7000000, 0x00010001, 0xDF000000, 0x00000000 - -dlabel D_802425A8_B000E8 -.word 0x9D1D9D1D, 0x9D1D9D1D, 0x9D1D9D1D, 0x9D1D9D1D, 0x9D1D9D1D, 0x9D1D9D1D, 0x9D1D9D1D, 0x9D1D9D1D, 0x9D1DBDE5, 0xBDE5BDE5, 0xBDE5BDE5, 0xBDE5BDE5, 0xBDE5BDE5, 0xBDE5BDE5, 0xBDE5BDE5, 0xBDE5BDE5, 0x9D1DBDE5, 0xDEF7D6AB, 0xDEF7D6AB, 0xDEF7D6AB, 0xDEF7D6AB, 0xDEF7D6AB, 0xDEF7D6AB, 0xDEF7D6AB, 0x9D1DBDE5, 0xD6ABDEF7, 0xD6ABDEF7, 0xD6ABDEF7, 0xD6ABDEF7, 0xD6ABDEF7, 0xD6ABDEF7, 0xD6ABDEF7, 0x9D1DBDE5, 0xDEF7D6AB, 0xDEF7D6AB, 0xDEF7D6AB, 0xDEF7D6AB, 0xDEF7D6AB, 0xDEF7D6AB, 0xDEF7D6AB, 0x9D1DBDE5, 0xBDE5BDE5, 0xBDE5BDE5, 0xBDE5BDE5, 0xBDE5BDE5, 0xBDE5BDE5, 0xBDE5BDE5, 0xBDE5BDE5, 0x33E93C6B, 0x3C6B3C6B, 0x3C6B3C6B, 0x3C6B3C6B, 0x3C6B3C6B, 0x3C6B3C6B, 0x3C6B3C6B, 0x3C6B3C6B, 0x3C6B44F1, 0x44F144F1, 0x44F15D73, 0x5D7344F1, 0x44F15D73, 0x5D7344F1, 0x44F144F1, 0x44F144F1, 0x33E93C6B, 0x44F144F1, 0x44F144F1, 0x5D735D73, 0x5D735D73, 0x44F144F1, 0x44F144F1, 0x3C6B33E9, 0x9D1D33E9, 0x3C6B44F1, 0x44F144F1, 0x44F15D73, 0x5D7344F1, 0x44F144F1, 0x44F13C6B, 0x33E99D1D, 0xBDE59D1D, 0x33E93C6B, 0x44F144F1, 0x44F144F1, 0x44F144F1, 0x44F144F1, 0x3C6B33E9, 0x9D1D9D1D, 0xBDE5BDE5, 0x9D1D33E9, 0x3C6B44F1, 0x44F144F1, 0x44F144F1, 0x44F13C6B, 0x33E99D1D, 0x9D1D9B01, 0xBDE5BDE5, 0xBDE59D1D, 0x33E93C6B, 0x44F144F1, 0x44F144F1, 0x3C6B33E9, 0x9D1DBDE5, 0x9B01C405, 0xD6ABBDE5, 0xBDE5BDE5, 0x9D1D33E9, 0x3C6B44F1, 0x44F13C6B, 0x23659D1D, 0xBDE59D1D, 0x9B01C405, 0xD6ABD6AB, 0xBDE5BDE5, 0xBDE59D1D, 0x33E93C6B, 0x3C6B2365, 0x9D1DBDE5, 0x9D1D9B01, 0xC405D48B, 0xBDE5D6AB, 0xD6ABBDE5, 0xBDE5BDE5, 0x9D1D33E9, 0x23659D1D, 0x9D1D9D1D, 0x9D1D9B01, 0xC405D48B, 0xBDE5D6AB, 0xD6ABBDE5, 0xBDE5BDE5, 0x9D1D9B01, 0x9B019B01, 0x9B019B01, 0x9B01C405, 0xD48BD48B, 0xD6ABD6AB, 0xBDE5BDE5, 0xBDE59D1D, 0x33E99B01, 0xC405C405, 0xC405C405, 0xC405D48B, 0xD48BD48B, 0xD6ABBDE5, 0xBDE5BDE5, 0x9D1D33E9, 0x3C6B33E9, 0x9B01C405, 0xC405C405, 0xD48BD48B, 0x9B01D48B, 0xBDE5BDE5, 0xBDE59D1D, 0x33E93C6B, 0x44F13C6B, 0x33E99B01, 0x9B01C405, 0xC405D48B, 0x9B01D48B, 0xBDE5BDE5, 0x9D1D33E9, 0x3C6B44F1, 0x44F144F1, 0x3C6B33E9, 0x23659B01, 0xC405D48B, 0x9B01D48B, 0xBDE59D1D, 0x33E93C6B, 0x44F144F1, 0x44F144F1, 0x44F13C6B, 0x33E99B01, 0xC405D48B, 0xD48BD48B, 0x9D1D33E9, 0x3C6B44F1, 0x44F15D73, 0x44F144F1, 0x3C6B33E9, 0x23659B01, 0xC405D48B, 0xD48BD48B, 0x33E93C6B, 0x44F144F1, 0x5D735D73, 0x44F144F1, 0x3C6B33E9, 0x9B01C405, 0xC405C405, 0xC405C405, 0x33E93C6B, 0x44F144F1, 0x5D735D73, 0x44F144F1, 0x3C6B33E9, 0x9B01C405, 0xC405C405, 0x9B019B01, 0x9D1D33E9, 0x3C6B44F1, 0x44F15D73, 0x44F13C6B, 0x33E99B01, 0xC405C405, 0xC4059B01, 0x23659D1D, 0xBDE59D1D, 0x33E93C6B, 0x44F144F1, 0x44F13C6B, 0x33E99B01, 0xC4059B01, 0x9B012365, 0x9D1DBDE5, 0xBDE5BDE5, 0x9D1D33E9, 0x3C6B44F1, 0x44F13C6B, 0x33E99B01, 0x9B0133E9, 0x23659D1D, 0xBDE5BDE5, 0xBDE5BDE5, 0xBDE59D1D, 0x33E93C6B, 0x44F144F1, 0x3C6B33E9, 0x33E92365, 0x9D1DBDE5, 0xBDE5BDE5, 0xD6ABBDE5, 0xBDE5BDE5, 0x9D1D33E9, 0x3C6B44F1, 0x3C6B3C6B, 0x33E99D1D, 0xBDE5BDE5, 0xBDE5D6AB, 0xD6ABD6AB, 0xBDE5BDE5, 0xBDE59D1D, 0x33E93C6B, 0x3C6B33E9, 0x9D1DBDE5, 0xBDE5BDE5, 0xD6ABD6AB, 0xBDE5D6AB, 0xD6ABBDE5, 0xBDE5BDE5, 0x9D1D33E9, 0x33E99D1D, 0xBDE5BDE5, 0xBDE5D6AB, 0xD6AB05EF, 0x00130005, 0x00010000, 0x00000000, 0x00080001, 0x00000000, 0x00000011, 0x000100B6, 0x00B600B6, 0x00050002, 0x00000000, 0x00000008, 0x00020000, 0x00000000, 0x00110002, 0x00B600B6, 0x00B60005, 0x00030000, 0x00000000, 0x00080003, 0x00000000, 0x00000011, 0x000300B6, 0x00B600B6, 0x00050004, 0x00000000, 0x00000008, 0x00040000, 0x00000000, 0x00110004, 0x00B600B6, 0x00B60005, 0x00050000, 0x00000000, 0x00080005, 0x00000000, 0x00000011, 0x000500B6, 0x00B600B6, 0x00050006, 0x00000000, 0x00000008, 0x00060000, 0x00000000, 0x00110006, 0x00B600B6, 0x00B60005, 0x00070000, 0x00000000, 0x00080007, 0x00000000, 0x00000011, 0x000700B6, 0x00B600B6, 0x00050008, 0x00000000, 0x00000008, 0x00080000, 0x00000000, 0x00110008, 0x00B600B6, 0x00B60005, 0x00090000, 0x00000000, 0x00080009, 0x00000000, 0x00000011, 0x000900B6, 0x00B600B6, 0x0005000A, 0x00000000, 0x00000008, 0x000A0000, 0x00000000, 0x0011000A, 0x00B600B6, 0x00B60005, 0x000B0000, 0x00000000, 0x0008000B, 0x00000000, 0x00000011, 0x000B00B6, 0x00B600B6, 0x0005000C, 0x00000000, 0x00000008, 0x000C0000, 0x00000000, 0x0011000C, 0x00B600B6, 0x00B60005, 0x000D0000, 0x00000000, 0x0008000D, 0x00000000, 0x00000011, 0x000D00B6, 0x00B600B6, 0x0005000E, 0x00000000, 0x00000008, 0x000E0000, 0x00000000, 0x0011000E, 0x00B600B6, 0x00B60005, 0x000F0000, 0x00000000, 0x0008000F, 0x00000000, 0x00000011, 0x000F00B6, 0x00B600B6, 0x00050010, 0x00000000, 0x00000008, 0x00100000, 0x00000000, 0x00110010, 0x00B600B6, 0x00B60005, 0x00110000, 0x00000000, 0x00080011, 0x00000000, 0x00000011, 0x001100B6, 0x00B600B6, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00030000 - -dlabel D_80242C9C_B007DC -.word 0x00000043, 0x00000003, EnableModel, 0xFE363C84, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C85, 0x00000001, 0x00000043, 0x00000006, RotateModel, 0xFE363C86, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000006, RotateModel, 0xFE363C87, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242D14_B00854 -.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C87, 0x00000024, 0x00000002, 0xFE363C88, 0xFE363C86, 0x00000024, 0x00000002, 0xFE363C87, 0xFE363C85, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C84, 0x00000008, 0x00000001, 0x00000046, 0x00000043, 0x00000003, EnableModel, 0xFE363C86, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000003, EnableModel, 0xFE363C86, 0x00000001, 0x00000057, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x000000B4, 0x00000014, 0x00000002, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateModel, 0xFE363C88, 0xFE363C80, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000043, 0x00000006, RotateModel, 0xFE363C89, 0xFE363C80, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C87, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242E6C_B009AC -.word 0x00000043, 0x00000004, kkj_20_ToadHouse_InitScreenOverlay, 0x00000000, 0x00000000, 0x00000000, 0x00000046, 0x00000001, D_8024385C_B0139C, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C83, 0x00000043, 0x00000001, kkj_20_ToadHouse_DoesPlayerNeedSleep, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0xFE363C80, 0x00000013, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00830004, 0x00830001, 0x00000000, 0xFE363C88, 0x00000043, 0x00000002, ShowChoice, 0x001E0006, 0x00000008, 0x00000001, 0x00000003, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00830004, 0x00830001, 0x00000000, 0xFE363C89, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00830004, 0x00830001, 0x00000000, 0xFE363C8A, 0x00000043, 0x00000002, SetPlayerJumpscale, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000100, 0x00000001, 0x00000043, 0x00000001, kkj_20_ToadHouse_DisableStatusMenu, 0x0000000B, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_80242D14_B00854, 0x00000013, 0x00000000, 0x00000043, 0x00000002, kkj_20_ToadHouse_PutPartnerAway, 0xFE363C8A, 0x00000008, 0x00000001, 0x00000014, 0x00000046, 0x00000001, D_8024390C_B0144C, 0x00000056, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x000000FF, 0x0000003C, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000003, kkj_20_ToadHouse_UpdateScreenOverlay, 0x00000003, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, FullyRestoreHPandFP, 0x00000043, 0x00000001, FullyRestoreSP, 0x0000000B, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_80242C9C_B007DC, 0x00000013, 0x00000000, 0x00000043, 0x00000002, kkj_20_ToadHouse_GetPartnerBackOut, 0xFE363C8A, 0x00000008, 0x00000001, 0x0000002D, 0x00000043, 0x00000005, MakeLerp, 0x000000FF, 0x00000000, 0x0000001E, 0x00000000, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000003, kkj_20_ToadHouse_UpdateScreenOverlay, 0x00000000, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000069, 0x00000046, 0x00000001, D_80243B94_B016D4, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000100, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00830004, 0x00830001, 0x00000000, 0xFE363C8B, 0x00000043, 0x00000001, kkj_20_ToadHouse_ShowStatusMenu, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80243214_B00D54 -.word 0x00000043, 0x00000004, PlaySoundAtCollider, 0x00000017, 0x000001CF, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x00000050, 0x0000000E, 0x00000004, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateGroup, 0x00000024, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, RotateGroup, 0x00000021, 0xFE363C80, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802432E4_B00E24 -.word 0x00000043, 0x00000005, MakeLerp, 0x00000050, 0x00000000, 0x0000000E, 0x00000004, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateGroup, 0x00000024, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, RotateGroup, 0x00000021, 0xFE363C80, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x00000017, 0x000001D0, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802433B4_B00EF4 -.word 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, TranslateGroup, 0x0000002A, 0x00000001, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, TranslateGroup, 0x0000002A, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, TranslateGroup, 0x0000002A, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000003, GetSelfVar, 0x00000000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80243484_B00FC4 -.word 0x00000043, 0x00000002, kkj_20_GetPeachDisguise, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00830004, 0x00830001, 0x00000000, 0x00140185, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000B, 0x00000002, 0xF8405D62, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00830004, 0x00830001, 0x00000000, 0x00140185, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, SetNpcVar, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000009, SetCamProperties, 0x00000000, 0xF24A8A80, 0xFFFFFFF6, 0x00000000, 0x00000050, 0xF24F2A80, 0xF24ABE80, 0xF24A5280, 0x00000056, 0x00000000, 0x00000043, 0x00000002, SetPlayerSpeed, 0xF24A8280, 0x00000043, 0x00000004, PlayerMoveTo, 0xFFFFFFCE, 0x00000000, 0x00000000, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000005A, 0x00000005, 0x00000043, 0x00000002, func_802CF56C, 0x00000002, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000044, 0x00000001, D_80243214_B00D54, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000006, NpcJump0, 0x00000000, 0xFFFFFFF6, 0x00000000, 0xFFFFFFD8, 0x0000000F, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00830002, 0x00000043, 0x00000005, NpcMoveTo, 0x00000000, 0x0000001E, 0x00000000, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00830001, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000000, 0x0000010E, 0x00000005, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00830004, 0x00830001, 0x00000000, 0x00140182, 0x00000043, 0x00000002, SetPlayerAnimation, 0x000C0000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, SetPlayerAnimation, 0x000C0026, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFE, 0x000C0001, 0x000C0026, 0x00000005, 0x00140183, 0x00000043, 0x00000002, SetPlayerAnimation, 0x000C0002, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, SetPlayerAnimation, 0x000A0001, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00830004, 0x00830001, 0x00000000, 0x00140184, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00830002, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000000, 0xF24A8680, 0x00000043, 0x00000005, NpcMoveTo, 0x00000000, 0xFFFFFFF6, 0xFFFFFFC4, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00830001, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, NpcJump0, 0x00000000, 0xFFFFFFF6, 0x0000001E, 0xFFFFFF7C, 0x0000000A, 0x00000044, 0x00000001, D_802432E4_B00E24, 0x00000008, 0x00000001, 0x0000001E, 0x00000024, 0x00000002, 0xF8405D62, 0x00000001, 0x00000043, 0x00000003, ResetCam, 0x00000000, 0xF24A8A80, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024385C_B0139C -.word 0x0000000A, 0x00000002, 0xF8405D79, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00140187, 0x00000024, 0x00000002, 0xFE363C88, 0x00140188, 0x00000024, 0x00000002, 0xF8405D79, 0x00000001, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00140189, 0x00000024, 0x00000002, 0xFE363C88, 0x0014018A, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x0014018B, 0x00000024, 0x00000002, 0xFE363C82, 0x0014018C, 0x00000024, 0x00000002, 0xFE363C83, 0x0014018D, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024390C_B0144C -.word 0x00000044, 0x00000001, 0x8024066C, 0x00000043, 0x00000002, SetPlayerSpeed, 0xF24A8680, 0x00000043, 0x00000004, PlayerMoveTo, 0x00000032, 0xFFFFFFD8, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, kkj_20_ToadHouse_CamSetFOV, 0x00000000, 0x00000028, 0x00000043, 0x00000004, SetCamType, 0x00000000, 0x00000004, 0x00000000, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF24D9A80, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24B9280, 0xF24A0280, 0x00000043, 0x00000004, SetCamPosA, 0x00000000, 0xF2466A80, 0xF24EB280, 0x00000043, 0x00000004, SetCamPosB, 0x00000000, 0xF24AF280, 0xF2492680, 0x00000043, 0x00000004, SetCamPosC, 0x00000000, 0x00000000, 0xF249B280, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000057, 0x00000000, 0x00000043, 0x00000004, PlayerMoveTo, 0x0000005F, 0xFFFFFFA9, 0x00000000, 0x00000043, 0x00000003, InterpPlayerYaw, 0x000000E5, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, func_802D286C, 0x00000800, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000005, 0x00000007, 0x00000001, 0x00000001, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000003C, 0x00000043, 0x00000002, SetPlayerAnimation, 0x0008001D, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000041, 0x00000043, 0x00000003, kkj_20_ToadHouse_CamSetFOV, 0x00000000, 0x00000019, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80243B94_B016D4 -.word 0x00000043, 0x00000002, HidePlayerShadow, 0x00000000, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000004, SetPlayerPos, 0x00000055, 0x00000000, 0xFFFFFFAB, 0x00000043, 0x00000002, SetPlayerSpeed, 0xF24A8680, 0x00000043, 0x00000004, PlayerMoveTo, 0x0000003C, 0xFFFFFFCE, 0x00000000, 0x00000044, 0x00000001, 0x80240640, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80243C24_B01764 -.word 0x00000043, 0x00000004, kkj_20_ToadHouse_InitScreenOverlay, 0x00000000, 0x00000000, 0x00000000, 0x00000046, 0x00000001, D_8024385C_B0139C, 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C83, 0x00000043, 0x00000001, kkj_20_ToadHouse_DoesPlayerNeedSleep, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0xFE363C80, 0x00000013, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00830004, 0x00830001, 0x00000000, 0xFE363C88, 0x00000043, 0x00000002, ShowChoice, 0x001E0006, 0x00000008, 0x00000001, 0x0000000A, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000006, ContinueSpeech, 0x00000000, 0x00830004, 0x00830001, 0x00000000, 0xFE363C89, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0x00000000, 0x00830004, 0x00830001, 0x00000000, 0xFE363C8A, 0x00000043, 0x00000002, SetPlayerJumpscale, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000000, 0x00000100, 0x00000001, 0x00000043, 0x00000001, kkj_20_ToadHouse_DisableStatusMenu, 0x0000000B, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_80242D14_B00854, 0x00000013, 0x00000000, 0x00000043, 0x00000002, kkj_20_ToadHouse_PutPartnerAway, 0xFE363C8A, 0x00000008, 0x00000001, 0x00000014, 0x00000045, 0x00000002, D_8024390C_B0144C, 0xFE363C89, 0x00000043, 0x00000002, kkj_20_ToadHouse_AwaitScriptComplete, 0xFE363C89, 0x00000056, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x000000FF, 0x0000003C, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000003, kkj_20_ToadHouse_UpdateScreenOverlay, 0x00000003, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000001, FullyRestoreHPandFP, 0x00000043, 0x00000001, FullyRestoreSP, 0x0000000B, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_80242C9C_B007DC, 0x00000013, 0x00000000, 0x00000043, 0x00000002, kkj_20_ToadHouse_GetPartnerBackOut, 0xFE363C8A, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000005, MakeLerp, 0x000000FF, 0x00000000, 0x0000001E, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000003, kkj_20_ToadHouse_UpdateScreenOverlay, 0x00000000, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000005A, 0x00000045, 0x00000002, D_80243B94_B016D4, 0xFE363C89, 0x00000043, 0x00000002, kkj_20_ToadHouse_AwaitScriptComplete, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000000, 0x00000100, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00830004, 0x00830001, 0x00000000, 0xFE363C8B, 0x00000043, 0x00000001, kkj_20_ToadHouse_ShowStatusMenu, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80243FDC_B01B1C -.word 0x00000043, 0x00000004, SetNpcVar, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000044, 0x00000001, D_80243214_B00D54, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000006, NpcJump0, 0x00000000, 0xFFFFFFF6, 0x00000000, 0xFFFFFFD8, 0x0000000F, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000000, 0x00000000, 0x00000043, 0x00000004, NpcFaceNpc, 0xFFFFFFFC, 0x00000000, 0x00000000, 0x00000044, 0x00000001, D_802432E4_B00E24, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00830002, 0x00000043, 0x00000005, NpcMoveTo, 0x00000000, 0x0000001E, 0x00000000, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00830001, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000000, 0x0000010E, 0x00000005, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFFFFFFF6, 0x00000000, 0x00000050, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFFFFFFF6, 0x00000000, 0x00000050, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x000000FA, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24AC280, 0xF24A4E80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8A80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000004, func_802D1270, 0xFFFFFFCE, 0x00000000, 0xF24A8480, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000005A, 0x00000005, 0x00000043, 0x00000002, func_802CF56C, 0x00000002, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00830004, 0x00830001, 0x00000000, 0x00140186, 0x00000043, 0x00000005, GetNpcPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, NpcJump0, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000A, 0x00000046, 0x00000001, D_80243C24_B01764, 0x00000043, 0x00000003, ResetCam, 0x00000000, 0xF24BE280, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024426C_B01DAC -.word 0x00000043, 0x00000001, WaitForPlayerInputEnabled, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000001, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFC, 0xF24A7C80, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFC, 0xFFFFFFAA, 0x00000028, 0xFFFFFFE7, 0x0000000F, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x00200009, 0x00200001, 0x00000005, 0x00140181, 0x00000043, 0x00000008, NpcFlyTo, 0xFFFFFFFC, 0xFFFFFF5B, 0x00000037, 0xFFFFFFE7, 0x00000014, 0xFFFFFFFB, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0x0000005A, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80244364_B01EA4 -.word 0x00000046, 0x00000001, D_80242E6C_B009AC, 0x00000043, 0x00000003, ResetCam, 0x00000000, 0xF24BE280, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80244394_B01ED4 -.word 0x00000014, 0x00000001, 0xF5DE0180, 0x0000001D, 0x00000001, 0x00000006, 0x0000001D, 0x00000001, 0x00000026, 0x0000001D, 0x00000001, 0x0000003A, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0xFFFFFFF6, 0x0000001E, 0xFFFFFF7C, 0x00000043, 0x00000003, SetNpcYaw, 0xFFFFFFFF, 0x0000010E, 0x0000000A, 0x00000002, 0xF8405D62, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000001, 0x00000044, 0x00000001, D_802433B4_B00EF4, 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, D_8024426C_B01DAC, 0x00000013, 0x00000000, 0x00000047, 0x00000005, D_80243484_B00FC4, 0x00000100, 0x00000017, 0x00000001, 0x00000000, 0x00000020, 0x00000000, 0x0000001C, 0x00000000, 0x0000000A, 0x00000002, 0xF8405D79, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0xFFFFFFF6, 0x0000001E, 0xFFFFFF7C, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000001, 0x00000044, 0x00000001, D_802433B4_B00EF4, 0x00000047, 0x00000005, D_80243FDC_B01B1C, 0x00000100, 0x00000017, 0x00000001, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x0000001E, 0x00000000, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, SetNpcYaw, 0xFFFFFFFF, 0x0000010E, 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, D_80244364_B01EA4, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80244540_B02080 -.word 0x00000000, D_80240AD0_AFE610, 0x00000000, 0xC47A0000, 0x00000000, 0x00000D0D, D_80244394_B01ED4, 0x00000000, 0x00000000, 0x00000000, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00830001, 0x00830002, 0x00830003, 0x00830003, 0x00830001, 0x00830001, 0x00830006, 0x00830006, 0x00830003, 0x00830003, 0x00830003, 0x00830003, 0x00830003, 0x00830003, 0x00830003, 0x00830003, 0x00000000, 0x00000000, 0x00000000, 0x001A0121, 0x00000001, D_80244540_B02080, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kkj/kkj_21/B022A0.data.s b/ver/us/asm/data/world/area_kkj/kkj_21/B022A0.data.s deleted file mode 100644 index e897d7803c..0000000000 --- a/ver/us/asm/data/world/area_kkj/kkj_21/B022A0.data.s +++ /dev/null @@ -1,15 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240000_B022A0 -.word 0x43A28000, 0x00000000, 0xC1F00000, 0x43870000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80240160_B02400, D_80240000_B022A0, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00190016 - -dlabel D_80240050_B022F0 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000002, 0x00000024, 0x00000002, 0xFE363C82, 0x00000002, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFFFF, 0x00000044, 0x00000001, ExitSingleDoor, 0x00000008, 0x00000001, 0x00000011, 0x00000043, 0x00000003, GotoMap, 0x80240240, 0x00000002, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802400F4_B02394 -.word 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x00000002, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFFFF, 0x00000046, 0x00000001, EnterSingleDoor, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240160_B02400 -.word 0x00000024, 0x00000002, 0xF5DE0329, 0x0000001A, 0x00000043, 0x00000002, SetSpriteShading, 0xFFFFFFFF, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000043, 0x00000003, SetCamLeadPlayer, 0x00000000, 0x00000000, 0x00000043, 0x00000002, UseDoorSounds, 0x00000000, 0x00000047, 0x00000005, D_80240050_B022F0, 0x00000100, 0x00000002, 0x00000001, 0x00000000, 0x00000044, 0x00000001, D_802400F4_B02394, 0x00000008, 0x00000001, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kkj/kkj_22/B024F0.data.s b/ver/us/asm/data/world/area_kkj/kkj_22/B024F0.data.s deleted file mode 100644 index a9b9441d46..0000000000 --- a/ver/us/asm/data/world/area_kkj/kkj_22/B024F0.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240000_B024F0 -.word 0xC3610000, 0x00000000, 0xC2340000, 0x42B40000, 0xC3C58000, 0x43960000, 0xC2E60000, 0x42B40000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x8024029C, D_80240000_B024F0, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80200000, 0x00190017, 0x0000000F, 0x00000002, 0xF5DE0180, 0x0000005F, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000066, 0x00000000, 0x00000008, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kkj/kkj_22/B025A0.data.s b/ver/us/asm/data/world/area_kkj/kkj_22/B025A0.data.s deleted file mode 100644 index 50e9798e25..0000000000 --- a/ver/us/asm/data/world/area_kkj/kkj_22/B025A0.data.s +++ /dev/null @@ -1,12 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802400B0_B025A0 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000002, 0x00000024, 0x00000002, 0xFE363C82, 0x00000010, 0x00000024, 0x00000002, 0xFE363C83, 0x00000012, 0x00000044, 0x00000001, ExitDoubleDoor, 0x00000008, 0x00000001, 0x00000011, 0x00000043, 0x00000003, GotoMap, 0x80240380, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240154_B02644 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000024, 0x00000002, 0xFE363C81, 0x00000007, 0x00000024, 0x00000002, 0xFE363C82, 0x00000022, 0x00000024, 0x00000002, 0xFE363C83, 0x00000024, 0x00000044, 0x00000001, ExitDoubleDoor, 0x00000008, 0x00000001, 0x00000011, 0x00000043, 0x00000003, GotoMap, 0x80240388, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802401F8_B026E8 -.word 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x00000010, 0x00000024, 0x00000002, 0xFE363C83, 0x00000012, 0x00000046, 0x00000001, EnterDoubleDoor, 0x00000016, 0x00000001, 0x00000001, 0x00000024, 0x00000002, 0xFE363C82, 0x00000022, 0x00000024, 0x00000002, 0xFE363C83, 0x00000024, 0x00000046, 0x00000001, EnterDoubleDoor, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0329, 0x0000001A, 0x00000043, 0x00000002, SetSpriteShading, 0x00050006, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000044, 0x00000001, 0x80240060, 0x00000043, 0x00000002, UseDoorSounds, 0x00000002, 0x00000047, 0x00000005, D_802400B0_B025A0, 0x00000100, 0x00000002, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80240154_B02644, 0x00000100, 0x00000007, 0x00000001, 0x00000000, 0x00000044, 0x00000001, D_802401F8_B026E8, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kkj/kkj_23/B03250.data.s b/ver/us/asm/data/world/area_kkj/kkj_23/B03250.data.s deleted file mode 100644 index 030e2ad5f2..0000000000 --- a/ver/us/asm/data/world/area_kkj/kkj_23/B03250.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802409D0_B03250 -.word 0x4437C000, 0x00000000, 0xC2700000, 0x43870000, 0x41200000, 0x00000000, 0xC2700000, 0x42B40000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80240CF4, D_802409D0_B03250, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80200000, 0x00190018, 0x0000000F, 0x00000002, 0xF5DE0180, 0x0000005F, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000066, 0x00000000, 0x00000008, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kkj/kkj_23/B03300.data.s b/ver/us/asm/data/world/area_kkj/kkj_23/B03300.data.s deleted file mode 100644 index b409383cc9..0000000000 --- a/ver/us/asm/data/world/area_kkj/kkj_23/B03300.data.s +++ /dev/null @@ -1,15 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240A80_B03300 -.word 0x00000024, 0x00000002, 0xFE363C80, 0xF5DE01CE, 0x00000043, 0x00000001, func_80240020_B028A0, 0x00000043, 0x00000002, PlaySound, 0x000000DC, 0x00000043, 0x00000004, GotoMapSpecial, 0x80243CB0, 0x0000000A, 0x0000000C, 0x00000008, 0x00000001, 0x00000064 - -dlabel D_80240AD0_B03350 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000007, 0x00000024, 0x00000002, 0xFE363C82, 0x00000007, 0x00000024, 0x00000002, 0xFE363C83, 0x00000005, 0x00000044, 0x00000001, ExitDoubleDoor, 0x00000008, 0x00000001, 0x00000011, 0x00000043, 0x00000003, GotoMap, 0x80243CB8, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240B74_B033F4 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000024, 0x00000002, 0xFE363C81, 0x00000002, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x00000002, 0x00000044, 0x00000001, ExitDoubleDoor, 0x00000008, 0x00000001, 0x00000011, 0x00000043, 0x00000003, GotoMap, 0x80243CC0, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240C18_B03498 -.word 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x00000007, 0x00000024, 0x00000002, 0xFE363C83, 0x00000005, 0x00000046, 0x00000001, EnterDoubleDoor, 0x0000000A, 0x00000002, 0xF5DE0180, 0x0000003A, 0x00000044, 0x00000001, 0x80243010, 0x00000012, 0x00000000, 0x00000044, 0x00000001, 0x80240F3C, 0x00000013, 0x00000000, 0x00000016, 0x00000001, 0x00000001, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x00000002, 0x00000046, 0x00000001, EnterDoubleDoor, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0329, 0x0000001A, 0x00000043, 0x00000002, SetSpriteShading, 0x00050007, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x0000000A, 0x00000002, 0xF5DE0180, 0x0000003A, 0x00000043, 0x00000002, func_80240048_B028C8, 0x00000001, 0x00000043, 0x00000003, MakeNpcs, 0x00000000, 0x80242714, 0x00000012, 0x00000000, 0x00000043, 0x00000003, MakeNpcs, 0x00000000, 0x80241B6C, 0x00000013, 0x00000000, 0x00000044, 0x00000001, 0x80240A30, 0x00000043, 0x00000002, UseDoorSounds, 0x00000002, 0x00000047, 0x00000005, D_80240B74_B033F4, 0x00000100, 0x00000002, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80240AD0_B03350, 0x00000100, 0x00000007, 0x00000001, 0x00000000, 0x00000044, 0x00000001, D_80240C18_B03498, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kkj/kkj_23/B036B0.data.s b/ver/us/asm/data/world/area_kkj/kkj_23/B036B0.data.s deleted file mode 100644 index 5ac5f57ca4..0000000000 --- a/ver/us/asm/data/world/area_kkj/kkj_23/B036B0.data.s +++ /dev/null @@ -1,45 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240E30_B036B0 -.word 0x00000000, 0x004B0048, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000 - -dlabel D_80240E5C_B036DC -.word 0x00000000, 0x00180018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000 - -dlabel D_80240E88_B03708 -.word 0x437A0000, 0x41200000, 0xC3700000, 0x435C0000, 0x00000000, 0xC3820000, 0x434D0000, 0x42200000, 0xC38C0000, 0x432A0000, 0x433E0000, 0xC3960000 - -dlabel D_80240EB8_B03738 -.word 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000001, 0x80000066, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, func_80240080_B02900, 0x0000000C, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000002, StopSound, 0x80000066, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF8405D7A, 0x00000001, 0x0000000A, 0x00000002, 0xF8405D7B, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00800018, 0x00000043, 0x00000004, AwaitPlayerApproach, 0x00000064, 0xFFFFFFC4, 0x0000012C, 0x00000024, 0x00000002, 0xF8405D7B, 0x00000001, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x0080001B, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00800018, 0x00000057, 0x00000000, 0x00000043, 0x00000004, AwaitPlayerApproach, 0x00000000, 0xFFFFFFC4, 0x000000FA, 0x00000043, 0x00000005, LoadPath, 0x0000001E, D_80240E88_B03708, 0x00000004, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, GetNextPathPos, 0x00000043, 0x00000005, SetNpcPos, 0x00000000, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000005, SetNpcPos, 0x00000001, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C81, 0x0000001C, 0x00000027, 0x00000002, 0xFE363C82, 0x00000028, 0x00000027, 0x00000002, 0xFE363C83, 0xFFFFFFFD, 0x00000043, 0x00000005, SetNpcPos, 0x00000002, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000000, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000001, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024113C_B039BC -.word 0x00000001, 0x00000002, 0x00000003, 0x00000002, 0x00000001, 0xFFFFFFFF, 0xFFFFFFFE, 0xFFFFFFFD, 0xFFFFFFFE, 0xFFFFFFFF - -dlabel D_80241164_B039E4 -.word 0x00000003, 0x00000001, 0x00000000, 0x00000030, 0x00000001, D_8024113C_B039BC, 0x00000005, 0x00000001, 0x0000000A, 0x00000031, 0x00000001, 0xFE363C81, 0x00000043, 0x00000005, GetNpcPos, 0x00000000, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000027, 0x00000002, 0xFE363C83, 0xFE363C81, 0x00000043, 0x00000005, SetNpcPos, 0x00000000, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000008, 0x00000001, 0x00000003, 0x00000006, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024120C_B03A8C -.word 0x00000003, 0x00000001, 0x00000000, 0x00000030, 0x00000001, D_8024113C_B039BC, 0x00000005, 0x00000001, 0x0000000A, 0x00000031, 0x00000001, 0xFE363C81, 0x00000043, 0x00000005, GetNpcPos, 0x00000001, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000027, 0x00000002, 0xFE363C83, 0xFE363C81, 0x00000043, 0x00000005, SetNpcPos, 0x00000001, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000008, 0x00000001, 0x00000003, 0x00000006, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802412B4_B03B34 -.word 0x00000003, 0x00000001, 0x00000000, 0x00000030, 0x00000001, D_8024113C_B039BC, 0x00000005, 0x00000001, 0x0000000A, 0x00000031, 0x00000001, 0xFE363C81, 0x00000043, 0x00000005, GetNpcPos, 0x00000002, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000027, 0x00000002, 0xFE363C83, 0xFE363C81, 0x00000043, 0x00000005, SetNpcPos, 0x00000002, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000008, 0x00000001, 0x00000003, 0x00000006, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024135C_B03BDC -.word 0x00000043, 0x00000005, SetNpcPos, 0x00000000, 0x00000000, 0xFFFFFC18, 0x00000000, 0x0000000A, 0x00000002, 0xF8405D7A, 0x00000001, 0x0000000A, 0x00000002, 0xF8405D7B, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, D_80241164_B039E4, 0x00000043, 0x00000003, SetNpcYaw, 0xFFFFFFFF, 0x0000005A, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x000000FA, 0x0000000A, 0xFFFFFF06, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00800018, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241418_B03C98 -.word 0x00000043, 0x00000005, SetNpcPos, 0x00000001, 0x00000000, 0xFFFFFC18, 0x00000000, 0x0000000A, 0x00000002, 0xF8405D7A, 0x00000001, 0x0000000A, 0x00000002, 0xF8405D7B, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, D_8024120C_B03A8C, 0x00000043, 0x00000003, SetNpcYaw, 0xFFFFFFFF, 0x0000005A, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x000000FA, 0x0000000A, 0xFFFFFF06, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00800021, 0x00000044, 0x00000001, D_80240EB8_B03738, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802414E0_B03D60 -.word 0x00000043, 0x00000005, SetNpcPos, 0x00000002, 0x00000000, 0xFFFFFC18, 0x00000000, 0x0000000A, 0x00000002, 0xF8405D7A, 0x00000001, 0x0000000A, 0x00000002, 0xF8405D7B, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, D_802412B4_B03B34, 0x00000043, 0x00000003, SetNpcYaw, 0xFFFFFFFF, 0x0000005A, 0x00000043, 0x00000005, SetNpcPos, 0x00000002, 0x00000116, 0x00000032, 0xFFFFFF03, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x000C001E, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024159C_B03E1C -.word 0x00000000, D_80240E30_B036B0, 0x00000000, 0x00000000, 0x00000000, 0x00000D05, D_8024135C_B03BDC, 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, 0x00800002, 0x00800002, 0x00800002, 0x00800002, 0x00800002, 0x00800002, 0x00800002, 0x00800002, 0x00800002, 0x00800002, 0x00800002, 0x00800002, 0x00800002, 0x00800002, 0x00800002, 0x00800002, 0x00000000, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_8024178C_B0400C -.word 0x00000001, D_80240E5C_B036DC, 0x00000000, 0x00000000, 0x00000000, 0x00000F05, D_80241418_B03C98, 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, 0x00800002, 0x00800002, 0x00800002, 0x00800002, 0x00800002, 0x00800002, 0x00800002, 0x00800002, 0x00800002, 0x00800002, 0x00800002, 0x00800002, 0x00800002, 0x00800002, 0x00800002, 0x00800002, 0x00000000, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_8024197C_B041FC -.word 0x00000002, D_80240E5C_B036DC, 0x00000000, 0x00000000, 0x00000000, 0x00020F05, D_802414E0_B03D60, 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, 0x000A0000, 0x000A0000, 0x000A0000, 0x000A0000, 0x000A0000, 0x000A0000, 0x000A0000, 0x000A0000, 0x000A0000, 0x000A0000, 0x000A0000, 0x000A0000, 0x000A0000, 0x000A0000, 0x000A0000, 0x000A0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, D_8024159C_B03E1C, 0x00000000, 0x00000001, D_8024178C_B0400C, 0x00000000, 0x00000001, D_8024197C_B041FC, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kkj/kkj_23/B04420.data.s b/ver/us/asm/data/world/area_kkj/kkj_23/B04420.data.s deleted file mode 100644 index 9dd5370a54..0000000000 --- a/ver/us/asm/data/world/area_kkj/kkj_23/B04420.data.s +++ /dev/null @@ -1,36 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80241BA0_B04420 -.word 0x00000000, 0x0028001E, 0x00000000, 0x00000000, 0x00000000, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x001A0000 - -dlabel D_80241BCC_B0444C -.word 0x00000000, 0x00280018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00190000 - -dlabel D_80241BF8_B04478 -.word 0x00580000, 0x00580001, 0x00580002, 0x00580004, 0x00580005, 0x00580006, 0x00580007, 0x00580008, 0x00580009, 0x00580012, 0x00580014, 0x0058001B, 0xFFFFFFFF - -dlabel D_80241C2C_B044AC -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000003, GetSelfVar, 0x00000000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00580008, 0x00580001, 0x00000000, 0x0014014D, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00580008, 0x00580001, 0x00000000, 0x0014014E, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFF, 0x0000005A, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241D10_B04590 -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000001, func_80240784_B03004, 0x0000004D, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000001, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFFFFFFFF, 0x00000262, 0x00000000, 0x00000043, 0x0000000A, ShowEmote, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000014, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, NpcFacePlayer, 0xFFFFFFFF, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, PlayerFaceNpc, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x000C0005, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00580001, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00580008, 0x00580001, 0x00000000, 0x00140174, 0x00000043, 0x00000005, kkj_23_UnkGooberFunc50, 0xFFFFFFFF, 0xFE363C83, 0xFE363C80, 0xFE363C82, 0x0000000B, 0x00000002, 0xFE363C83, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00580006, 0x00000043, 0x00000003, SetNpcSpeed, 0xFFFFFFFF, 0xF24A8E80, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0xFE363C80, 0xFE363C82, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00580001, 0x00000013, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00580008, 0x00580001, 0x00000000, 0x00140175, 0x00000043, 0x00000002, SetPlayerAnimation, 0x000C0017, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000004, GotoMapSpecial, 0x80243CE8, 0x0000000B, 0x0000000D, 0x00000008, 0x00000001, 0x00000064, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241F14_B04794 -.word 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000002, kkj_23_GetPeachDisguise, 0xFE363C81, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000043, 0x00000003, SetSelfEnemyFlagBits, 0x08000000, 0x00000001, 0x00000043, 0x00000003, BindNpcAI, 0xFFFFFFFF, D_80241D10_B04590, 0x00000002, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000003, SetSelfEnemyFlagBits, 0x08000000, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241FB8_B04838 -.word 0x00000045, 0x00000002, D_80241F14_B04794, 0xFE363C8A, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000001, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, GetSelfVar, 0x00000001, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000003, SetSelfEnemyFlagBits, 0x08000000, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242060_B048E0 -.word 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00580001, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x0000008C, 0x00000000, 0xFFFFFFB0, 0x00000043, 0x00000003, SetNpcYaw, 0xFFFFFFFF, 0x0000005A, 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, D_80241FB8_B04838, 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, D_80241C2C_B044AC, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802420DC_B0495C -.word 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00580001, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000028, 0x00000000, 0xFFFFFFB0, 0x00000043, 0x00000003, SetNpcYaw, 0xFFFFFFFF, 0x0000005A, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242130_B049B0 -.word 0x00600001, 0x00600002, 0x00600004, 0x00600005, 0xFFFFFFFF - -dlabel D_80242144_B049C4 -.word 0x00000000, D_80241BA0_B04420, 0x00000000, 0xC3FA0000, 0x00000000, 0x00000F0D, 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, 0x00600001, 0x00600002, 0x00600003, 0x00600003, 0x00600001, 0x00600001, 0x00600000, 0x00600000, 0x00600003, 0x00600003, 0x00600003, 0x00600003, 0x00600003, 0x00600003, 0x00600003, 0x00600003, 0x00000000, 0x00000000, D_80242130_B049B0, 0x00000000, 0x00000001, D_80241BCC_B0444C, 0x00000000, 0xC3FA0000, 0x00000000, 0x00400D0D, D_80242060_B048E0, 0x00000000, 0x00000000, 0x00000000, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00580001, 0x00580004, 0x00580006, 0x00580006, 0x00580001, 0x00580001, 0x00580010, 0x00580010, 0x0058000C, 0x0058000B, 0x0058000D, 0x00580001, 0x00580001, 0x00580001, 0x00580001, 0x00580001, 0x00000000, 0x00000000, D_80241BF8_B04478, 0x00000000, 0x00000002, D_80241BCC_B0444C, 0x00000000, 0xC3FA0000, 0x00000000, 0x00000F0D, D_802420DC_B0495C, 0x00000000, 0x00000000, 0x00000000, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00580001, 0x00580004, 0x00580006, 0x00580006, 0x00580001, 0x00580001, 0x00580010, 0x00580010, 0x0058000C, 0x0058000B, 0x0058000D, 0x00580001, 0x00580001, 0x00580001, 0x00580001, 0x00580001, 0x00000000, 0x00000000, D_80241BF8_B04478, 0x00000000, 0x00000003, D_80242144_B049C4, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kkj/kkj_23/B04FB0.data.s b/ver/us/asm/data/world/area_kkj/kkj_23/B04FB0.data.s deleted file mode 100644 index 0ef63ca891..0000000000 --- a/ver/us/asm/data/world/area_kkj/kkj_23/B04FB0.data.s +++ /dev/null @@ -1,18 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80242730_B04FB0 -.word 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000056, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x0000001A, 0x00000027, 0x00000002, 0xFE363C82, 0x00000002, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00580006, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000001, 0xF24A8E80, 0x00000043, 0x00000005, NpcMoveTo, 0x00000001, 0xFE363C80, 0xFE363C82, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00580001, 0x00000043, 0x00000003, NpcFacePlayer, 0x00000001, 0x00000005, 0x00000057, 0x00000000, 0x00000043, 0x00000004, SetNpcVar, 0x00000002, 0x00000000, 0x00000001, 0x00000056, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C80, 0x0000001A, 0x00000028, 0x00000002, 0xFE363C82, 0x00000002, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x00580006, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000002, 0xF24A8E80, 0x00000043, 0x00000005, NpcMoveTo, 0x00000002, 0xFE363C80, 0xFE363C82, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x00580001, 0x00000043, 0x00000003, NpcFacePlayer, 0x00000002, 0x00000005, 0x00000043, 0x00000004, SetNpcVar, 0x00000002, 0x00000000, 0x00000000, 0x00000057, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000004, GetNpcVar, 0x00000002, 0x00000000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242984_B05204 -.word 0x00000056, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C80, 0x00000005, 0x00000043, 0x00000005, NpcMoveTo, 0x00000001, 0xFE363C80, 0xFE363C82, 0x00000005, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00580012, 0x00000028, 0x00000002, 0xFE363C80, 0x00000005, 0x00000043, 0x00000005, NpcMoveTo, 0x00000001, 0xFE363C80, 0xFE363C82, 0x00000005, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000005, 0x00000043, 0x00000005, NpcMoveTo, 0x00000002, 0xFE363C80, 0xFE363C82, 0x00000005, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x00580012, 0x00000027, 0x00000002, 0xFE363C80, 0x00000005, 0x00000043, 0x00000005, NpcMoveTo, 0x00000002, 0xFE363C80, 0xFE363C82, 0x00000005, 0x00000057, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, SetPlayerAnimation, 0x000C0005, 0x00000008, 0x00000001, 0x00000001, 0x00000005, 0x00000001, 0x00000004, 0x00000027, 0x00000002, 0xFE363C81, 0x00000002, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x000C0018, 0x00000028, 0x00000002, 0xFE363C80, 0x0000000F, 0x00000005, 0x00000001, 0x00000005, 0x00000027, 0x00000002, 0xFE363C81, 0x00000004, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242BA8_B05428 -.word 0x00000043, 0x00000004, InterpNpcYaw, 0x00000001, 0x0000005A, 0x00000003, 0x00000008, 0x00000001, 0x0000000A, 0x00000056, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x0000000A, 0x00000027, 0x00000002, 0xFE363C82, 0x00000002, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0x0000001E, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x00580014, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000002, 0xF24A8E80, 0x00000043, 0x00000005, NpcMoveTo, 0x00000002, 0x000002AC, 0xFFFFFFCC, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00580014, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000001, 0xF24A8E80, 0x00000043, 0x00000005, NpcMoveTo, 0x00000001, 0x000002CC, 0xFFFFFFD0, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A7C80, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242D68_B055E8 -.word 0x00000043, 0x00000004, PlaySoundAtCollider, 0x00000002, 0x000001C5, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x00000050, 0x0000000E, 0x00000004, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateModel, 0x00000000, 0xFE363C80, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000002, 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, RotateModel, 0x00000000, 0xFE363C80, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000002, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x00000002, 0x000001C6, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242F04_B05784 -.word 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x0000002D, 0x00000005, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C80, 0x00000000, 0x00000027, 0x00000002, 0xFE363C80, 0xFE363C81, 0x00000027, 0x00000002, 0xFE363C81, 0x00000004, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtPlayer, 0x00002049, 0x00000000, 0x00000043, 0x00000001, func_802409AC_B0322C, 0x00000005, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C80, 0x00000000, 0x00000027, 0x00000002, 0xFE363C80, 0xFE363C81, 0x00000028, 0x00000002, 0xFE363C81, 0x00000004, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000005A, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, SetCamLeadPlayer, 0x00000000, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000E, 0x00000002, 0xFE363C80, 0x0000008C, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000046, 0x00000000, 0x00000008, 0x00000043, 0x00000004, SetNpcVar, 0x00000001, 0x00000001, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000001, 0x00000100, 0x00000001, 0x00000043, 0x00000005, SetNpcPos, 0x00000000, 0xFFFFFFCE, 0x00000000, 0xFFFFFFCE, 0x00000044, 0x00000001, D_80242D68_B055E8, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00600002, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000000, 0xF24A8280, 0x00000043, 0x00000005, NpcMoveTo, 0x00000000, 0x0000001E, 0xFFFFFFCE, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00600001, 0x00000056, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000001, 0x0000010E, 0x00000005, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, GetNpcPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000D, 0x00000002, 0xFE363C80, 0x0000008C, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000001, 0x0000005A, 0x00000005, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, func_802D1270, 0x000000BE, 0xFE363C82, 0xF24A8A80, 0x00000043, 0x00000004, func_802D1270, 0x000000C3, 0xFFFFFFB0, 0xF24A8A80, 0x00000043, 0x00000004, func_802D1270, 0x000000BE, 0xFFFFFFB0, 0xF24A8A80, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, GetNpcPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000D, 0x00000002, 0xFE363C80, 0x000000BE, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000005A, 0x00000005, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFC, 0xFE363C80, 0xFFFFFFF6, 0xFFFFFF7E, 0x00000014, 0x00000043, 0x00000003, SetNpcSpeed, 0xFFFFFFFC, 0xF24A8A80, 0x00000043, 0x00000008, NpcFlyTo, 0xFFFFFFFC, 0x000000D2, 0xFFFFFFF6, 0xFFFFFF7E, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0x0000010E, 0x00000005, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, GetNpcPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000D, 0x00000002, 0xFE363C80, 0x000000D2, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0x0000005A, 0x00000005, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x00000000, 0x00000000, 0xFFFFFFCE, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x00000000, 0x00000000, 0xFFFFFFCE, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF24F2A80, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24ABE80, 0xF24A5680, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8E80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00600004, 0x00600001, 0x00000005, 0x0014014F, 0x00000043, 0x00000007, SpeakToNpc, 0x00000001, 0x00580008, 0x00580001, 0x00000000, 0x00000000, 0x00140150, 0x00000043, 0x00000004, SetNpcVar, 0x00000000, 0x00000000, 0x00000001, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000004, GetNpcVar, 0x00000000, 0x00000000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00600002, 0x00000043, 0x00000005, NpcMoveTo, 0x00000000, 0x0000010E, 0xFFFFFFCE, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00600001, 0x00000043, 0x00000004, SetNpcVar, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000000, 0x0000010E, 0x00000005, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x000000E6, 0x00000000, 0xFFFFFFCE, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8680, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00600004, 0x00600001, 0x00000005, 0x00140151, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, SetPlayerJumpscale, 0xF24A7E80, 0x00000043, 0x00000005, PlayerJump1, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000A, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00600004, 0x00600001, 0x00000005, 0x00140152, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000000, 0x0000005A, 0x00000005, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, NpcMoveTo, 0x00000000, 0x00000118, 0xFFFFFFCE, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000000, 0x00000262, 0x00000000, 0x00000043, 0x0000000A, ShowEmote, 0x00000000, 0x00000000, 0xFFFFFFD3, 0x0000000F, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000000, 0x0000010E, 0x00000005, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00600004, 0x00600001, 0x00000005, 0x00140153, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000001, 0x0000005A, 0x00000005, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00600005, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00600005, 0x00600005, 0x00000005, 0x00140154, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000000, 0x0000207A, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFFFFEC, 0x00000027, 0x00000002, 0xFE363C81, 0x00000028, 0x00000027, 0x00000002, 0xFE363C82, 0x0000001B, 0x00000043, 0x0000000F, PlayEffect, 0x00000013, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x00000032, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000003C, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C82, 0x00000005, 0x00000043, 0x00000005, GetNpcPos, 0x00000000, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000027, 0x00000002, 0xFE363C84, 0x000000B4, 0x00000043, 0x00000003, PlaySoundAtPlayer, 0x00002127, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x0000005E, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000005, 0x00000014, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, func_80240910_B03190, 0xFE363C8F, 0x000000FF, 0x00000000, 0x000000FF, 0x00000027, 0x00000002, 0xFE363C81, 0x0000000F, 0x00000043, 0x0000000F, PlayEffect, 0x00000038, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x0000001E, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, NpcFacePlayer, 0xFFFFFFFC, 0x00000000, 0x00000046, 0x00000001, D_80242F04_B05784, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00600001, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFE, 0x000C0006, 0x000C0006, 0x00000005, 0x00140155, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00600005, 0x00600005, 0x00000005, 0x00140156, 0x00000043, 0x00000002, SetPlayerAnimation, 0x000C0011, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00600002, 0x00000043, 0x00000005, NpcMoveTo, 0x00000000, 0x00000104, 0xFFFFFFCE, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00600001, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00600004, 0x00600001, 0x00000005, 0x00140157, 0x00000056, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000003, NpcFacePlayer, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000D, 0x00000002, 0xFE363C80, 0x000000F0, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0x0000005A, 0x00000000, 0x00000057, 0x00000000, 0x00000046, 0x00000001, D_80242730_B04FB0, 0x00000046, 0x00000001, D_80242984_B05204, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFE, 0x000C0018, 0x000C0018, 0x00000005, 0x00140158, 0x00000046, 0x00000001, D_80242BA8_B05428, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, SetNpcSpeed, 0xFFFFFFFC, 0xF24A9280, 0x00000043, 0x00000008, NpcFlyTo, 0xFFFFFFFC, 0x000001CC, 0xFFFFFFF6, 0xFFFFFF7E, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000003C, 0x00000043, 0x00000003, FadeOutMusic, 0x00000000, 0x000003E8, 0x00000046, 0x00000001, D_80240A80_B03300, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_kkj/kkj_24/B06590.data.s b/ver/us/asm/data/world/area_kkj/kkj_24/B06590.data.s deleted file mode 100644 index d00b425fb6..0000000000 --- a/ver/us/asm/data/world/area_kkj/kkj_24/B06590.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240020_B06590 -.word 0x43110000, 0x00000000, 0xC1200000, 0x43870000, 0x43110000, 0x43D20000, 0xC1A00000, 0x43870000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80240358, D_80240020_B06590, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80200000, 0x00190019, 0x0000000F, 0x00000002, 0xF5DE0180, 0x0000005F, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000066, 0x00000000, 0x00000008, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kkj/kkj_24/B06640.data.s b/ver/us/asm/data/world/area_kkj/kkj_24/B06640.data.s deleted file mode 100644 index 53e9f60f8e..0000000000 --- a/ver/us/asm/data/world/area_kkj/kkj_24/B06640.data.s +++ /dev/null @@ -1,15 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802400D0_B06640 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000002, 0x00000024, 0x00000002, 0xFE363C82, 0x0000000F, 0x00000024, 0x00000002, 0xFE363C83, 0x0000000D, 0x00000044, 0x00000001, ExitDoubleDoor, 0x00000008, 0x00000001, 0x00000011, 0x00000043, 0x00000003, GotoMap, 0x80240480, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240174_B066E4 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000024, 0x00000002, 0xFE363C81, 0x00000007, 0x00000024, 0x00000002, 0xFE363C82, 0x00000018, 0x00000024, 0x00000002, 0xFE363C83, 0x00000016, 0x00000044, 0x00000001, ExitDoubleDoor, 0x00000008, 0x00000001, 0x00000011, 0x00000043, 0x00000003, GotoMap, 0x80240488, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240218_B06788 -.word 0x00000047, 0x00000005, D_802400D0_B06640, 0x00000100, 0x00000002, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80240174_B066E4, 0x00000100, 0x00000007, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240260_B067D0 -.word 0x00000043, 0x00000002, GetLoadType, 0xFE363C81, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000044, 0x00000001, EnterSavePoint, 0x00000044, 0x00000001, D_80240218_B06788, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x0000000F, 0x00000024, 0x00000002, 0xFE363C83, 0x0000000D, 0x00000046, 0x00000001, EnterDoubleDoor, 0x00000016, 0x00000001, 0x00000001, 0x00000024, 0x00000002, 0xFE363C82, 0x00000018, 0x00000024, 0x00000002, 0xFE363C83, 0x00000016, 0x00000046, 0x00000001, EnterDoubleDoor, 0x00000023, 0x00000000, 0x00000044, 0x00000001, D_80240218_B06788, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0329, 0x0000001A, 0x00000043, 0x00000002, SetSpriteShading, 0x00050008, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000043, 0x00000003, SetCamLeadPlayer, 0x00000000, 0x00000000, 0x00000046, 0x00000001, 0x80240440, 0x00000043, 0x00000001, func_80240000_B06570, 0x00000044, 0x00000001, 0x80240080, 0x00000043, 0x00000002, UseDoorSounds, 0x00000002, 0x00000044, 0x00000001, D_80240260_B067D0, 0x00000008, 0x00000001, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kkj/kkj_24/B069B0.data.s b/ver/us/asm/data/world/area_kkj/kkj_24/B069B0.data.s deleted file mode 100644 index 234a9c08e8..0000000000 --- a/ver/us/asm/data/world/area_kkj/kkj_24/B069B0.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240440_B069B0 -.word 0x00000043, 0x00000007, MakeEntity, Entity_SavePoint, 0xFFFFFFE7, 0x0000003C, 0xFFFFFFCE, 0x00000000, 0x80000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kkj/kkj_25/B07940.data.s b/ver/us/asm/data/world/area_kkj/kkj_25/B07940.data.s deleted file mode 100644 index 9c2056c4fb..0000000000 --- a/ver/us/asm/data/world/area_kkj/kkj_25/B07940.data.s +++ /dev/null @@ -1,21 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240F40_B07940 -.word 0xC4174000, 0x00000000, 0x00000000, 0x42B40000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_802414EC_B07EEC, D_80240F40_B07940, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80200000, 0x0019001A - -dlabel D_80240F90_B07990 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000002, 0x00000024, 0x00000002, 0xFE363C82, 0x00000002, 0x00000024, 0x00000002, 0xFE363C83, 0x00000004, 0x00000044, 0x00000001, ExitDoubleDoor, 0x00000008, 0x00000001, 0x00000011, 0x00000043, 0x00000003, GotoMap, 0x8024C700, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241034_B07A34 -.word 0x00000047, 0x00000005, D_80240F90_B07990, 0x00000100, 0x00000002, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241060_B07A60 -.word 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF8405D7E, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFFFFFD7B, 0x00000000, 0x00000000, 0x00000043, 0x00000002, GetPartnerInUse, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFFFFFD6C, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000096, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x00000002, 0x000001C5, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x00000050, 0x0000000A, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateModel, 0x00000002, 0xFE363C80, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000004, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000004, SetPlayerPos, 0xFFFFFDA3, 0x00000000, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000001, 0x00000000, 0x00000043, 0x00000003, ResetCam, 0x00000000, 0xF24BE280, 0x00000024, 0x00000002, 0xF8405D7E, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000001, 0x00000000, 0x00000043, 0x00000003, ResetCam, 0x00000000, 0xF24BE280, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x00000002, 0x00000024, 0x00000002, 0xFE363C83, 0x00000004, 0x00000046, 0x00000001, EnterDoubleDoor, 0x00000044, 0x00000001, D_80241034_B07A34, 0x00000044, 0x00000001, 0x80245AF0, 0x00000016, 0x00000001, 0x00000001, 0x00000044, 0x00000001, 0x80248998, 0x00000016, 0x00000001, 0x00000002, 0x00000044, 0x00000001, 0x8024B254, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024132C_B07D2C -.word 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000027, 0x00000002, 0xFE363C82, 0x0000000A, 0x00000043, 0x00000006, RotateGroup, 0x00000094, 0xFE363C82, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, RotateGroup, 0x00000098, 0xFE363C82, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, RotateGroup, 0x0000009C, 0xFE363C82, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, RotateGroup, 0x000000A0, 0xFE363C82, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, RotateGroup, 0x000000A4, 0xFE363C82, 0x00000000, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x0000005A, 0x00000005, 0x00000001, 0x00000000, 0x00000027, 0x00000002, 0xFE363C82, 0x0000000A, 0x00000043, 0x00000006, RotateGroup, 0x00000096, 0xFE363C82, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, RotateGroup, 0x0000009A, 0xFE363C82, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, RotateGroup, 0x0000009E, 0xFE363C82, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, RotateGroup, 0x000000A2, 0xFE363C82, 0x00000000, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802414EC_B07EEC -.word 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000001, 0x00000024, 0x00000002, 0xF8405D7C, 0x00000001, 0x00000016, 0x00000001, 0x00000002, 0x00000024, 0x00000002, 0xF8405D7C, 0x00000001, 0x00000024, 0x00000002, 0xF8405D7D, 0x00000001, 0x00000023, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0329, 0x0000001A, 0x00000043, 0x00000002, SetSpriteShading, 0x00050009, 0x00000043, 0x00000003, SetCamLeadPlayer, 0x00000000, 0x00000000, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A7D80, 0x0000000A, 0x00000002, 0xF8405D7D, 0x00000000, 0x0000000A, 0x00000002, 0xF8405D7C, 0x00000000, 0x00000043, 0x00000003, MakeNpcs, 0x00000000, 0x80242854, 0x00000012, 0x00000000, 0x00000043, 0x00000003, MakeNpcs, 0x00000000, 0x8024487C, 0x00000043, 0x00000003, EnableGroup, 0x00000058, 0x00000000, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000003, MakeNpcs, 0x00000000, 0x802455F4, 0x00000043, 0x00000003, EnableGroup, 0x00000058, 0x00000000, 0x00000013, 0x00000000, 0x00000046, 0x00000001, 0x8024C670, 0x00000043, 0x00000002, UseDoorSounds, 0x00000002, 0x00000044, 0x00000001, D_80241060_B07A60, 0x00000043, 0x00000003, ParentColliderToModel, 0x0000000B, 0x00000059, 0x00000044, 0x00000001, D_8024132C_B07D2C, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFD050F8B, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x000000AA, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFD050F8B, 0x00000001, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000005, ScaleModel, 0x000000AA, 0x000000FA, 0x00000001, 0x000000FA, 0x00000013, 0x00000000, 0x00000044, 0x00000001, 0x80247194, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kkj/kkj_25/B081C0.data.s b/ver/us/asm/data/world/area_kkj/kkj_25/B081C0.data.s deleted file mode 100644 index 44741f0342..0000000000 --- a/ver/us/asm/data/world/area_kkj/kkj_25/B081C0.data.s +++ /dev/null @@ -1,192 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802417C0_B081C0 -.word 0x00000000, 0x004B0048, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000 - -dlabel D_802417EC_B081EC -.word 0x00000000, 0x00180018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000 - -dlabel D_80241818_B08218 -.word 0x00000000, 0x00220018, 0x00000000, 0x00000000, 0x00000000, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x001A0000 - -dlabel D_80241844_B08244 -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000003, GetSelfVar, 0x00000000, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFFFFB5, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x000003E8, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24ABE80, 0xF24A5E80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8A80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000057, 0x00000000, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000001, 0x00020000, 0x00000043, 0x00000002, StopSound, 0x0000022C, 0x00000043, 0x00000002, StartBossBattle, 0x00000067, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802419BC_B083BC -.word 0x00000043, 0x00000002, PlaySound, 0x0000022D, 0x00000044, 0x00000001, 0x80247AAC, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802419E8_B083E8 -.word 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, D_80241844_B08244, 0x00000043, 0x00000003, BindNpcDefeat, 0xFFFFFFFF, D_802419BC_B083BC, 0x00000043, 0x00000005, SetNpcPos, 0x00000000, 0x0000015E, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241A3C_B0843C -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000003, GetSelfVar, 0x00000000, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000002, func_802D286C, 0x00002000, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000008, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, GetNpcPos, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000001, 0x00020000, 0x00000043, 0x00000002, StopSound, 0x0000022D, 0x00000043, 0x00000002, StartBossBattle, 0x00000067, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241B88_B08588 -.word 0x00000043, 0x00000002, GetBattleOutcome, 0xFE363C80, 0x00000043, 0x00000001, func_80240020_B06A20, 0x00000024, 0x00000002, 0xF8405D7C, 0x00000001, 0x00000043, 0x00000003, GotoMap, 0x8024C708, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241BE4_B085E4 -.word 0x00000024, 0x00000002, 0xFE363C83, 0x00000001, 0x00000005, 0x00000001, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x00000043, 0x00000005, GetNpcPos, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0xFE363C83, 0x00000043, 0x00000005, SetNpcPos, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000002, 0x00000006, 0x00000000, 0x00000029, 0x00000002, 0xFE363C83, 0xFFFFFFFF, 0x00000008, 0x00000001, 0x00000003, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241C9C_B0869C -.word 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, D_80241A3C_B0843C, 0x00000043, 0x00000003, BindNpcDefeat, 0xFFFFFFFF, D_80241B88_B08588, 0x00000043, 0x00000003, BindNpcAux, 0xFFFFFFFF, D_80241BE4_B085E4, 0x00000043, 0x00000005, SetNpcPos, 0x00000002, 0x000001CC, 0x0000000A, 0x00000000, 0x00000043, 0x00000003, SetNpcYaw, 0x00000002, 0x0000010E, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x00610004, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241D2C_B0872C -.word 0x00000043, 0x00000005, SetNpcPos, 0x00000003, 0x0000012C, 0xFFFFFF9C, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000003, 0x00610002, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241D6C_B0876C -.word 0x00000043, 0x00000005, SetNpcPos, 0x00000001, 0x00000190, 0x00000000, 0xFFFFFFE2, 0x00000043, 0x00000003, SetNpcYaw, 0x00000001, 0x0000010E, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x000C001E, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241DC0_B087C0 -.word 0x00000043, 0x00000003, SetNpcAnimation, 0x00000004, 0x00200001, 0x00000043, 0x00000003, EnableNpcShadow, 0x00000004, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000004, 0x0000012C, 0xFFFFFF9C, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241E14_B08814 -.word 0x00800002, 0x00800004, 0x00800006, 0x0080000D, 0x0080000E, 0x0080000F, 0x00800012, 0x00800013, 0xFFFFFFFF - -dlabel D_80241E38_B08838 -.word 0x000C001D, 0x000A0001, 0x000A0002, 0x000C0000, 0x000C0006, 0x000C001E, 0x000D0009, 0x000D000A, 0x000D000B, 0x000C0026, 0x000D000F, 0xFFFFFFFF - -dlabel D_80241E68_B08868 -.word 0x00610000, 0x00610001, 0x00610004, 0x00610006, 0x00610007, 0x00610008, 0x00610002, 0x0061000C, 0x00610003, 0xFFFFFFFF - -dlabel D_80241E90_B08890 -.word 0x00200001, 0x00200002, 0x0020001A, 0x00200009, 0xFFFFFFFF - -dlabel D_80241EA4_B088A4 -.word 0x00000000, D_802417C0_B081C0, 0x00000000, 0x00000000, 0x00000000, 0x00840F05, D_802419E8_B083E8, 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, 0x00800002, 0x00800002, 0x00800002, 0x00800002, 0x00800002, 0x00800002, 0x00800002, 0x00800002, 0x00800002, 0x00800002, 0x00800002, 0x00800002, 0x00800002, 0x00800002, 0x00800002, 0x00800002, 0x00000000, 0x00000000, D_80241E14_B08814, 0x00000000 - -dlabel D_80242094_B08A94 -.word 0x00000001, D_802417EC_B081EC, 0x00000000, 0x00000000, 0x00000000, 0x00020F05, D_80241D6C_B0876C, 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, 0x000A0000, 0x000A0000, 0x000A0000, 0x000A0000, 0x000A0000, 0x000A0000, 0x000A0000, 0x000A0000, 0x000A0000, 0x000A0000, 0x000A0000, 0x000A0000, 0x000A0000, 0x000A0000, 0x000A0000, 0x000A0000, 0x00000000, 0x00000000, D_80241E38_B08838, 0x00000000 - -dlabel D_80242284_B08C84 -.word 0x00000002, D_80241818_B08218, 0x00000000, 0x00000000, 0x00000000, 0x00840F05, D_80241C9C_B0869C, 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, 0x00610000, 0x00610000, 0x00610000, 0x00610000, 0x00610000, 0x00610000, 0x00610000, 0x00610000, 0x00610000, 0x00610000, 0x00610000, 0x00610000, 0x00610000, 0x00610000, 0x00610000, 0x00610000, 0x00000000, 0x00000000, D_80241E68_B08868, 0x00000000, 0x00000003, D_80241818_B08218, 0x00000000, 0x00000000, 0x00000000, 0x00840F05, D_80241D2C_B0872C, 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, 0x00610000, 0x00610000, 0x00610000, 0x00610000, 0x00610000, 0x00610000, 0x00610000, 0x00610000, 0x00610000, 0x00610000, 0x00610000, 0x00610000, 0x00610000, 0x00610000, 0x00610000, 0x00610000, 0x00000000, 0x00000000, D_80241E68_B08868, 0x00000000 - -dlabel D_80242664_B09064 -.word 0x00000004, D_802417EC_B081EC, 0x00000000, 0x00000000, 0x00000000, 0x00840F05, D_80241DC0_B087C0, 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, 0x00200001, 0x00200005, 0x00200008, 0x00200008, 0x00200001, 0x00200001, 0x00200001, 0x00200001, 0x00200001, 0x00200001, 0x00200001, 0x00200001, 0x00200001, 0x00200001, 0x00200001, 0x00200001, 0x00000000, 0x00000000, D_80241E90_B08890, 0x00000000, 0x00000001, D_80241EA4_B088A4, 0x23030000, 0x00000001, D_80242094_B08A94, 0x00000000, 0x00000002, D_80242284_B08C84, 0x26000000, 0x00000001, D_80242664_B09064, 0x00000000, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_80242890_B09290 -.word 0x00000000, 0x004B0048, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000 - -dlabel D_802428BC_B092BC -.word 0x00000000, 0x00180018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000 - -dlabel D_802428E8_B092E8 -.word 0x00000000, 0x00220018, 0x00000000, 0x00000000, 0x00000000, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x001A0000 - -dlabel D_80242914_B09314 -.word 0x00000000, 0x001A0018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000, 0x00000000, 0x00140014, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000, 0x00000000, 0x00160018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000 - -dlabel D_80242998_B09398 -.word 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000003, GetSelfVar, 0x00000000, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000005, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFFFFB5, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8A80, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24ABE80, 0xF24A5E80, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x000003E8, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000057, 0x00000000, 0x00000043, 0x00000002, StartBossBattle, 0x00000005, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242B04_B09504 -.word 0x00000043, 0x00000003, SetEncounterStatusFlags, 0x00000002, 0x00000001, 0x00000043, 0x00000001, kkj_25_UnkFunc1, 0x00000024, 0x00000002, 0xF8405D7D, 0x00000001, 0x00000043, 0x00000003, GotoMap, 0x8024C710, 0x00000002, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242B64_B09564 -.word 0x00000001, 0x00000002, 0x00000003, 0x00000002, 0x00000001, 0xFFFFFFFF, 0xFFFFFFFE, 0xFFFFFFFD, 0xFFFFFFFE, 0xFFFFFFFF - -dlabel D_80242B8C_B0958C -.word 0x00000003, 0x00000001, 0x00000000, 0x00000030, 0x00000001, D_80242B64_B09564, 0x00000005, 0x00000001, 0x0000000A, 0x00000031, 0x00000001, 0xFE363C81, 0x00000043, 0x00000005, GetNpcPos, 0x00000006, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000027, 0x00000002, 0xFE363C83, 0xFE363C81, 0x00000043, 0x00000005, SetNpcPos, 0x00000006, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000008, 0x00000001, 0x00000003, 0x00000006, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242C34_B09634 -.word 0x00000043, 0x00000005, SetNpcPos, 0x00000001, 0x000001DB, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x000A0001, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242C74_B09674 -.word 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, D_80242998_B09398, 0x00000043, 0x00000003, BindNpcDefeat, 0xFFFFFFFF, D_80242B04_B09504, 0x00000043, 0x00000005, SetNpcScale, 0x00000005, 0xF24A8080, 0xF24A8080, 0xF24A8080, 0x00000043, 0x00000005, SetNpcPos, 0x00000005, 0x000000C8, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000005, 0x00800002, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242CF8_B096F8 -.word 0x00000043, 0x00000003, BindNpcAux, 0xFFFFFFFF, D_80242B8C_B0958C, 0x00000043, 0x00000005, SetNpcPos, 0x00000006, 0x0000021C, 0x0000000A, 0xFFFFFFCE, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000006, 0x0061000C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242D4C_B0974C -.word 0x00000043, 0x00000005, SetNpcPos, 0x00000007, 0x00000226, 0x00000000, 0xFFFFFFD8, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000007, 0x00610003, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242D8C_B0978C -.word 0x00000043, 0x00000004, InterpNpcYaw, 0x00000001, 0x0000010E, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000004, 0x000001FE, 0x0000001E, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000004, 0x0000010E, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242DE8_B097E8 -.word 0x00000043, 0x00000007, func_802CFD30, 0x00000008, 0x00000007, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0x00000008, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000008, 0x00000064, 0x0000002D, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242E4C_B0984C -.word 0x00000043, 0x00000007, func_802CFD30, 0x00000009, 0x00000007, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0x00000009, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000009, 0x0000002E, 0x0000002D, 0xFFFFFFE5, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242EB0_B098B0 -.word 0x00000043, 0x00000007, func_802CFD30, 0x0000000A, 0x00000007, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0x0000000A, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x0000000A, 0x00000021, 0x0000002D, 0xFFFFFFA1, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242F14_B09914 -.word 0x00000043, 0x00000007, func_802CFD30, 0x0000000B, 0x00000007, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0x0000000B, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x0000000B, 0x00000047, 0x0000002D, 0xFFFFFF7C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242F78_B09978 -.word 0x00000043, 0x00000007, func_802CFD30, 0x0000000C, 0x00000007, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0x0000000C, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x0000000C, 0x00000083, 0x0000002D, 0xFFFFFF7C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242FDC_B099DC -.word 0x00000043, 0x00000007, func_802CFD30, 0x0000000D, 0x00000007, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0x0000000D, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x0000000D, 0x000000A9, 0x0000002D, 0xFFFFFFA1, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80243040_B09A40 -.word 0x00000043, 0x00000007, func_802CFD30, 0x0000000E, 0x00000007, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0x0000000E, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x0000000E, 0x0000009C, 0x0000002D, 0xFFFFFFE5, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802430A4_B09AA4 -.word 0x00800002, 0x00800004, 0x00800006, 0x0080000D, 0x0080000E, 0xFFFFFFFF - -dlabel D_802430BC_B09ABC -.word 0x000A0001, 0x000A0002, 0x000C0000, 0x000C0006, 0x000C001E, 0x000D0009, 0x000C0026, 0x000D000F, 0xFFFFFFFF - -dlabel D_802430E0_B09AE0 -.word 0x00610004, 0x00610006, 0x0061000C, 0x00610003, 0xFFFFFFFF - -dlabel D_802430F4_B09AF4 -.word 0x00200001, 0x00200009, 0xFFFFFFFF - -dlabel D_80243100_B09B00 -.word 0x00120001, 0x00120002, 0xFFFFFFFF - -dlabel D_8024310C_B09B0C -.word 0x00130001, 0xFFFFFFFF - -dlabel D_80243114_B09B14 -.word 0x00140001, 0xFFFFFFFF - -dlabel D_8024311C_B09B1C -.word 0x00150001, 0xFFFFFFFF - -dlabel D_80243124_B09B24 -.word 0x00160001, 0xFFFFFFFF - -dlabel D_8024312C_B09B2C -.word 0x00170001, 0xFFFFFFFF - -dlabel D_80243134_B09B34 -.word 0x00180001, 0xFFFFFFFF - -dlabel D_8024313C_B09B3C -.word 0x00000005, D_80242890_B09290, 0x00000000, 0x00000000, 0x00000000, 0x00840F05, D_80242C74_B09674, 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, 0x00800002, 0x00800002, 0x00800002, 0x00800002, 0x00800002, 0x00800002, 0x00800002, 0x00800002, 0x00800002, 0x00800002, 0x00800002, 0x00800002, 0x00800002, 0x00800002, 0x00800002, 0x00800002, 0x00000000, 0x00000000, D_802430A4_B09AA4, 0x00000000 - -dlabel D_8024332C_B09D2C -.word 0x00000001, D_802428BC_B092BC, 0x00000000, 0x00000000, 0x00000000, 0x00020F05, D_80242C34_B09634, 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, 0x000A0000, 0x000A0000, 0x000A0000, 0x000A0000, 0x000A0000, 0x000A0000, 0x000A0000, 0x000A0000, 0x000A0000, 0x000A0000, 0x000A0000, 0x000A0000, 0x000A0000, 0x000A0000, 0x000A0000, 0x000A0000, 0x00000000, 0x00000000, D_802430BC_B09ABC, 0x00000000 - -dlabel D_8024351C_B09F1C -.word 0x00000006, D_802428E8_B092E8, 0x00000000, 0x00000000, 0x00000000, 0x00840F05, D_80242CF8_B096F8, 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, 0x00610000, 0x00610000, 0x00610000, 0x00610000, 0x00610000, 0x00610000, 0x00610000, 0x00610000, 0x00610000, 0x00610000, 0x00610000, 0x00610000, 0x00610000, 0x00610000, 0x00610000, 0x00610000, 0x00000000, 0x00000000, D_802430E0_B09AE0, 0x00000000, 0x00000007, D_802428E8_B092E8, 0x00000000, 0x00000000, 0x00000000, 0x00000F05, D_80242D4C_B0974C, 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, 0x00610000, 0x00610000, 0x00610000, 0x00610000, 0x00610000, 0x00610000, 0x00610000, 0x00610000, 0x00610000, 0x00610000, 0x00610000, 0x00610000, 0x00610000, 0x00610000, 0x00610000, 0x00610000, 0x00000000, 0x00000000, D_802430E0_B09AE0, 0x00000000 - -dlabel D_802438FC_B0A2FC -.word 0x00000004, D_802428BC_B092BC, 0x00000000, 0x00000000, 0x00000000, 0x00000F05, D_80242D8C_B0978C, 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, 0x00200001, 0x00200005, 0x00200008, 0x00200008, 0x00200001, 0x00200001, 0x00200001, 0x00200001, 0x00200001, 0x00200001, 0x00200001, 0x00200001, 0x00200001, 0x00200001, 0x00200001, 0x00200001, 0x00000000, 0x00000000, D_802430F4_B09AF4, 0x00000000 - -dlabel D_80243AEC_B0A4EC -.word 0x00000008, D_80242914_B09314, 0x00000000, 0x00000000, 0x00000000, 0x00000F05, D_80242DE8_B097E8, 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, 0x00120001, 0x00120001, 0x00120001, 0x00120001, 0x00120001, 0x00120001, 0x00120001, 0x00120001, 0x00120000, 0x00120001, 0x00120001, 0x00120001, 0x00120001, 0x00120001, 0x00120001, 0x00120001, 0x00000000, 0x00000000, D_80243100_B09B00, 0x00000000 - -dlabel D_80243CDC_B0A6DC -.word 0x00000009, D_80242914_B09314, 0x00000000, 0x00000000, 0x00000000, 0x00000F05, D_80242E4C_B0984C, 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, 0x00130001, 0x00130001, 0x00130001, 0x00130001, 0x00130001, 0x00130001, 0x00130001, 0x00130001, 0x00130000, 0x00130001, 0x00130001, 0x00130001, 0x00130001, 0x00130001, 0x00130001, 0x00130001, 0x00000000, 0x00000000, D_8024310C_B09B0C, 0x00000000 - -dlabel D_80243ECC_B0A8CC -.word 0x0000000A, D_80242914_B09314, 0x00000000, 0x00000000, 0x00000000, 0x00000F05, D_80242EB0_B098B0, 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, 0x00140001, 0x00140001, 0x00140001, 0x00140001, 0x00140001, 0x00140001, 0x00140001, 0x00140001, 0x00140000, 0x00140001, 0x00140001, 0x00140001, 0x00140001, 0x00140001, 0x00140001, 0x00140001, 0x00000000, 0x00000000, D_80243114_B09B14, 0x00000000 - -dlabel D_802440BC_B0AABC -.word 0x0000000B, D_80242914_B09314, 0x00000000, 0x00000000, 0x00000000, 0x00000F05, D_80242F14_B09914, 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, 0x00150001, 0x00150001, 0x00150001, 0x00150001, 0x00150001, 0x00150001, 0x00150001, 0x00150001, 0x00150000, 0x00150001, 0x00150001, 0x00150001, 0x00150001, 0x00150001, 0x00150001, 0x00150001, 0x00000000, 0x00000000, D_8024311C_B09B1C, 0x00000000 - -dlabel D_802442AC_B0ACAC -.word 0x0000000C, D_80242914_B09314, 0x00000000, 0x00000000, 0x00000000, 0x00000F05, D_80242F78_B09978, 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, 0x00160001, 0x00160001, 0x00160001, 0x00160001, 0x00160001, 0x00160001, 0x00160001, 0x00160001, 0x00160000, 0x00160001, 0x00160001, 0x00160001, 0x00160001, 0x00160001, 0x00160001, 0x00160001, 0x00000000, 0x00000000, D_80243124_B09B24, 0x00000000 - -dlabel D_8024449C_B0AE9C -.word 0x0000000D, D_80242914_B09314, 0x00000000, 0x00000000, 0x00000000, 0x00000F05, D_80242FDC_B099DC, 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, 0x00170001, 0x00170001, 0x00170001, 0x00170001, 0x00170001, 0x00170001, 0x00170001, 0x00170001, 0x00170000, 0x00170001, 0x00170001, 0x00170001, 0x00170001, 0x00170001, 0x00170001, 0x00170001, 0x00000000, 0x00000000, D_8024312C_B09B2C, 0x00000000 - -dlabel D_8024468C_B0B08C -.word 0x0000000E, D_80242914_B09314, 0x00000000, 0x00000000, 0x00000000, 0x00000F05, D_80243040_B09A40, 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, 0x00180001, 0x00180001, 0x00180001, 0x00180001, 0x00180001, 0x00180001, 0x00180001, 0x00180001, 0x00180000, 0x00180001, 0x00180001, 0x00180001, 0x00180001, 0x00180001, 0x00180001, 0x00180001, 0x00000000, 0x00000000, D_80243134_B09B34, 0x00000000, 0x00000001, D_8024313C_B09B3C, 0x23040000, 0x00000001, D_8024332C_B09D2C, 0x00000000, 0x00000002, D_8024351C_B09F1C, 0x26000000, 0x00000001, D_802438FC_B0A2FC, 0x00000000, 0x00000001, D_80243AEC_B0A4EC, 0x00000000, 0x00000001, D_80243CDC_B0A6DC, 0x00000000, 0x00000001, D_80243ECC_B0A8CC, 0x00000000, 0x00000001, D_802440BC_B0AABC, 0x00000000, 0x00000001, D_802442AC_B0ACAC, 0x00000000, 0x00000001, D_8024449C_B0AE9C, 0x00000000, 0x00000001, D_8024468C_B0B08C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kkj/kkj_25/B0B310.data.s b/ver/us/asm/data/world/area_kkj/kkj_25/B0B310.data.s deleted file mode 100644 index d0f1126af4..0000000000 --- a/ver/us/asm/data/world/area_kkj/kkj_25/B0B310.data.s +++ /dev/null @@ -1,93 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80244910_B0B310 -.word 0x00000000, 0x004B0048, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000 - -dlabel D_8024493C_B0B33C -.word 0x00000000, 0x00180018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000 - -dlabel D_80244968_B0B368 -.word 0x00000000, 0x00220018, 0x00000000, 0x00000000, 0x00000000, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x001A0000 - -dlabel D_80244994_B0B394 -.word 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802449A4_B0B3A4 -.word 0x00000000, 0x00180018, D_80244994_B0B394, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000 - -dlabel D_802449D0_B0B3D0 -.word 0x00000001, 0x00000002, 0x00000003, 0x00000002, 0x00000001, 0xFFFFFFFF, 0xFFFFFFFE, 0xFFFFFFFD, 0xFFFFFFFE, 0xFFFFFFFF - -dlabel D_802449F8_B0B3F8 -.word 0x00000003, 0x00000001, 0x00000000, 0x00000030, 0x00000001, D_802449D0_B0B3D0, 0x00000005, 0x00000001, 0x0000000A, 0x00000031, 0x00000001, 0xFE363C81, 0x00000043, 0x00000005, GetNpcPos, 0x00000011, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000027, 0x00000002, 0xFE363C83, 0xFE363C81, 0x00000043, 0x00000005, SetNpcPos, 0x00000011, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000008, 0x00000001, 0x00000003, 0x00000006, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80244AA0_B0B4A0 -.word 0x00000043, 0x00000005, SetNpcPos, 0x00000013, 0x0000010E, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80244ACC_B0B4CC -.word 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000F, 0x00800023, 0x00000043, 0x00000005, SetNpcPos, 0x0000000F, 0x0000012C, 0x00000000, 0x00000032, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80244B0C_B0B50C -.word 0x00000043, 0x00000004, SetNpcCollisionSize, 0x00000010, 0x00000030, 0x00000018, 0x00000043, 0x00000005, SetNpcPos, 0x00000010, 0x00000190, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000010, 0x000A0001, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80244B64_B0B564 -.word 0x00000043, 0x00000003, BindNpcAux, 0xFFFFFFFF, D_802449F8_B0B3F8, 0x00000043, 0x00000005, SetNpcPos, 0x00000011, 0x0000020D, 0x0000000A, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000011, 0x00610004, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000011, 0x0000010E, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80244BD0_B0B5D0 -.word 0x00000043, 0x00000005, SetNpcPos, 0x00000012, 0x000001AE, 0x0000001E, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80244BFC_B0B5FC -.word 0x00800002, 0x00800004, 0x00800006, 0x0080000D, 0x00800023, 0xFFFFFFFF - -dlabel D_80244C14_B0B614 -.word 0x000A0001, 0x000A0002, 0x000C0000, 0x000C0006, 0xFFFFFFFF - -dlabel D_80244C28_B0B628 -.word 0x00610004, 0x00610006, 0xFFFFFFFF - -dlabel D_80244C34_B0B634 -.word 0x00200001, 0x00200009, 0x0020000E, 0xFFFFFFFF - -dlabel D_80244C44_B0B644 -.word 0x0000000F, D_80244910_B0B310, 0x00000000, 0x00000000, 0x00000000, 0x00840F05, D_80244ACC_B0B4CC, 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, 0x00800002, 0x00800002, 0x00800002, 0x00800002, 0x00800002, 0x00800002, 0x00800002, 0x00800002, 0x00800002, 0x00800002, 0x00800002, 0x00800002, 0x00800002, 0x00800002, 0x00800002, 0x00800002, 0x00000000, 0x00000000, D_80244BFC_B0B5FC, 0x00000000 - -dlabel D_80244E34_B0B834 -.word 0x00000010, D_8024493C_B0B33C, 0x00000000, 0x00000000, 0x00000000, 0x00860F05, D_80244B0C_B0B50C, 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, 0x000A0000, 0x000A0000, 0x000A0000, 0x000A0000, 0x000A0000, 0x000A0000, 0x000A0000, 0x000A0000, 0x000A0000, 0x000A0000, 0x000A0000, 0x000A0000, 0x000A0000, 0x000A0000, 0x000A0000, 0x000A0000, 0x00000000, 0x00000000, D_80244C14_B0B614, 0x00000000 - -dlabel D_80245024_B0BA24 -.word 0x00000011, D_80244968_B0B368, 0x00000000, 0x00000000, 0x00000000, 0x00840F05, D_80244B64_B0B564, 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, 0x00610000, 0x00610000, 0x00610000, 0x00610000, 0x00610000, 0x00610000, 0x00610000, 0x00610000, 0x00610000, 0x00610000, 0x00610000, 0x00610000, 0x00610000, 0x00610000, 0x00610000, 0x00610000, 0x00000000, 0x00000000, D_80244C28_B0B628, 0x00000000 - -dlabel D_80245214_B0BC14 -.word 0x00000012, D_8024493C_B0B33C, 0x00000000, 0x00000000, 0x00000000, 0x00000F05, D_80244BD0_B0B5D0, 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, 0x00200001, 0x00200005, 0x00200008, 0x00200008, 0x00200001, 0x00200001, 0x00200001, 0x00200001, 0x00200001, 0x00200001, 0x00200001, 0x00200001, 0x00200001, 0x00200001, 0x00200001, 0x00200001, 0x00000000, 0x00000000, D_80244C34_B0B634, 0x00000000 - -dlabel D_80245404_B0BE04 -.word 0x00000013, D_802449A4_B0B3A4, 0x00000000, 0xC47A0000, 0x00000000, 0x00000F05, D_80244AA0_B0B4A0, 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, 0x00D30000, 0x00D30000, 0x00D30000, 0x00D30000, 0x00D30000, 0x00D30000, 0x00D30000, 0x00D30000, 0x00D30000, 0x00D30000, 0x00D30000, 0x00D30000, 0x00D30000, 0x00D30000, 0x00D30000, 0x00D30000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, D_80244C44_B0B644, 0x23030000, 0x00000001, D_80244E34_B0B834, 0x00000000, 0x00000001, D_80245024_B0BA24, 0x26000000, 0x00000001, D_80245214_B0BC14, 0x00000000, 0x00000001, D_80245404_B0BE04, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x004B0048, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000, 0x00000000, 0x00180018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000, 0x00000000, 0x00220018, 0x00000000, 0x00000000, 0x00000000, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x001A0000, 0x00000000, 0x00170016, 0x00000000, 0x00000000, 0x00000000, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x000E0001, 0x00000000, 0x00180018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000 - -dlabel D_8024571C_B0C11C -.word 0x00000043, 0x00000006, PlaySoundAt, 0x0000005A, 0x00000000, 0x0000012C, 0xFFFFFFBA, 0x00000118, 0x00000043, 0x00000005, func_80240264_B06C64, 0x000000E1, 0xFFFFFFBA, 0x00000118, 0x000000F0, 0x00000043, 0x00000005, func_80240264_B06C64, 0x0000017C, 0xFFFFFFBA, 0x00000118, 0x000000F0, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80245784_B0C184 -.word 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000005, kkj_25_GetEntityPosition, 0xFD050F80, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0xFFFFFFF3, 0x00000005, 0x0000000A, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, kkj_25_SetEntityPositionF, 0xFD050F80, 0xFE363C87, 0xFE363C80, 0xFE363C89, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000005, kkj_25_SetEntityPositionF, 0xFD050F80, 0xFE363C87, 0xFFFFFFEC, 0xFE363C89, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000000, 0x00010000, 0x00000001, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFD050F8A, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00800012, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00800013, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x0080000E, 0x00000043, 0x00000002, PlaySound, 0x000003BC, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x00000001, 0xF24A8280, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFD050F8A, 0x0000000B, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x000007BC, 0x00000057, 0x00000000, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000006, NpcJump0, 0x00000000, 0x0000012C, 0x00000000, 0x00000000, 0x00000014, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000000, 0x0000208B, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000000, 0x000020A0, 0x00000000, 0x00000024, 0x00000002, 0xF971889A, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000001, 0x00000016, 0x00000001, 0x00000002, 0x00000016, 0x00000001, 0x00000003, 0x00000016, 0x00000001, 0x00000007, 0x0000001C, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000200, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C81, 0x00000013, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80245AB0_B0C4B0 -.word 0x00000057, 0x00000054, 0x00000051, 0x0000004E, 0x0000004B, 0x00000048, 0x00000045, 0x00000042, 0x0000003F, 0x0000003C, 0x00000039, 0x00000036, 0x00000033, 0x00000030, 0x0000002D, 0x0000002A, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000002, kkj_25_GetFloorCollider, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x0000000B, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000000, 0x00000000, 0x00000043, 0x00000002, GetPartnerInUse, 0xFE363C80, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C81, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000003, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C81, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000008, 0x00000043, 0x00000001, WaitForPlayerTouchingFloor, 0x00000013, 0x00000000, 0x00000043, 0x00000001, InterruptUsePartner, 0x00000008, 0x00000001, 0x00000005, 0x00000013, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000C, 0x00000002, 0xFE363C80, 0x00000014, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x0000000C, 0x00000002, 0xFE363C85, 0x00000000, 0x00000027, 0x00000002, 0xFE363C85, 0x00000019, 0x00000012, 0x00000000, 0x00000027, 0x00000002, 0xFE363C85, 0xFFFFFFE7, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C83, 0xFFFFFFF6, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFC, 0xF24A7DB4, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFC, 0xFE363C83, 0xFE363C81, 0xFE363C85, 0x0000000C, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000013, 0x00000000, 0x00000003, 0x00000001, 0x00000001, 0x00000057, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00800006, 0x00800002, 0x00000000, 0x0013007C, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x0000015E, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x0000015E, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x000001C2, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24ABE80, 0xF24A5E80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8A80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00800006, 0x00800002, 0x00000000, 0x0013007D, 0x00000046, 0x00000001, D_80245784_B0C184, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFFFFFF6A, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFFFFFF6A, 0x00000000, 0x00000064, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x000000FA, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24AE280, 0xF24A3280, 0x00000043, 0x00000004, SetCamPosA, 0x00000000, 0xFFFFFE20, 0xFFFFFE20, 0x00000043, 0x00000004, SetCamPosB, 0x00000000, 0x00000000, 0x000001E0, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80245F20_B0C920 -.word 0x00000030, 0x00000001, D_80245AB0_B0C4B0, 0x00000026, 0x00000002, 0xFE363C81, 0xF24A7E80, 0x00000024, 0x00000002, 0xFE363C82, 0x00000001, 0x00000005, 0x00000001, 0x00000010, 0x00000031, 0x00000001, 0xFE363C83, 0x00000026, 0x00000002, 0xFE363C80, 0x00000000, 0x00000056, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x0000002D, 0x00000002, 0xFE363C80, 0xFE363C81, 0x00000043, 0x00000005, TranslateGroup, 0xFE363C83, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x0000002C, 0x00000002, 0xFE363C80, 0xFE363C81, 0x00000043, 0x00000005, TranslateGroup, 0xFE363C83, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x0000002C, 0x00000002, 0xFE363C80, 0xFE363C81, 0x00000043, 0x00000005, TranslateGroup, 0xFE363C83, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x0000002D, 0x00000002, 0xFE363C80, 0xFE363C81, 0x00000043, 0x00000005, TranslateGroup, 0xFE363C83, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x0000000C, 0x00000002, 0xFE363C82, 0x00000008, 0x0000002C, 0x00000002, 0xFE363C81, 0xF24A7C80, 0x00000012, 0x00000000, 0x0000002D, 0x00000002, 0xFE363C81, 0xF24A7C80, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C82, 0x00000001, 0x00000008, 0x00000001, 0x00000003, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80246128_B0CB28 -.word 0x00000005, 0x00000001, 0x00000004, 0x00000044, 0x00000001, D_80245F20_B0C920, 0x00000008, 0x00000001, 0x00000019, 0x00000006, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000024, 0x00000002, 0xFD050F8A, 0x0000000B, 0x00000057, 0x00000000, 0x00000030, 0x00000001, D_80245AB0_B0C4B0, 0x00000024, 0x00000002, 0xFE363C82, 0x00000023, 0x00000024, 0x00000002, 0xFE363C85, 0xFFFFFFF1, 0x00000005, 0x00000001, 0x00000010, 0x00000043, 0x00000006, PlaySoundAt, 0xB000001B, 0x00000000, 0xFE363C85, 0x00000000, 0x00000000, 0x00000027, 0x00000002, 0xFE363C85, 0xFFFFFFE2, 0x00000031, 0x00000001, 0xFE363C83, 0x00000056, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0xFFFFFFE7, 0x00000005, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateGroup, 0xFE363C83, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0xFFFFFFE7, 0xFFFFFC18, 0xFE363C82, 0x00000002, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateGroup, 0xFE363C83, 0x00000000, 0xFE363C80, 0x00000000, 0x00000027, 0x00000002, 0xFE363C84, 0xFFFFFFEC, 0x00000043, 0x00000006, RotateGroup, 0xFE363C83, 0xFE363C84, 0x00000000, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000003, EnableGroup, 0xFE363C83, 0x00000000, 0x00000057, 0x00000000, 0x00000027, 0x00000002, 0xFE363C82, 0x00000002, 0x00000008, 0x00000001, 0x00000005, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80246394_B0CD94 -.word 0x000000E6, 0x000000A0, 0x00000000, 0x0000015E, 0x000000A0, 0x0000005A, 0x000001A4, 0x000000A0, 0x0000000A, 0x00000118, 0x000000A0, 0xFFFFFFF6 - -dlabel D_802463C4_B0CDC4 -.word 0x0000014A, 0x000000A0, 0x00000032, 0x00000168, 0x000000A0, 0xFFFFFFCE, 0x00000172, 0x000000A0, 0x00000032, 0x0000014A, 0x000000A0, 0xFFFFFFCE, 0x00000024, 0x00000002, 0xF971889A, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFFFFFF6A, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFFFFFF6A, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x000003E8, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24AAA80, 0xF24A6680, 0x00000043, 0x00000004, SetCamPosA, 0x00000000, 0xFFFFFE20, 0xFFFFFE20, 0x00000043, 0x00000004, SetCamPosB, 0x00000000, 0x00000000, 0x000001E0, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8A80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000056, 0x00000000, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000010E, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x0008000A, 0x00000057, 0x00000000, 0x00000024, 0x00000002, 0xFD050F8A, 0x0000000A, 0x00000046, 0x00000001, D_80246128_B0CB28, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000004, SetPlayerPos, 0x00000064, 0x00000000, 0x00000000, 0x00000043, 0x00000002, PartnerIsFlying, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0x0000003C, 0x0000000A, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0x0000003C, 0x00000000, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, SetNpcYaw, 0xFFFFFFFC, 0x0000005A, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00000106, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0x00000046, 0x00000000, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x0000001E, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x0000014A, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24ABE80, 0xF24A4E80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x0080000E, 0x0080000E, 0x00000000, 0x0013007E, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000001, 0xF24A7E80, 0x00000043, 0x00000005, GetNpcPos, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, NpcJump0, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000C, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000005, GetNpcPos, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, NpcJump0, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000007, 0x00000008, 0x00000001, 0x0000000A, 0x00000057, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x000D000A, 0x000C001E, 0x00000000, 0x0013007F, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000002, 0x00610006, 0x00610004, 0x00000200, 0x00130080, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000005, GetNpcPos, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x000000FA, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24ABE80, 0xF24A5A80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00800002, 0x00000008, 0x00000001, 0x0000000A, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000001, 0x0000005A, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000001, 0x0000010E, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x00610007, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000002, 0x00610007, 0x00610007, 0x00000200, 0x00130081, 0x00000043, 0x00000003, FadeOutMusic, 0x00000000, 0x000005DC, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x00610008, 0x00000043, 0x00000005, GetNpcPos, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFFFFE2, 0x00000043, 0x00000006, PlaySoundAt, 0x0000207A, 0x00000000, 0xFE363C80, 0x00000016, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000013, 0x00000000, 0xFE363C80, 0x00000016, 0x00000000, 0x00000001, 0x00000050, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000050, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x00610004, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000009, SetCamProperties, 0x00000000, 0xF24A8A80, 0x0000012C, 0x00000000, 0x00000000, 0x0000044C, 0xF24A9680, 0xF24A7A80, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000067, 0x00000000, 0x00000008, 0x00000044, 0x00000001, D_8024571C_B0C11C, 0x00000008, 0x00000001, 0x0000001E, 0x00000024, 0x00000002, 0xFD050F8B, 0x00000001, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000B, 0x00000002, 0xFD050F8B, 0x00000001, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x00000190, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24ABE80, 0xF24A5280, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8A80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x0080000D, 0x00000043, 0x00000005, GetNpcPos, 0x00000000, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000056, 0x00000000, 0x00000030, 0x00000001, D_80246394_B0CD94, 0x00000005, 0x00000001, 0x00000004, 0x00000033, 0x00000003, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x0000005E, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000008, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000008, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000030, 0x00000001, D_802463C4_B0CDC4, 0x00000005, 0x00000001, 0x00000004, 0x00000033, 0x00000003, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x0000005E, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000008, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000C, 0x00000006, 0x00000000, 0x00000043, 0x00000004, SetNpcDecoration, 0x00000000, 0x00000000, 0x00000001, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000000, 0x00000223, 0x00000000, 0x00000026, 0x00000002, 0xFE363C80, 0xF24A7E80, 0x00000005, 0x00000001, 0x00000032, 0x0000002C, 0x00000002, 0xFE363C80, 0xF24A7A8B, 0x00000043, 0x00000005, SetNpcScale, 0x00000000, 0xFE363C80, 0xFE363C80, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x0080000E, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00800002, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00800006, 0x00800002, 0x00000000, 0x00130082, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010006, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000032, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x000001F4, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24ABE80, 0xF24A4E80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000008, 0x00000005, 0x00000001, 0x00000004, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x00000004, 0xF24A8280, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x00000002, 0xF24A7E80, 0x00000008, 0x00000001, 0x00000003, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00800004, 0x00000043, 0x00000005, NpcMoveTo, 0x00000000, 0x000000C8, 0x00000000, 0x0000002D, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00800002, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00800006, 0x00800002, 0x00000000, 0x00130083, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, SetNpcVar, 0x00000000, 0x00000000, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80246FFC_B0D9FC -.word 0xF25441CD, 0xF24A55BA, 0xF2490AEE, 0xF2540130, 0xF24A55BA, 0xF24C9B99, 0xF2540130, 0xF24A55BA, 0xF24C9B99, 0xF251850A, 0xF24A55BA, 0xF24F2D36, 0xF251850A, 0xF24A55BA, 0xF24F2D36, 0xF24DF703, 0xF24A55BA, 0xF24F8C10, 0xF24DF703, 0xF24A55BA, 0xF24F8C10, 0xF24B00ED, 0xF24A55BA, 0xF24D8BC5, 0xF24B00ED, 0xF24A55BA, 0xF24D8BC5, 0xF24A057E, 0xF24A55BA, 0xF24A1C0B, 0xF24A057E, 0xF24A55BA, 0xF24A1C0B, 0xF24B7A5C, 0xF24A55BA, 0xF246D884, 0xF24B7A5C, 0xF24A55BA, 0xF246D884, 0xF24EB110, 0xF24A55BA, 0xF2454823, 0xF24EB110, 0xF24A55BA, 0xF2454823, 0xF25228A5, 0xF24A55BA, 0xF2462640, 0xF25228A5, 0xF24A55BA, 0xF2462640, 0xF25441CD, 0xF24A55BA, 0xF2490AEE - -dlabel D_802470D4_B0DAD4 -.word 0x000000B4, 0x0000012C, 0xFFFFFF38, 0x000000FA, 0x00000000, 0xFFFFFF6A, 0x0000010E, 0x0000012C, 0xFFFFFF38, 0x000000C8, 0x00000000, 0xFFFFFF6A, 0x0000015E, 0x0000012C, 0xFFFFFF10, 0x000001F4, 0x00000000, 0xFFFFFF60, 0x00000226, 0x0000012C, 0xFFFFFF10, 0x00000190, 0x00000000, 0xFFFFFF60, 0x000001F4, 0x0000012C, 0xFFFFFFCE, 0x00000226, 0x00000000, 0xFFFFFFCE, 0x00000249, 0x0000012C, 0x00000064, 0x00000217, 0x00000000, 0x00000064, 0x0000005F, 0x0000012C, 0xFFFFFFCE, 0x000000B4, 0x00000000, 0xFFFFFFCE, 0x000000D7, 0x0000012C, 0xFFFFFFCE, 0x00000082, 0x00000000, 0xFFFFFFCE, 0x00000058, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x0000000A, 0x00000002, 0xF8405D7C, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000032, 0x00000043, 0x00000002, PlaySound, 0x0000022C, 0x00000057, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x00000032, 0x00000078, 0x00000001, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x0000002A, 0x00000002, 0xFE363C80, 0x0000000A, 0x00000028, 0x00000002, 0xFE363C82, 0xFE363C80, 0x00000043, 0x00000006, RotateGroup, 0x00000073, 0xFE363C82, 0x00000000, 0x00000001, 0x00000000, 0x00000027, 0x00000002, 0xFE363C83, 0xFE363C80, 0x00000043, 0x00000006, RotateGroup, 0x0000007E, 0xFE363C83, 0x00000000, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000012, 0x00000000, 0x0000000A, 0x00000002, 0xF8405D7D, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000022D, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000005, 0x00000013, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x0000002C, 0x00000002, 0xFE363C82, 0xFE363C80, 0x0000000D, 0x00000002, 0xFE363C82, 0x00000168, 0x0000002D, 0x00000002, 0xFE363C82, 0x00000168, 0x00000013, 0x00000000, 0x00000043, 0x00000006, RotateGroup, 0x00000073, 0xFE363C82, 0x00000000, 0x00000001, 0x00000000, 0x0000002D, 0x00000002, 0xFE363C83, 0xFE363C80, 0x0000000C, 0x00000002, 0xFE363C83, 0xFFFFFE98, 0x0000002C, 0x00000002, 0xFE363C83, 0x00000168, 0x00000013, 0x00000000, 0x00000043, 0x00000006, RotateGroup, 0x0000007E, 0xFE363C83, 0x00000000, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000059, 0x00000000, 0x00000008, 0x00000001, 0x0000002D, 0x00000058, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000030, 0x00000001, D_80246FFC_B0D9FC, 0x00000005, 0x00000001, 0x00000009, 0x00000033, 0x00000003, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000033, 0x00000003, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x0000000F, PlayEffect, 0x0000005E, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000005, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000001, kkj_25_UnkLightningFXFunc, 0x00000008, 0x00000001, 0x00000005, 0x00000006, 0x00000000, 0x00000006, 0x00000000, 0x00000059, 0x00000000, 0x00000058, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000030, 0x00000001, D_802470D4_B0DAD4, 0x00000043, 0x00000003, RandInt, 0x00000007, 0xFE363C86, 0x00000027, 0x00000002, 0xFE363C86, 0x00000001, 0x00000005, 0x00000001, 0xFE363C86, 0x00000033, 0x00000003, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000033, 0x00000003, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000006, 0x00000000, 0x0000000B, 0x00000002, 0xFD050F8B, 0x0000000A, 0x00000043, 0x0000000F, PlayEffect, 0x0000005E, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000001, kkj_25_UnkLightningFXFunc, 0x00000008, 0x00000001, 0x0000001E, 0x00000012, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x0000005E, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000005, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000001, kkj_25_UnkLightningFXFunc, 0x00000008, 0x00000001, 0x0000000F, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000059, 0x00000000, 0x00000058, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000027, 0x00000002, 0xFE363C80, 0x00000014, 0x0000000F, 0x00000002, 0xFE363C80, 0x00000168, 0x00000028, 0x00000002, 0xFE363C80, 0x00000168, 0x00000013, 0x00000000, 0x00000043, 0x00000006, RotateGroup, 0x000000AB, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000059, 0x00000000, 0x00000058, 0x00000000, 0x0000000A, 0x00000002, 0xF8405D7C, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x000000AA, 0x00000001, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x000000FA, 0x00000064, 0x00000001, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, ScaleModel, 0x000000AA, 0xFE363C80, 0x00000001, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x0000000B, 0x00000002, 0xFD050F8B, 0x0000000A, 0x00000024, 0x00000002, 0xFE363C82, 0x000000FA, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x0000005A, 0x00000013, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0xFE363C82, 0x0000005A, 0x0000002D, 0x0000000A, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, ScaleModel, 0x000000AA, 0xFE363C80, 0x00000001, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000005, 0x00000001, 0x0000000F, 0x00000043, 0x00000005, ScaleModel, 0x000000AA, 0xFE363C80, 0x00000001, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x0000005A, 0xFE363C82, 0x0000001E, 0x0000000A, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, ScaleModel, 0x000000AA, 0xFE363C80, 0x00000001, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000006, 0x00000000, 0x00000059, 0x00000000, 0x00000008, 0x00000001, 0x000000B4, 0x00000024, 0x00000002, 0xFD050F8B, 0x00000002, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFD050F8B, 0xFFFFFFFF, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000002, StopSound, 0x0000022D, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kkj/kkj_25/B0E3A0.data.s b/ver/us/asm/data/world/area_kkj/kkj_25/B0E3A0.data.s deleted file mode 100644 index 4a35072d39..0000000000 --- a/ver/us/asm/data/world/area_kkj/kkj_25/B0E3A0.data.s +++ /dev/null @@ -1,9 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802479A0_B0E3A0 -.word 0x43DE8000, 0x42700000, 0x00000000, 0x43F00000, 0x42200000, 0xC1A00000, 0x43FF0000, 0x41C80000, 0x00000000 - -dlabel D_802479C4_B0E3C4 -.word 0x00000043, 0x00000005, GetNpcPos, 0xFE363C88, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0xF24B5280, 0x00000043, 0x0000000F, PlayEffect, 0x0000006B, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xF24A8080, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, GetNpcPos, 0xFE363C88, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0xF24B5280, 0x00000043, 0x00000005, func_80240BA0_B075A0, 0xFE363C8F, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010006, 0x00000043, 0x00000004, SetPlayerPos, 0x00000064, 0x00000000, 0x00000000, 0x00000043, 0x00000002, PartnerIsFlying, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0x0000003C, 0x0000000A, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0x0000003C, 0x00000000, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, SetNpcYaw, 0xFFFFFFFC, 0x0000005A, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00000106, 0x00000043, 0x00000005, SetNpcPos, 0x00000000, 0x000000C8, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00800002, 0x00000043, 0x00000005, SetNpcPos, 0x00000001, 0x000001DB, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x000C001E, 0x00000043, 0x00000005, SetNpcPos, 0x00000002, 0x00000226, 0x0000000A, 0xFFFFFFCE, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x00610004, 0x00000043, 0x00000004, SetNpcDecoration, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000004, SetNpcDecoration, 0x00000000, 0x00000001, 0x00000006, 0x00000024, 0x00000002, 0xFE363C88, 0x00000000, 0x00000044, 0x00000001, D_802479C4_B0E3C4, 0x00000043, 0x00000004, SetCamType, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x00000190, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24ABE80, 0xF24A5280, 0x00000043, 0x00000004, SetCamPosA, 0x00000000, 0x00000000, 0x0000001E, 0x00000043, 0x00000004, SetCamPosB, 0x00000000, 0x00000000, 0x00000014, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000005, GetNpcPos, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8A80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x000000FA, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24ABE80, 0xF24A5480, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8A80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x000D000A, 0x000C001E, 0x00000000, 0x0013008E, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, GetNpcPos, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000014, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x0000015E, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24ABE80, 0xF24A5680, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8A80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000005, NpcMoveTo, 0x00000002, 0x00000208, 0xFFFFFFCE, 0x0000000F, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000001, 0x0000005A, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x0061000B, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000002, 0x00610007, 0x0061000B, 0x00000000, 0x0013008F, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000004, 0x00200002, 0x00000043, 0x00000005, SetNpcPos, 0x00000004, 0x00000352, 0x00000190, 0x00000000, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000004, 0xF24A7A80, 0x00000043, 0x00000006, NpcJump0, 0x00000004, 0x00000212, 0x0000002D, 0xFFFFFFCE, 0x0000001E, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000002, 0x000000E9, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000018, 0x00000003, 0x00000212, 0x0000002D, 0xFFFFFFCE, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0x00000003, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x0061000C, 0x00000043, 0x00000005, SetNpcPos, 0x00000003, 0x00000212, 0x0000000F, 0xFFFFFFCE, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000002, 0xF24A7A80, 0x00000043, 0x00000006, NpcJump1, 0x00000002, 0x0000021C, 0x0000000A, 0xFFFFFFCE, 0x0000001E, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000003, 0xF24A7C1A, 0x00000043, 0x00000006, NpcJump0, 0x00000003, 0x00000221, 0x00000000, 0xFFFFFFE2, 0x00000019, 0x00000043, 0x00000005, GetNpcPos, 0x00000003, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x0000001E, 0x00000024, 0x00000002, 0xFE363C83, 0x00000014, 0x00000024, 0x00000002, 0xFE363C84, 0x00000003, 0x00000043, 0x00000001, func_80240B18_B07518, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x00000043, 0x00000002, PlaySound, 0x000020E5, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000003, 0x00610003, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000004, 0xF24A7C80, 0x00000043, 0x00000006, NpcJump0, 0x00000004, 0x000001BD, 0x0000003C, 0x00000000, 0x0000001E, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000004, 0x0000005A, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000032, 0x00000043, 0x00000005, LoadPath, 0x0000001E, D_802479A0_B0E3A0, 0x00000003, 0x00000001, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, GetNextPathPos, 0x00000043, 0x00000005, SetNpcPos, 0x00000004, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000004, 0x00200001, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000004, 0x0000010E, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000004, 0x00200009, 0x00200001, 0x00000000, 0x00130090, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000004, 0xF24A7A80, 0x00000043, 0x00000006, NpcJump0, 0x00000004, 0x000001EA, 0x00000012, 0x00000000, 0x00000014, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000004, 0x0020001A, 0x00000043, 0x00000005, GetNpcPos, 0x00000001, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000027, 0x00000002, 0xFE363C84, 0x00000014, 0x00000056, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000005, 0x00000001, 0x00000002, 0x00000005, 0x00000001, 0x00000006, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFFFF, 0x00000043, 0x00000005, SetNpcPos, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000006, 0x00000001, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000005, 0x00000001, 0x00000006, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000005, SetNpcPos, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000006, 0x00000001, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x000D0009, 0x000D000B, 0x00000005, 0x00130091, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x000D000B, 0x00000024, 0x00000002, 0xFE363C82, 0x0000000C, 0x00000005, 0x00000001, 0x00000004, 0x00000043, 0x00000005, MakeLerp, 0x0000005A, 0x000001C2, 0xFE363C82, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000027, 0x00000002, 0xFE363C80, 0x0000005A, 0x0000000D, 0x00000002, 0xFE363C80, 0x00000167, 0x00000028, 0x00000002, 0xFE363C80, 0x00000168, 0x00000013, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000001, 0xFE363C80, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000028, 0x00000002, 0xFE363C82, 0x00000002, 0x00000043, 0x0000000F, PlayEffect, 0x00000006, 0x00000001, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x000A0001, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000004, 0x00200001, 0x00000008, 0x00000001, 0x00000014, 0x00000024, 0x00000002, 0xFE363C80, 0xFD050F80, 0x00000043, 0x00000001, func_80240B8C_B0758C, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000003, 0x00610000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000004, 0x0000005A, 0x00000000, 0x00000043, 0x00000004, NpcFaceNpc, 0x00000003, 0x00000002, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000004, 0x00200002, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000003, 0x00610002, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000003, 0xF24A7E80, 0x00000043, 0x00000005, GetNpcPos, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x0000000A, 0x00000028, 0x00000002, 0xFE363C82, 0x00000005, 0x00000043, 0x00000006, NpcJump0, 0x00000003, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000043, 0x00000005, SetNpcPos, 0x00000003, 0x0000012C, 0xFFFFFF9C, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x00610004, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000002, 0x00610006, 0x00610004, 0x00000000, 0x00130092, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, SetNpcVar, 0x00000002, 0x00000000, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 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 deleted file mode 100644 index 38f6874479..0000000000 --- a/ver/us/asm/data/world/area_kkj/kkj_25/B0F280.data.s +++ /dev/null @@ -1,24 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80248880_B0F280 -.word 0x43FF0000, 0x41F00000, 0x00000000, 0x43D70000, 0x41700000, 0x41700000, 0x43AF0000, 0x41A00000, 0x00000000 - -dlabel D_802488A4_B0F2A4 -.word 0x00000005, 0x00000001, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x00000043, 0x00000005, GetNpcPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C82, 0x00000001, 0x00000043, 0x00000005, SetNpcPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000008, 0x00000001, 0x00000002, 0x00000006, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x00000043, 0x00000005, GetNpcPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C82, 0xFFFFFFFF, 0x00000043, 0x00000005, SetNpcPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000008, 0x00000001, 0x00000002, 0x00000006, 0x00000000, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010006, 0x00000043, 0x00000004, SetPlayerPos, 0x00000064, 0x00000000, 0x00000000, 0x00000043, 0x00000002, PartnerIsFlying, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0x0000003C, 0x0000000A, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0x0000003C, 0x00000000, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, SetNpcYaw, 0xFFFFFFFC, 0x0000005A, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00000106, 0x00000043, 0x00000005, GetNpcPos, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000014, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24ABE80, 0xF24A5880, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x0000012C, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000005, GetNpcPos, 0x00000007, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x0000001E, 0x00000024, 0x00000002, 0xFE363C83, 0x00000014, 0x00000024, 0x00000002, 0xFE363C84, 0x00000003, 0x00000043, 0x00000001, func_80240C60_B07660, 0x00000024, 0x00000002, 0xFD050F81, 0xFE363C80, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000001, 0x0000005A, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000001, 0x0000010E, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x000C0000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x000C0026, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x000C0001, 0x000C0026, 0x00000005, 0x0013009C, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000001, 0x0000005A, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000004, 0x00200009, 0x00200001, 0x00000000, 0x0013009D, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, StopSound, 0x0000022D, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000068, 0x00000000, 0x00000008, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000001, 0x0000010E, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x000C0001, 0x000C0026, 0x00000005, 0x0013009E, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000004, 0x00200009, 0x00200001, 0x00000005, 0x0013009F, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x000C0002, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x000D000F, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, LoadPath, 0x00000014, D_80248880_B0F280, 0x00000003, 0x00000001, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, GetNextPathPos, 0x00000043, 0x00000005, SetNpcPos, 0x00000004, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000005, GetNpcPos, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x000000F5, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24ABE80, 0xF24A4E80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A7CE7, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000005, GetNpcPos, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x0000000A, 0x00000043, 0x00000006, PlaySoundAt, 0x00002051, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000022, 0x00000005, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000078, 0x0000002D, 0x00000096, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000096, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000005, 0x0080000E, 0x00000043, 0x00000004, SetNpcDecoration, 0x00000005, 0x00000000, 0x00000001, 0x00000043, 0x00000004, SetNpcDecoration, 0x00000005, 0x00000001, 0x00000006, 0x00000024, 0x00000002, 0xFE363C88, 0x00000005, 0x00000044, 0x00000001, D_802479C4_B0E3C4, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000005, GetNpcPos, 0x00000005, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFFFFCE, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x00000190, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24ABA80, 0xF24A5280, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0xFD050F81, 0x00000043, 0x00000001, func_80240CD4_B076D4, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000005, 0x0080000E, 0x0080000E, 0x00000000, 0x001300A0, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, SetNpcPos, 0x00000004, 0x000001F4, 0x000000C8, 0x00000000, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000004, 0xF24A7A80, 0x00000043, 0x00000006, NpcJump0, 0x00000004, 0x000000CD, 0x0000005A, 0x00000000, 0x00000014, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000004, 0x000000E9, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000005, 0x0080000D, 0x00000043, 0x0000000F, PlayEffect, 0x00000018, 0x00000003, 0x000000CD, 0x0000005A, 0x00000000, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0x00000003, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x00000008, 0xF24A8080, 0x00000057, 0x00000000, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000004, 0xF24A7BB4, 0x00000043, 0x00000006, NpcJump0, 0x00000004, 0x000000C3, 0x000000C8, 0x00000000, 0x00000014, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00000106, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000005, 0x00800002, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000005, 0x0000005A, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000005, 0x0000010E, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000005, 0x0000005A, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000005, 0x00800004, 0x00000043, 0x00000005, GetNpcPos, 0x00000005, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000032, 0x00000043, 0x00000005, NpcMoveTo, 0x00000005, 0xFE363C80, 0xFE363C82, 0x00000032, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000005, 0x00800002, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000007, AdjustCam, 0x00000000, 0xF24A8280, 0x00000000, 0x0000012C, 0xF24ABE80, 0xF24A4680, 0x00000043, 0x0000000F, PlayEffect, 0x00000022, 0x00000005, 0x00000064, 0x0000002D, 0xFFFFFFBE, 0x00000028, 0x00000032, 0x0000002D, 0x00000050, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x00002051, 0x00000008, 0x00000001, 0x0000001E, 0x00000024, 0x00000002, 0xFE363C80, 0x00000008, 0x00000044, 0x00000001, D_802488A4_B0F2A4, 0x00000024, 0x00000002, 0xFE363C80, 0x00000009, 0x00000044, 0x00000001, D_802488A4_B0F2A4, 0x00000024, 0x00000002, 0xFE363C80, 0x0000000A, 0x00000044, 0x00000001, D_802488A4_B0F2A4, 0x00000024, 0x00000002, 0xFE363C80, 0x0000000B, 0x00000044, 0x00000001, D_802488A4_B0F2A4, 0x00000024, 0x00000002, 0xFE363C80, 0x0000000C, 0x00000044, 0x00000001, D_802488A4_B0F2A4, 0x00000024, 0x00000002, 0xFE363C80, 0x0000000D, 0x00000044, 0x00000001, D_802488A4_B0F2A4, 0x00000024, 0x00000002, 0xFE363C80, 0x0000000E, 0x00000044, 0x00000001, D_802488A4_B0F2A4, 0x00000043, 0x00000005, GetNpcPos, 0x00000008, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x0000000F, 0x00000043, 0x00000006, PlaySoundAt, 0xB000001E, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000011, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000A, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000026, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x00000014, 0x0000002C, 0x00000002, 0xFE363C80, 0xF24AAA80, 0x00000043, 0x00000007, func_802CFD30, 0x00000008, 0x00000007, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000010E, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000005A, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, SetPlayerAnimation, 0x0001002A, 0x00000057, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000008, 0x00120002, 0x00120001, 0x00000200, 0x001300A1, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, PlaySoundAt, 0x00000064, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, GetNpcPos, 0x00000009, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x0000000F, 0x00000043, 0x0000000F, PlayEffect, 0x00000011, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000A, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x0000000A, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x0000000F, 0x00000043, 0x0000000F, PlayEffect, 0x00000011, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000A, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x0000000B, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x0000000F, 0x00000043, 0x0000000F, PlayEffect, 0x00000011, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000A, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x0000000C, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x0000000F, 0x00000043, 0x0000000F, PlayEffect, 0x00000011, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000A, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x0000000D, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x0000000F, 0x00000043, 0x0000000F, PlayEffect, 0x00000011, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000A, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x0000000E, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x0000000F, 0x00000043, 0x0000000F, PlayEffect, 0x00000011, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000A, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000026, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x00000014, 0x0000002C, 0x00000002, 0xFE363C80, 0xF24AAA80, 0x00000043, 0x00000007, func_802CFD30, 0x00000009, 0x00000007, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000007, func_802CFD30, 0x0000000A, 0x00000007, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000007, func_802CFD30, 0x0000000B, 0x00000007, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000007, func_802CFD30, 0x0000000C, 0x00000007, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000007, func_802CFD30, 0x0000000D, 0x00000007, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000007, func_802CFD30, 0x0000000E, 0x00000007, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000007, func_802CFD30, 0x00000008, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000007, func_802CFD30, 0x00000009, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000007, func_802CFD30, 0x0000000A, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000007, func_802CFD30, 0x0000000B, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000007, func_802CFD30, 0x0000000C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000007, func_802CFD30, 0x0000000D, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000007, func_802CFD30, 0x0000000E, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000004, 0xF24A7A80, 0x00000043, 0x00000006, NpcJump0, 0x00000004, 0x0000008C, 0x00000041, 0x0000001E, 0x00000014, 0x00000043, 0x00000005, GetNpcPos, 0x00000008, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x0000000F, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x000000FA, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24ABE80, 0xF24A5880, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A7DB4, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000004, 0x00200009, 0x00200001, 0x00000000, 0x001300A2, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000008, 0x00120002, 0x00120001, 0x00000200, 0x001300A3, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x0000015E, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24ABE80, 0xF24A5280, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8A80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000008, 0x00120002, 0x00120001, 0x00000200, 0x001300A4, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010029, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, SetPlayerAnimation, 0x0001002A, 0x00000008, 0x00000001, 0x00000005, 0x00000056, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000008, 0x00400000, 0x00000000, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000008, 0xF24A874D, 0x00000043, 0x00000005, GetNpcPos, 0x00000008, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000043, 0x00000006, NpcJump0, 0x00000008, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000005, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000014, 0x00000043, 0x00000006, PlaySoundAt, 0xB000001F, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000011, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000A, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000009, 0x00400000, 0x00000000, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000009, 0xF24A874D, 0x00000043, 0x00000005, GetNpcPos, 0x00000009, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000043, 0x00000006, NpcJump0, 0x00000009, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000005, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000015, 0x00000043, 0x00000004, SetNpcFlagBits, 0x0000000A, 0x00400000, 0x00000000, 0x00000043, 0x00000003, SetNpcJumpscale, 0x0000000A, 0xF24A874D, 0x00000043, 0x00000005, GetNpcPos, 0x0000000A, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000043, 0x00000006, NpcJump0, 0x0000000A, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000005, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000016, 0x00000043, 0x00000004, SetNpcFlagBits, 0x0000000B, 0x00400000, 0x00000000, 0x00000043, 0x00000003, SetNpcJumpscale, 0x0000000B, 0xF24A874D, 0x00000043, 0x00000005, GetNpcPos, 0x0000000B, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000043, 0x00000006, NpcJump0, 0x0000000B, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000005, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000004, SetNpcFlagBits, 0x0000000C, 0x00400000, 0x00000000, 0x00000043, 0x00000003, SetNpcJumpscale, 0x0000000C, 0xF24A874D, 0x00000043, 0x00000005, GetNpcPos, 0x0000000C, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000043, 0x00000006, NpcJump0, 0x0000000C, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000005, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000015, 0x00000043, 0x00000004, SetNpcFlagBits, 0x0000000D, 0x00400000, 0x00000000, 0x00000043, 0x00000003, SetNpcJumpscale, 0x0000000D, 0xF24A874D, 0x00000043, 0x00000005, GetNpcPos, 0x0000000D, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000043, 0x00000006, NpcJump0, 0x0000000D, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000005, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000016, 0x00000043, 0x00000004, SetNpcFlagBits, 0x0000000E, 0x00400000, 0x00000000, 0x00000043, 0x00000003, SetNpcJumpscale, 0x0000000E, 0xF24A874D, 0x00000043, 0x00000005, GetNpcPos, 0x0000000E, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000043, 0x00000006, NpcJump0, 0x0000000E, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000005, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000017, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000004, 0x00400000, 0x00000000, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000004, 0xF24A874D, 0x00000043, 0x00000005, GetNpcPos, 0x00000004, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000043, 0x00000006, NpcJump0, 0x00000004, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000005, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000033, 0x00000002, 0x00000064, 0x0000001C, 0x0000000A, 0xF24A85B4, 0x00000064, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000212D, 0x00000008, 0x00000001, 0x00000073, 0x00000027, 0x00000002, 0xFE363C81, 0x00000014, 0x00000043, 0x00000006, PlaySoundAt, 0x00000188, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000052, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xF24A7BB4, 0x0000001E, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000006, PlaySoundAt, 0xB000001F, 0x00000000, 0x0000006E, 0x00000014, 0x00000003, 0x00000043, 0x0000000F, PlayEffect, 0x00000011, 0x00000000, 0x0000006E, 0x00000014, 0x00000003, 0x0000000A, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000006, PlaySoundAt, 0xB000001F, 0x00000000, 0x00000064, 0x00000014, 0x00000003, 0x00000043, 0x0000000F, PlayEffect, 0x00000011, 0x00000000, 0x00000064, 0x00000014, 0x00000003, 0x0000000F, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000006, PlaySoundAt, 0xB000001F, 0x00000000, 0x0000005A, 0x00000014, 0x00000003, 0x00000043, 0x0000000F, PlayEffect, 0x00000011, 0x00000000, 0x0000005A, 0x00000014, 0x00000003, 0x00000014, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000006, PlaySoundAt, 0xB000001F, 0x00000000, 0x0000006E, 0x00000014, 0x00000003, 0x00000043, 0x0000000F, PlayEffect, 0x00000011, 0x00000000, 0x0000006E, 0x00000014, 0x00000003, 0x00000019, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, SetPlayerAnimation, 0x0001001F, 0x00000005, 0x00000001, 0x00000003, 0x00000043, 0x00000006, PlaySoundAt, 0xB000001F, 0x00000000, 0x00000064, 0x00000014, 0x00000003, 0x00000043, 0x0000000F, PlayEffect, 0x00000011, 0x00000000, 0x00000064, 0x00000014, 0x00000003, 0x0000001E, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000006, PlaySoundAt, 0xB000001F, 0x00000000, 0x0000005A, 0x00000014, 0x00000003, 0x00000043, 0x0000000F, PlayEffect, 0x00000011, 0x00000000, 0x0000005A, 0x00000014, 0x00000003, 0x0000001E, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000006, PlaySoundAt, 0xB000001F, 0x00000000, 0x0000006E, 0x00000014, 0x00000003, 0x00000043, 0x0000000F, PlayEffect, 0x00000011, 0x00000000, 0x0000006E, 0x00000014, 0x00000003, 0x0000001E, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000006, 0x00000006, 0x00000000, 0x00000043, 0x00000001, func_80240CE8_B076E8, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D0199, 0x000000A0, 0x00000028, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010006, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x0000002D, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x000001C2, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24ABE80, 0xF24A5280, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8E80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000056, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000005, 0x00800006, 0x00800002, 0x00000000, 0x001300A5, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000005, 0x0000010E, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000043, 0x00000003, FadeOutMusic, 0x00000000, 0x000001F4, 0x00000008, 0x00000001, 0x00000014, 0x00000056, 0x00000000, 0x00000043, 0x00000002, SetPlayerJumpscale, 0xF24A7C80, 0x00000043, 0x00000005, PlayerJump, 0x00000064, 0x00000000, 0x00000000, 0x00000014, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFC, 0xF24A7C80, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000057, 0x00000000, 0x00000043, 0x00000004, SetNpcVar, 0x00000005, 0x00000000, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x004B0048, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000, 0x00000000, 0x00180018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000, 0x00000000, 0x00220018, 0x00000000, 0x00000000, 0x00000000, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x001A0000, 0x00000000, 0x00170016, 0x00000000, 0x00000000, 0x00000000, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x000E0001, 0x00000000, 0x00180018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000, 0x00000000, 0x001A0018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000, 0x00000000, 0x00140014, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000, 0x00000000, 0x00160018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000 - -dlabel D_8024A9C0_B113C0 -.word 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00180018, D_8024A9C0_B113C0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000 - -dlabel D_8024A9FC_B113FC -.word 0x00000000, 0x00000000, 0x00000000, 0x0000001E, 0xF24A8680, 0xF24A7E80, 0x000001C2, 0xFFFFFFCE, 0x0000014A, 0x00000028, 0xF24A8A80, 0xF24A8280, 0x00000118, 0xFFFFFF9C, 0x0000015E, 0x00000032, 0xF24A8E80, 0xF24A8280, 0x00000050, 0xFFFFFF38, 0xFFFFFFC4, 0x0000001E, 0xF24A8680, 0xF24A7E80, 0x000001F4, 0xFFFFFF38, 0x00000014, 0x0000001E, 0xF24A8680, 0xF24A7E80, 0x0000015E, 0xFFFFFF88, 0x0000015E, 0x00000032, 0xF24A8E80, 0xF24A8280 - -dlabel D_8024AA8C_B1148C -.word 0x00000005, 0x00000001, 0x00000000, 0x0000000D, 0x00000002, 0xFD050F8C, 0x00000000, 0x00000024, 0x00000002, 0xFD050F8D, 0xFD050F8C, 0x00000013, 0x00000000, 0x00000014, 0x00000001, 0xFD050F8C, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x00000014, 0xF24A8280, 0x00000024, 0x00000002, 0xFD050F8C, 0xFFFFFFFF, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x00000032, 0xF24A8280, 0x00000024, 0x00000002, 0xFD050F8C, 0xFFFFFFFF, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x00000014, 0xF24A8280, 0x00000024, 0x00000002, 0xFD050F8C, 0xFFFFFFFF, 0x00000016, 0x00000001, 0x00000004, 0x00000030, 0x00000001, D_8024A9FC_B113FC, 0x00000005, 0x00000001, 0x00000007, 0x00000034, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000038, 0x00000002, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000006, PlaySoundAt, 0xB000001C, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000024, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xFE363C84, 0xFE363C83, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x00000014, 0xFE363C85, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xFD050F8C, 0xFFFFFFFF, 0x00000016, 0x00000001, 0x00000005, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x00000014, 0xF24A7E80, 0x00000024, 0x00000002, 0xFD050F8C, 0xFFFFFFFF, 0x00000016, 0x00000001, 0x00000006, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x00000014, 0xF24A7E80, 0x00000024, 0x00000002, 0xFD050F8C, 0xFFFFFFFF, 0x00000016, 0x00000001, 0x00000007, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x0000001E, 0xF24A8680, 0x00000024, 0x00000002, 0xFD050F8C, 0xFFFFFFFF, 0x00000016, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x00000064, 0xF24A8280, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0xFD050F8D, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x0000001E, 0xF24A7D4D, 0x00000008, 0x00000001, 0x00000001, 0x0000000B, 0x00000002, 0xFE363C80, 0xFD050F8D, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000024, 0x00000002, 0xFD050F8C, 0x00000000, 0x00000023, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -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, 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_kkj/kkj_26/B13150.data.s b/ver/us/asm/data/world/area_kkj/kkj_26/B13150.data.s deleted file mode 100644 index 3eda77a8a1..0000000000 --- a/ver/us/asm/data/world/area_kkj/kkj_26/B13150.data.s +++ /dev/null @@ -1,18 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240030_B13150 -.word 0x43EC0000, 0x41F00000, 0xC1D00000, 0x42B40000, 0x44070000, 0x41F00000, 0xC1A00000, 0x42B40000, 0x43C80000, 0x41F00000, 0xC1A00000, 0x42B40000, 0x43F18000, 0x41F00000, 0x41000000, 0x42B40000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_802402B8_B133D8, D_80240030_B13150, 0x00000004, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80200000, 0x0019001B, 0x00000024, 0x00000002, 0xFE363C80, 0xF5DE01CE, 0x00000043, 0x00000001, func_80240000_B13120, 0x00000043, 0x00000002, PlaySound, 0x000000DC, 0x00000043, 0x00000004, GotoMapSpecial, 0x80240C30, 0x00000001, 0x0000000C, 0x00000008, 0x00000001, 0x00000064 - -dlabel D_80240100_B13220 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000002, 0x00000024, 0x00000002, 0xFE363C82, 0x00000026, 0x00000024, 0x00000002, 0xFE363C83, 0x00000023, 0x00000024, 0x00000002, 0xFE363C84, 0x00000027, 0x00000024, 0x00000002, 0xFE363C85, 0x00000024, 0x00000044, 0x00000001, 0x80285E9C, 0x00000008, 0x00000001, 0x00000011, 0x00000043, 0x00000003, GotoMap, 0x80240C38, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802401C4_B132E4 -.word 0x00000047, 0x00000005, D_80240100_B13220, 0x00000100, 0x00000002, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802401F0_B13310 -.word 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x00000026, 0x00000024, 0x00000002, 0xFE363C83, 0x00000023, 0x00000024, 0x00000002, 0xFE363C84, 0x00000027, 0x00000024, 0x00000002, 0xFE363C85, 0x00000024, 0x00000046, 0x00000001, 0x80285EC4, 0x00000044, 0x00000001, D_802401C4_B132E4, 0x00000016, 0x00000001, 0x00000001, 0x00000044, 0x00000001, 0x80240640, 0x00000016, 0x00000001, 0x00000002, 0x00000044, 0x00000001, 0x802403E0, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802402B8_B133D8 -.word 0x00000024, 0x00000002, 0xF5DE0329, 0x0000001A, 0x00000043, 0x00000002, SetSpriteShading, 0x0005000A, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000024, 0x00000002, 0xF5DE0180, 0x00000058, 0x00000013, 0x00000000, 0x00000043, 0x00000002, UseDoorSounds, 0x00000005, 0x00000043, 0x00000002, GetDemoState, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000046, 0x00000001, 0x80240B78, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000044, 0x00000001, D_802401F0_B13310, 0x00000008, 0x00000001, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kkj/kkj_26/B13500.data.s b/ver/us/asm/data/world/area_kkj/kkj_26/B13500.data.s deleted file mode 100644 index c116fc48ce..0000000000 --- a/ver/us/asm/data/world/area_kkj/kkj_26/B13500.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802403E0_B13500 -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000073, 0x00000001, 0x00000008, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0x00000000, 0xFFFFFE0C, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000026, 0x00000050, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000023, 0x00000050, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000027, 0x00000050, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000024, 0x00000050, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x00000226, 0x0000001E, 0xFFFFFFEC, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF24D9A80, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24AC080, 0xF24A5280, 0x00000043, 0x00000004, SetCamPosB, 0x00000000, 0xF2536280, 0x00000000, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x00000032, 0x00000043, 0x00000004, func_802D1270, 0x00000226, 0xFFFFFFEC, 0xF24A8280, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x000C0000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, SetPlayerAnimation, 0x000C0026, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFE, 0x000C0001, 0x000C0026, 0x00000005, 0x00140032, 0x00000043, 0x00000003, FadeOutMusic, 0x00000000, 0x00000FA0, 0x00000043, 0x00000003, ResetCam, 0x00000000, 0xF24A7E80, 0x00000046, 0x00000001, 0x802400B0, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000073, 0x00000001, 0x00000008, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000005A, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0x000001F4, 0x00000032, 0x00000000, 0x00000043, 0x00000003, SetNpcYaw, 0xFFFFFFFC, 0x0000005A, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x000001F4, 0x0000001E, 0xFFFFFFEC, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF24F2A80, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24AB680, 0xF24A5E80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8680, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000002, SetPlayerAnimation, 0x000C0000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, SetPlayerAnimation, 0x000C0026, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFE, 0x000C0001, 0x000C0026, 0x00000005, 0x0014015E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x000C0002, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, SetPlayerAnimation, 0x000A0001, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x00200009, 0x00200001, 0x00000005, 0x0014015F, 0x00000043, 0x00000003, PlayerFaceNpc, 0xFFFFFFFC, 0x00000005, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFE, 0x000D0004, 0x000A0001, 0x00000005, 0x00140160, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000004, func_802D1270, 0x000001E0, 0xFFFFFFEC, 0xF24A8280, 0x00000043, 0x00000002, SetPlayerAnimation, 0x000C000B, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000002, 0x00000024, 0x00000002, 0xFE363C82, 0x00000026, 0x00000024, 0x00000002, 0xFE363C83, 0x00000023, 0x00000024, 0x00000002, 0xFE363C84, 0x00000027, 0x00000024, 0x00000002, 0xFE363C85, 0x00000024, 0x00000044, 0x00000001, 0x80285E9C, 0x00000008, 0x00000001, 0x00000011, 0x00000043, 0x00000003, GotoMap, 0x80240C40, 0x0000000A, 0x00000008, 0x00000001, 0x00000064, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kkj/kkj_26/B13A40.data.s b/ver/us/asm/data/world/area_kkj/kkj_26/B13A40.data.s deleted file mode 100644 index 4c4d532061..0000000000 --- a/ver/us/asm/data/world/area_kkj/kkj_26/B13A40.data.s +++ /dev/null @@ -1,9 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240920_B13A40 -.word 0x00000043, 0x00000002, EnableStatusMenu, 0x00000000, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x00000226, 0x0000001E, 0xFFFFFFEC, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF24D9A80, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24AC080, 0xF24A5280, 0x00000043, 0x00000004, SetCamPosB, 0x00000000, 0xF2536280, 0x00000000, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x0000003C, 0x00000043, 0x00000003, DemoJoystickXY, 0x0000000A, 0x00000000, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000003, DemoJoystickXY, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, SetPlayerAnimation, 0x000C0000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, SetPlayerAnimation, 0x000C0026, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, ResetCam, 0x00000000, 0xF24A7E80, 0x0000000A, 0x00000002, 0xF8405B89, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xF8405B89, 0x00000001, 0x00000043, 0x00000004, GotoMapSpecial, 0x80240C48, 0x00000002, 0x00000007, 0x00000008, 0x00000001, 0x0000006E, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240AB8_B13BD8 -.word 0x00000008, 0x00000001, 0x0000000A, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetDemoState, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000002, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x0000000A, 0x00000002, 0xF8405B89, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xF8405B89, 0x00000001, 0x00000043, 0x00000004, GotoMapSpecial, 0x80240C48, 0x00000002, 0x00000007, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000026, 0x00000050, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000023, 0x00000050, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000027, 0x00000050, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000024, 0x00000050, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF8405B89, 0x00000000, 0x00000044, 0x00000001, D_80240AB8_B13BD8, 0x00000044, 0x00000001, D_80240920_B13A40, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_kkj/kkj_27/B14210.data.s b/ver/us/asm/data/world/area_kkj/kkj_27/B14210.data.s deleted file mode 100644 index 389cd73552..0000000000 --- a/ver/us/asm/data/world/area_kkj/kkj_27/B14210.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802404A0_B14210 -.word 0x43D48000, 0x00000000, 0x42200000, 0x00000000, 0xC37A0000, 0x41200000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x802407D4, D_802404A0_B14210, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000014, 0x00000001, 0xF5DE0180, 0x0000001D, 0x00000001, 0xFFFFFF97, 0x0000001D, 0x00000001, 0xFFFFFFB4, 0x0000001D, 0x00000001, 0xFFFFFFF2, 0x0000001D, 0x00000001, 0x00000058, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000073, 0x00000000, 0x00000006, 0x00000020, 0x00000000, 0x0000001D, 0x00000001, 0xFFFFFFCA, 0x0000001D, 0x00000001, 0x00000006, 0x0000001D, 0x00000001, 0x00000026, 0x0000001D, 0x00000001, 0x0000003A, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000074, 0x00000000, 0x00000006, 0x00000020, 0x00000000, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kkj/kkj_27/B14340.data.s b/ver/us/asm/data/world/area_kkj/kkj_27/B14340.data.s deleted file mode 100644 index d3b80dae86..0000000000 --- a/ver/us/asm/data/world/area_kkj/kkj_27/B14340.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802405D0_B14340 -.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, kkj_27_UpdateTexturePanSmooth, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, kkj_27_UpdateTexturePanStepped, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kkj/kkj_27/B143E0.data.s b/ver/us/asm/data/world/area_kkj/kkj_27/B143E0.data.s deleted file mode 100644 index 27a447e5fb..0000000000 --- a/ver/us/asm/data/world/area_kkj/kkj_27/B143E0.data.s +++ /dev/null @@ -1,30 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240670_B143E0 -.word 0xE7000000, 0x00000000, 0xD7000002, 0xFFFFFFFF, 0xE3000A01, 0x00100000, 0xE3000C00, 0x00080000, 0xE3000D01, 0x00000000, 0xE3000F00, 0x00000000, 0xE3001001, 0x00000000, 0xE3001201, 0x00002000, 0xE3001402, 0x00000C00, 0xFA000000, 0x4B1F13FF, 0xFB000000, 0xFF764D00, 0xFC10E5E0, 0x230B1D52, 0xE200001C, 0x0C184B50, 0xD9FDFFFF, 0x00000000, 0xD9FFFFFF, 0x00200404, 0xDF000000, 0x00000000 - -dlabel D_802406F0_B14460 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80241120, 0x00000002, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024074C_B144BC -.word 0x00000047, 0x00000005, D_802406F0_B14460, 0x00080000, 0x00000000, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240778_B144E8 -.word 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_8024074C_B144BC, 0x00000044, 0x00000001, EnterWalk, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0329, 0x0000001A, 0x00000043, 0x00000002, SetSpriteShading, 0x0005000B, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000043, 0x00000003, SetCamLeadPlayer, 0x00000000, 0x00000000, 0x00000044, 0x00000001, D_80241018_B14D88, 0x00000044, 0x00000001, 0x80240500, 0x00000044, 0x00000001, D_80240778_B144E8, 0x00000043, 0x00000003, SetTexPanner, 0x00000020, 0x00000000, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x00000028, 0x00000024, 0x00000002, 0xFE363C84, 0x00000384, 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_802405D0_B14340, 0x00000057, 0x00000000, 0x00000043, 0x00000004, SetModelCustomGfx, 0x00000020, 0x00000000, 0xFFFFFFFF, 0x00000043, 0x00000004, SetCustomGfx, 0x00000000, D_80240670_B143E0, 0x00000000, 0x00000043, 0x00000003, SetTexPanner, 0x00000025, 0x00000000, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x00000028, 0x00000024, 0x00000002, 0xFE363C84, 0x00000384, 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_802405D0_B14340, 0x00000057, 0x00000000, 0x00000043, 0x00000004, SetModelCustomGfx, 0x00000025, 0x00000000, 0xFFFFFFFF, 0x00000043, 0x00000004, SetCustomGfx, 0x00000000, D_80240670_B143E0, 0x00000000, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8680, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240B00_B14870 -.word 0x00000000 - -dlabel D_80240B04_B14874 -.word 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x0000000C, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0x00000008, 0x7FFFFE00, 0x00000056, 0x00000000, 0x00000043, 0x00000006, PlaySoundAt, 0x00000093, 0x00000000, 0xFFFFFF06, 0x00000005, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C89, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0xFFFFFE3E, 0x00000078, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000026, 0x00000002, 0xFE363C82, 0xFE363C80, 0x0000002F, 0x00000002, 0xFE363C82, 0x0000000A, 0x00000043, 0x00000006, RotateGroup, 0x00000035, 0xFE363C82, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000001, func_80240310_B14080, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000006, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0x00000009, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0x0000000B, 0x00000001, 0x00000043, 0x00000005, MakeLerp, 0x00000008, 0x000000FF, 0x00000028, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000002, func_8024041C_B1418C, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000050, 0x00000024, 0x00000002, 0xF8405D61, 0x00000001, 0x00000043, 0x00000003, GotoMap, 0x80241128, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240D40_B14AB0 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000004, PlayerMoveTo, 0xFFFFFF33, 0xFFFFFFF6, 0x0000000F, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000010E, 0x00000005, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, SetPlayerAnimation, 0x000D0013, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x00000007, 0x000000FA, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x000D0014, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, SetPlayerAnimation, 0x000D0015, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x0000000A, 0xF24A7E80, 0x00000046, 0x00000001, D_80240B04_B14874, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240E48_B14BB8 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000004, FacePlayerTowardPoint, 0xFFFFFF22, 0x00000000, 0x00000005, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, SetPlayerAnimation, 0x000D0013, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x00000007, 0x000000FA, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x000D0014, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, SetPlayerAnimation, 0x000D0015, 0x00000008, 0x00000001, 0x0000000A, 0x00000056, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x0020000E, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000A, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000010E, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, SetPlayerAnimation, 0x000C0011, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFE, 0x000C0005, 0x000C0006, 0x00000005, 0x00140048, 0x00000057, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x00000005, 0xF24A7E80, 0x00000046, 0x00000001, D_80240B04_B14874, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241018_B14D88 -.word 0x00000043, 0x00000003, EnableModel, 0x00000006, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000009, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x0000000B, 0x00000000, 0x00000043, 0x00000004, SetModelCustomGfx, 0x00000006, 0x00000001, 0xFFFFFFFF, 0x00000043, 0x00000004, SetModelCustomGfx, 0x00000009, 0x00000001, 0xFFFFFFFF, 0x00000043, 0x00000004, SetModelCustomGfx, 0x0000000B, 0x00000001, 0xFFFFFFFF, 0x00000043, 0x00000004, SetCustomGfxBuilders, 0x00000001, func_80240448_B141B8, 0x00000000, 0x0000000A, 0x00000002, 0xF5DE0180, 0xFFFFFFB4, 0x00000047, 0x00000005, D_80240E48_B14BB8, 0x00000100, 0x00000007, 0x00000001, 0x00000000, 0x00000012, 0x00000000, 0x00000047, 0x00000005, D_80240D40_B14AB0, 0x00000100, 0x00000007, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kkj/kkj_28/B14EA0.data.s b/ver/us/asm/data/world/area_kkj/kkj_28/B14EA0.data.s deleted file mode 100644 index 12e57397b1..0000000000 --- a/ver/us/asm/data/world/area_kkj/kkj_28/B14EA0.data.s +++ /dev/null @@ -1,15 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240000_B14EA0 -.word 0x43A28000, 0x00000000, 0xC1F00000, 0x43870000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80240130_B14FD0, D_80240000_B14EA0, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_80240050_B14EF0 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000002, 0x00000024, 0x00000002, 0xFE363C82, 0x00000095, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFFFF, 0x00000044, 0x00000001, ExitSingleDoor, 0x00000008, 0x00000001, 0x00000011, 0x00000043, 0x00000003, GotoMap, 0x80240200, 0x00000002, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802400F4_B14F94 -.word 0x00000024, 0x00000002, 0xFE363C82, 0x00000095, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFFFF, 0x00000046, 0x00000001, EnterSingleDoor, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240130_B14FD0 -.word 0x00000024, 0x00000002, 0xF5DE0329, 0x0000001A, 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, EnableGroup, 0x000000A8, 0x00000000, 0x00000043, 0x00000002, UseDoorSounds, 0x00000000, 0x00000047, 0x00000005, D_80240050_B14EF0, 0x00000100, 0x00000002, 0x00000001, 0x00000000, 0x00000044, 0x00000001, D_802400F4_B14F94, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kkj/kkj_29/B15120.data.s b/ver/us/asm/data/world/area_kkj/kkj_29/B15120.data.s deleted file mode 100644 index a99befc9b0..0000000000 --- a/ver/us/asm/data/world/area_kkj/kkj_29/B15120.data.s +++ /dev/null @@ -1,15 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240070_B15120 -.word 0x43A28000, 0x00000000, 0xC1F00000, 0x43870000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_8024022C_B152DC, D_80240070_B15120, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0xF5DE01CE, 0x00000043, 0x00000001, func_80240000_B150B0, 0x00000043, 0x00000002, PlaySound, 0x000000DC, 0x00000043, 0x00000004, GotoMapSpecial, 0x80245840, 0x00000003, 0x0000000C, 0x00000008, 0x00000001, 0x00000064 - -dlabel D_80240110_B151C0 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000002, 0x00000024, 0x00000002, 0xFE363C82, 0x00000003, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFFFF, 0x00000044, 0x00000001, ExitSingleDoor, 0x00000008, 0x00000001, 0x00000011, 0x00000043, 0x00000003, GotoMap, 0x80245848, 0x00000002, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802401B4_B15264 -.word 0x0000000A, 0x00000002, 0xF5DE0180, 0x00000026, 0x00000044, 0x00000001, 0x80243C40, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x00000003, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFFFF, 0x00000046, 0x00000001, EnterSingleDoor, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024022C_B152DC -.word 0x00000024, 0x00000002, 0xF5DE0329, 0x0000001A, 0x00000043, 0x00000002, SetSpriteShading, 0xFFFFFFFF, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000043, 0x00000003, SetCamLeadPlayer, 0x00000000, 0x00000000, 0x0000000A, 0x00000002, 0xF5DE0180, 0x00000026, 0x00000043, 0x00000003, MakeNpcs, 0x00000000, 0x80240CD4, 0x00000013, 0x00000000, 0x00000044, 0x00000001, 0x80242A48, 0x0000000C, 0x00000002, 0xF5DE0180, 0x0000005F, 0x00000043, 0x00000003, FadeOutMusic, 0x00000000, 0x000001F4, 0x00000013, 0x00000000, 0x00000043, 0x00000002, UseDoorSounds, 0x00000000, 0x00000047, 0x00000005, D_80240110_B151C0, 0x00000100, 0x00000002, 0x00000001, 0x00000000, 0x00000044, 0x00000001, D_802401B4_B15264, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kkj/kkj_29/B15410.data.s b/ver/us/asm/data/world/area_kkj/kkj_29/B15410.data.s deleted file mode 100644 index c21c5624d4..0000000000 --- a/ver/us/asm/data/world/area_kkj/kkj_29/B15410.data.s +++ /dev/null @@ -1,33 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240360_B15410 -.word 0x00000000, 0x004B0048, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000 - -dlabel D_8024038C_B1543C -.word 0x00000000, 0x00280018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00190000 - -dlabel D_802403B8_B15468 -.word 0x00000000, 0x00240018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x001B0000 - -dlabel D_802403E4_B15494 -.word 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0x00000000, 0xFFFFFFE7, 0x00000043, 0x00000003, SetNpcYaw, 0xFFFFFFFF, 0x0000005A, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240424_B154D4 -.word 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x000000AF, 0x00000000, 0xFFFFFFE7, 0x00000043, 0x00000003, SetNpcYaw, 0xFFFFFFFF, 0x0000010E, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240464_B15514 -.word 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00580003, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0xFFFFFF74, 0x0000001E, 0xFFFFFF74, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802404A4_B15554 -.word 0x00800000, 0x00800002, 0x00800004, 0x00800006, 0x00800007, 0x00800008, 0x0080000D, 0x0080000B, 0xFFFFFFFF - -dlabel D_802404C8_B15578 -.word 0x005A0001, 0x005A0003, 0x005A0006, 0x005A0008, 0x005A0009, 0x005A000B, 0x005A0013, 0xFFFFFFFF - -dlabel D_802404E8_B15598 -.word 0x00580000, 0x00580001, 0x00580003, 0x00580004, 0x00580008, 0x00580017, 0x00580019, 0x0058001A, 0x00580012, 0x00580014, 0xFFFFFFFF - -dlabel D_80240514_B155C4 -.word 0x00000000, D_80240360_B15410, 0x00000000, 0xC3FA0000, 0x00000000, 0x00000D0D, 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, 0x00800002, 0x00800002, 0x00800002, 0x00800002, 0x00800002, 0x00800002, 0x00800002, 0x00800002, 0x00800002, 0x00800002, 0x00800002, 0x00800002, 0x00800002, 0x00800002, 0x00800002, 0x00800002, 0x00000000, 0x00000000, D_802404A4_B15554, 0x00000000, 0x00000001, D_8024038C_B1543C, 0x00000000, 0xC3FA0000, 0x00000000, 0x0000070D, D_80240424_B154D4, 0x00000000, 0x00000000, 0x00000000, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00580001, 0x00580004, 0x00580006, 0x00580006, 0x00580001, 0x00580001, 0x00580010, 0x00580010, 0x0058000C, 0x0058000B, 0x0058000D, 0x00580001, 0x00580001, 0x00580001, 0x00580001, 0x00580001, 0x00000000, 0x00000000, D_802404E8_B15598, 0x00000000, 0x00000002, D_8024038C_B1543C, 0x00000000, 0xC3FA0000, 0x00000000, 0x0000070D, D_80240464_B15514, 0x00000000, 0x00000000, 0x00000000, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00580001, 0x00580004, 0x00580006, 0x00580006, 0x00580001, 0x00580001, 0x00580010, 0x00580010, 0x0058000C, 0x0058000B, 0x0058000D, 0x00580001, 0x00580001, 0x00580001, 0x00580001, 0x00580001, 0x00000000, 0x00000000, D_802404E8_B15598, 0x00000000, 0x00000003, D_802403B8_B15468, 0x00000000, 0xC3FA0000, 0x00000000, 0x0000070D, D_802403E4_B15494, 0x00000000, 0x00000000, 0x00000000, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x005A0002, 0x005A0004, 0x005A0007, 0x005A0007, 0x005A0002, 0x005A0002, 0x005A000E, 0x005A000E, 0x005A0018, 0x005A0019, 0x005A0002, 0x005A0002, 0x005A0002, 0x005A0002, 0x005A0002, 0x005A0002, 0x00000000, 0x00000000, D_802404C8_B15578, 0x00000000, 0x00000004, D_80240514_B155C4, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kkj/kkj_29/B15DA0.data.s b/ver/us/asm/data/world/area_kkj/kkj_29/B15DA0.data.s deleted file mode 100644 index 700997c765..0000000000 --- a/ver/us/asm/data/world/area_kkj/kkj_29/B15DA0.data.s +++ /dev/null @@ -1,99 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240CF0_B15DA0 -.word 0x00000043, 0x00000003, SetNpcAnimation, 0xFE363C81, 0x0058001B, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000043, 0x00000005, GetNpcPos, 0xFE363C81, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000027, 0x00000002, 0xFE363C86, 0x00000028, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C8A, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C80, 0x00000043, 0x00000002, PlaySound, 0x000000D2, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0xFE363C82, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C8B, 0x00000043, 0x00000003, SetNpcAnimation, 0xFE363C81, 0x00580003, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240DD0_B15E80 -.word 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFFFFFEF7, 0x00000000, 0xFFFFFF74, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFFFFFEF7, 0x00000000, 0xFFFFFF74, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF250BA80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240E58_B15F08 -.word 0x00000014, 0x00000001, 0xF70F2E86, 0x00000016, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF70F2E87, 0x00000002, 0x00000027, 0x00000002, 0xF70F2E88, 0x00000001, 0x00000012, 0x00000000, 0x0000000D, 0x00000002, 0xF70F2E88, 0x00000000, 0x00000028, 0x00000002, 0xF70F2E88, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000016, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xF70F2E87, 0x00000002, 0x00000027, 0x00000002, 0xF70F2E89, 0x00000001, 0x00000012, 0x00000000, 0x0000000D, 0x00000002, 0xF70F2E89, 0x00000000, 0x00000028, 0x00000002, 0xF70F2E89, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000016, 0x00000001, 0x00000002, 0x0000000A, 0x00000002, 0xF70F2E87, 0x00000002, 0x00000027, 0x00000002, 0xF70F2E8A, 0x00000001, 0x00000012, 0x00000000, 0x0000000D, 0x00000002, 0xF70F2E8A, 0x00000000, 0x00000028, 0x00000002, 0xF70F2E8A, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240FA8_B16058 -.word 0x00000043, 0x00000002, PlaySound, 0x0000008E, 0x00000043, 0x00000001, func_80240030_B150E0, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x0000000E, 0x00000002, 0xF70F2E88, 0xF70F2E89, 0x00000024, 0x00000002, 0xF70F2E86, 0x00000000, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0xF70F2E88, 0x00000028, 0x00000002, 0xFE363C80, 0x00000001, 0x0000000C, 0x00000002, 0xF70F2E8A, 0xFE363C80, 0x00000024, 0x00000002, 0xF70F2E86, 0x00000002, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xF70F2E86, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xF70F2E86, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000002, StopSound, 0x0000008E, 0x00000024, 0x00000002, 0xF70F2E87, 0x00000001, 0x00000014, 0x00000001, 0xF70F2E86, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000001, 0x0000008D, 0x00000000, 0x00000043, 0x00000005, EndSpeech, 0x00000003, 0x005A000B, 0x005A0003, 0x00000005, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000003, 0x005A000B, 0x005A0003, 0x00000005, 0x001400FA, 0x00000043, 0x00000005, GetNpcPos, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000003, PlaySoundAtPlayer, 0x0000008D, 0x00000000, 0x00000043, 0x00000005, EndSpeech, 0x00000003, 0x005A000B, 0x005A0003, 0x00000005, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000003, 0x005A000B, 0x005A0003, 0x00000005, 0x001400F9, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000002, 0x0000008D, 0x00000000, 0x00000043, 0x00000005, EndSpeech, 0x00000003, 0x005A000B, 0x005A0003, 0x00000005, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000003, 0x005A000B, 0x005A0003, 0x00000005, 0x001400FB, 0x00000043, 0x00000005, GetNpcPos, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000023, 0x00000000, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF24E6280, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24ABE80, 0xF24A4A80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8E80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802412D8_B16388 -.word 0x00000043, 0x00000002, PlaySound, 0x0000008C, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000003, 0x005A000B, 0x005A0003, 0x00000005, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C82, 0x00000046, 0x00000001, D_80240FA8_B16058, 0x00000014, 0x00000001, 0xF70F2E86, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x00580003, 0x00580003, 0x00000005, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C85, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000002, ShowChoice, 0xFE363C84, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000002, 0x00580003, 0x00580003, 0x00000005, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C85, 0x00000023, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0xFE363C85, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000043, 0x00000002, PlaySound, 0x0000008A, 0x00000024, 0x00000002, 0xF70F2E87, 0x00000002, 0x00000046, 0x00000001, D_80240E58_B15F08, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000003, 0x005A000B, 0x005A0003, 0x00000005, 0x00140110, 0x00000012, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000021D, 0x00000043, 0x00000002, PlaySound, 0x0000008B, 0x00000024, 0x00000002, 0xF70F2E87, 0x00000003, 0x00000046, 0x00000001, D_80240E58_B15F08, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000003, 0x005A000B, 0x005A0003, 0x00000005, 0xFE363C86, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000024, 0x00000002, 0xF70F2E87, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000046, 0x00000001, D_80240DD0_B15E80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802414E8_B16598 -.word 0x00000043, 0x00000003, SetTexPanner, 0x0000000D, 0x00000001, 0x00000043, 0x00000003, SetTexPanner, 0x0000002E, 0x00000001, 0x00000043, 0x00000003, SetTexPanner, 0x0000004F, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000027, 0x00000002, 0xFE363C80, 0x00008000, 0x00000043, 0x00000005, SetTexPanOffset, 0x00000001, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241590_B16640 -.word 0x00000043, 0x00000003, SetTexPanner, 0x0000000E, 0x00000002, 0x00000043, 0x00000003, EnableTexPanning, 0x0000000E, 0x00000000, 0x00000043, 0x00000003, SetTexPanner, 0x0000002F, 0x00000002, 0x00000043, 0x00000003, EnableTexPanning, 0x0000002F, 0x00000000, 0x00000043, 0x00000003, SetTexPanner, 0x00000050, 0x00000002, 0x00000043, 0x00000003, EnableTexPanning, 0x00000050, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000027, 0x00000002, 0xFE363C80, 0x00008000, 0x00000043, 0x00000005, SetTexPanOffset, 0x00000002, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241674_B16724 -.word 0x00000043, 0x00000003, SetTexPanner, 0x0000000F, 0x00000003, 0x00000043, 0x00000003, EnableTexPanning, 0x0000000F, 0x00000000, 0x00000043, 0x00000003, SetTexPanner, 0x00000030, 0x00000003, 0x00000043, 0x00000003, EnableTexPanning, 0x00000030, 0x00000000, 0x00000043, 0x00000003, SetTexPanner, 0x00000051, 0x00000003, 0x00000043, 0x00000003, EnableTexPanning, 0x00000051, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000027, 0x00000002, 0xFE363C80, 0x00004000, 0x00000043, 0x00000005, SetTexPanOffset, 0x00000003, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000004, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241758_B16808 -.word 0x00000043, 0x00000003, SetTexPanner, 0x00000010, 0x00000004, 0x00000043, 0x00000003, EnableTexPanning, 0x00000010, 0x00000000, 0x00000043, 0x00000003, SetTexPanner, 0x00000031, 0x00000004, 0x00000043, 0x00000003, EnableTexPanning, 0x00000031, 0x00000000, 0x00000043, 0x00000003, SetTexPanner, 0x00000052, 0x00000004, 0x00000043, 0x00000003, EnableTexPanning, 0x00000052, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000027, 0x00000002, 0xFE363C80, 0x00004000, 0x00000043, 0x00000005, SetTexPanOffset, 0x00000004, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024183C_B168EC -.word 0x00000043, 0x00000003, SetTexPanner, 0x00000015, 0x00000005, 0x00000043, 0x00000003, EnableTexPanning, 0x00000015, 0x00000000, 0x00000043, 0x00000003, SetTexPanner, 0x00000036, 0x00000005, 0x00000043, 0x00000003, EnableTexPanning, 0x00000036, 0x00000000, 0x00000043, 0x00000003, SetTexPanner, 0x00000057, 0x00000005, 0x00000043, 0x00000003, EnableTexPanning, 0x00000057, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000027, 0x00000002, 0xFE363C80, 0x00008000, 0x00000043, 0x00000005, SetTexPanOffset, 0x00000005, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000004, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241920_B169D0 -.word 0x00000043, 0x00000003, SetTexPanner, 0x00000012, 0x00000006, 0x00000043, 0x00000003, EnableTexPanning, 0x00000012, 0x00000000, 0x00000043, 0x00000003, SetTexPanner, 0x00000033, 0x00000006, 0x00000043, 0x00000003, EnableTexPanning, 0x00000033, 0x00000000, 0x00000043, 0x00000003, SetTexPanner, 0x00000054, 0x00000006, 0x00000043, 0x00000003, EnableTexPanning, 0x00000054, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFFB800, 0x00000043, 0x00000005, SetTexPanOffset, 0x00000006, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241A04_B16AB4 -.word 0x00000014, 0x00000001, 0xF70F2E86, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00580003, 0x00000043, 0x00000003, EnableTexPanning, 0x00000010, 0x00000000, 0x00000043, 0x00000003, EnableTexPanning, 0x00000015, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000015, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000014, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x00000012, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000012, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000011, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x0000000E, 0x00000000, 0x00000043, 0x00000003, EnableTexPanning, 0x0000000F, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x0000001B, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x0000001C, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x0000001A, 0x00000001, 0x00000024, 0x00000002, 0xFE363C82, 0x00000019, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00200001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x000C0014, 0x00000043, 0x00000003, EnableTexPanning, 0x00000031, 0x00000000, 0x00000043, 0x00000003, EnableTexPanning, 0x00000036, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000036, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000035, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x00000033, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000033, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000032, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x0000002F, 0x00000000, 0x00000043, 0x00000003, EnableTexPanning, 0x00000030, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x0000003D, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x0000003C, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x0000003B, 0x00000001, 0x00000024, 0x00000002, 0xFE363C82, 0x0000003A, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x00580003, 0x00000043, 0x00000003, EnableTexPanning, 0x00000052, 0x00000000, 0x00000043, 0x00000003, EnableTexPanning, 0x00000057, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000057, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000056, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x00000054, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000054, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000053, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x00000050, 0x00000000, 0x00000043, 0x00000003, EnableTexPanning, 0x00000051, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x0000005D, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x0000005E, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x0000005C, 0x00000001, 0x00000024, 0x00000002, 0xFE363C82, 0x0000005B, 0x00000023, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x0000005A, 0x00000000, 0x00000004, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateGroup, 0xFE363C82, 0xFE363C80, 0x00000001, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241E20_B16ED0 -.word 0x00000014, 0x00000001, 0xF70F2E86, 0x00000016, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x0000000E, 0x00000024, 0x00000002, 0xFE363C81, 0x0000000F, 0x00000024, 0x00000002, 0xFE363C82, 0x00000019, 0x00000016, 0x00000001, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x0000002F, 0x00000024, 0x00000002, 0xFE363C81, 0x00000030, 0x00000024, 0x00000002, 0xFE363C82, 0x0000003A, 0x00000016, 0x00000001, 0x00000002, 0x00000024, 0x00000002, 0xFE363C80, 0x00000050, 0x00000024, 0x00000002, 0xFE363C81, 0x00000051, 0x00000024, 0x00000002, 0xFE363C82, 0x0000005B, 0x00000023, 0x00000000, 0x00000043, 0x00000003, EnableTexPanning, 0xFE363C80, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0xFE363C81, 0x00000001, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x0000005A, 0x00000004, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateGroup, 0xFE363C82, 0xFE363C80, 0x00000001, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241FA8_B17058 -.word 0x00000014, 0x00000001, 0xF70F2E86, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000003, EnableTexPanning, 0x00000010, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0x00000014, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000015, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x00000015, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0x00000011, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000012, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x00000012, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0x0000001A, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x0000001B, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00580019, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x00000031, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0x00000035, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000036, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x00000036, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0x00000032, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000033, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x00000033, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0x0000003B, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x0000003D, 0x00000001, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x0020000F, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000005, 0x00000001, 0x00000003, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000A, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x000C0016, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000003, EnableTexPanning, 0x00000052, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0x00000056, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000057, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x00000057, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0x00000053, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000054, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x00000054, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0x0000005C, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x0000005D, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x00580019, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802422B8_B17368 -.word 0x00000014, 0x00000001, 0xF70F2E86, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000003, EnableTexPanning, 0x0000000E, 0x00000000, 0x00000043, 0x00000003, EnableTexPanning, 0x0000000F, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x0000001A, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x0000001C, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x0058001A, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x0000002F, 0x00000000, 0x00000043, 0x00000003, EnableTexPanning, 0x00000030, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x0000003B, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x0000003C, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x000C0017, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00200010, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000003, EnableTexPanning, 0x00000050, 0x00000000, 0x00000043, 0x00000003, EnableTexPanning, 0x00000051, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x0000005C, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x0000005E, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x0058001A, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024243C_B174EC -.word 0x00000024, 0x00000002, 0xFE363C80, 0x0000001F, 0x00000005, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetModelTexVariant, 0xFE363C80, 0x00000002, 0x00000027, 0x00000002, 0xFE363C80, 0x00000001, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000040, 0x00000005, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetModelTexVariant, 0xFE363C80, 0x00000002, 0x00000027, 0x00000002, 0xFE363C80, 0x00000001, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000061, 0x00000005, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetModelTexVariant, 0xFE363C80, 0x00000002, 0x00000027, 0x00000002, 0xFE363C80, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242524_B175D4 -.word 0x00000014, 0x00000001, 0xF70F2E86, 0x00000016, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x0000001F, 0x00000024, 0x00000002, 0xFE363C81, 0xF70F2E88, 0x00000016, 0x00000001, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000040, 0x00000024, 0x00000002, 0xFE363C81, 0xF70F2E89, 0x00000016, 0x00000001, 0x00000002, 0x00000024, 0x00000002, 0xFE363C80, 0x00000061, 0x00000024, 0x00000002, 0xFE363C81, 0xF70F2E8A, 0x00000023, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x0000000A, 0x00000028, 0x00000002, 0xFE363C82, 0xFE363C81, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0xFE363C81, 0x00000043, 0x00000003, SetModelTexVariant, 0xFE363C80, 0x00000000, 0x00000027, 0x00000002, 0xFE363C80, 0x00000001, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C82, 0x00000000, 0x00000005, 0x00000001, 0xFE363C82, 0x00000043, 0x00000003, SetModelTexVariant, 0xFE363C80, 0x00000002, 0x00000027, 0x00000002, 0xFE363C80, 0x00000001, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024268C_B1773C -.word 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000024, 0x00000002, 0xFE363C82, 0x00000002, 0x00000024, 0x00000002, 0xFE363C83, 0x00000001, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000014, 0x00000001, 0xF70F2E86, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000003, SetModelTexVariant, 0x00000028, 0xFE363C84, 0x00000043, 0x00000003, SetModelTexVariant, 0x00000027, 0xFE363C83, 0x00000043, 0x00000003, SetModelTexVariant, 0x00000026, 0xFE363C82, 0x00000043, 0x00000003, SetModelTexVariant, 0x00000025, 0xFE363C81, 0x00000043, 0x00000003, SetModelTexVariant, 0x00000024, 0xFE363C80, 0x00000043, 0x00000003, SetModelTexVariant, 0x00000023, 0xFE363C84, 0x00000043, 0x00000003, SetModelTexVariant, 0x00000022, 0xFE363C83, 0x00000043, 0x00000003, SetModelTexVariant, 0x00000021, 0xFE363C82, 0x00000043, 0x00000003, SetModelTexVariant, 0x00000020, 0xFE363C81, 0x00000043, 0x00000003, SetModelTexVariant, 0x0000001F, 0xFE363C80, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000003, SetModelTexVariant, 0x00000049, 0xFE363C84, 0x00000043, 0x00000003, SetModelTexVariant, 0x00000048, 0xFE363C83, 0x00000043, 0x00000003, SetModelTexVariant, 0x00000047, 0xFE363C82, 0x00000043, 0x00000003, SetModelTexVariant, 0x00000046, 0xFE363C81, 0x00000043, 0x00000003, SetModelTexVariant, 0x00000045, 0xFE363C80, 0x00000043, 0x00000003, SetModelTexVariant, 0x00000044, 0xFE363C84, 0x00000043, 0x00000003, SetModelTexVariant, 0x00000043, 0xFE363C83, 0x00000043, 0x00000003, SetModelTexVariant, 0x00000042, 0xFE363C82, 0x00000043, 0x00000003, SetModelTexVariant, 0x00000041, 0xFE363C81, 0x00000043, 0x00000003, SetModelTexVariant, 0x00000040, 0xFE363C80, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000003, SetModelTexVariant, 0x0000006A, 0xFE363C84, 0x00000043, 0x00000003, SetModelTexVariant, 0x00000069, 0xFE363C83, 0x00000043, 0x00000003, SetModelTexVariant, 0x00000068, 0xFE363C82, 0x00000043, 0x00000003, SetModelTexVariant, 0x00000067, 0xFE363C81, 0x00000043, 0x00000003, SetModelTexVariant, 0x00000066, 0xFE363C80, 0x00000043, 0x00000003, SetModelTexVariant, 0x00000065, 0xFE363C84, 0x00000043, 0x00000003, SetModelTexVariant, 0x00000064, 0xFE363C83, 0x00000043, 0x00000003, SetModelTexVariant, 0x00000063, 0xFE363C82, 0x00000043, 0x00000003, SetModelTexVariant, 0x00000062, 0xFE363C81, 0x00000043, 0x00000003, SetModelTexVariant, 0x00000061, 0xFE363C80, 0x00000023, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xF70F2E87, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF70F2E87, 0x00000003, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C84, 0x00000024, 0x00000002, 0xFE363C84, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C83, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C82, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C85, 0x00000006, 0x00000000, 0x00000044, 0x00000001, D_80242524_B175D4, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000044, 0x00000001, D_802414E8_B16598, 0x00000044, 0x00000001, D_80241590_B16640, 0x00000044, 0x00000001, D_80241674_B16724, 0x00000044, 0x00000001, D_80241758_B16808, 0x00000044, 0x00000001, D_8024183C_B168EC, 0x00000044, 0x00000001, D_80241920_B169D0, 0x00000043, 0x00000003, EnableModel, 0x00000012, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000015, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x0000001B, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x0000001C, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000033, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000036, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x0000003C, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x0000003D, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000054, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000057, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x0000005D, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x0000005E, 0x00000000, 0x00000044, 0x00000001, D_8024243C_B174EC, 0x00000003, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0xF70F2E87, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000B, 0x00000002, 0xFE363C80, 0xF70F2E87, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000014, 0x00000001, 0xF70F2E87, 0x00000016, 0x00000001, 0x00000000, 0x00000046, 0x00000001, D_80241A04_B16AB4, 0x00000016, 0x00000001, 0x00000001, 0x00000044, 0x00000001, D_8024268C_B1773C, 0x00000046, 0x00000001, D_80241E20_B16ED0, 0x00000016, 0x00000001, 0x00000002, 0x00000046, 0x00000001, D_80241FA8_B17058, 0x00000016, 0x00000001, 0x00000003, 0x00000046, 0x00000001, D_802422B8_B17368, 0x00000023, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242C84_B17D34 -.word 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000024, 0x00000002, 0xFE363C81, 0xF70F2E88, 0x00000014, 0x00000001, 0xF70F2E89, 0x00000019, 0x00000001, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFFFE, 0x00000024, 0x00000002, 0xFE363C81, 0xF70F2E89, 0x00000016, 0x00000001, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C80, 0x00000003, 0x00000023, 0x00000000, 0x00000014, 0x00000001, 0xF70F2E8A, 0x00000019, 0x00000001, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000016, 0x00000001, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C80, 0x00000003, 0x00000023, 0x00000000, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000001, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFEE8, 0x00000024, 0x00000002, 0xFE363C82, 0xFFFFFEC0, 0x00000016, 0x00000001, 0xFFFFFFFE, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFEF2, 0x00000024, 0x00000002, 0xFE363C82, 0xFFFFFF1A, 0x00000016, 0x00000001, 0x00000002, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFF4C, 0x00000024, 0x00000002, 0xFE363C82, 0xFFFFFF74, 0x00000016, 0x00000001, 0x00000003, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFEF2, 0x00000024, 0x00000002, 0xFE363C82, 0xFFFFFF1A, 0x00000023, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000003, 0x005A0006, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000003, 0x00000200, 0x00000001, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000003, 0xF24A8680, 0x00000043, 0x00000005, NpcMoveTo, 0x00000003, 0xFFFFFE70, 0x00000000, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0x00000003, 0xFE363C81, 0x00000000, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000004, NpcFaceNpc, 0x00000003, 0xFE363C80, 0x00000007, 0x00000013, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000003, 0x00000043, 0x00000005, NpcMoveTo, 0x00000003, 0xFE363C81, 0xFFFFFFC4, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000003, 0x005A0003, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000003, 0x00000200, 0x00000000, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C82, 0x0000001E, 0xFFFFFF74, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C82, 0x0000001E, 0xFFFFFF74, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF24E6280, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8E80, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000007, SpeakToNpc, 0x00000003, 0x005A000B, 0x005A0003, 0x00000000, 0x00000001, 0x0014011B, 0x00000043, 0x00000002, PlaySound, 0x0000008A, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00580019, 0x00000043, 0x00000006, ContinueSpeech, 0x00000003, 0x005A000B, 0x005A0003, 0x00000005, 0x0014011C, 0x00000008, 0x00000001, 0x0000000A, 0x00000024, 0x00000002, 0xFE363C80, 0x000000A2, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000024, 0x00000002, 0xFE363C82, 0x0014011D, 0x00000046, 0x00000001, D_80240CF0_B15DA0, 0x00000008, 0x00000001, 0x0000000A, 0x00000016, 0x00000001, 0xFFFFFFFE, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000003, 0x005A000B, 0x005A0003, 0x00000000, 0x00140121, 0x00000043, 0x00000002, PlaySound, 0x0000008A, 0x00000043, 0x00000002, SetPlayerAnimation, 0x000C0009, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000006, ContinueSpeech, 0x00000003, 0x005A000B, 0x005A0003, 0x00000000, 0x00140122, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, ShowGotItem, 0x000000A2, 0x00000001, 0x00000002, 0x00000024, 0x00000002, 0xF8405D68, 0x00000001, 0x00000008, 0x00000001, 0x0000000A, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000007, SpeakToNpc, 0x00000003, 0x005A000B, 0x005A0003, 0x00000000, 0x00000002, 0x0014011E, 0x00000043, 0x00000002, PlaySound, 0x0000008A, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x00580019, 0x00000043, 0x00000006, ContinueSpeech, 0x00000003, 0x005A000B, 0x005A0003, 0x00000005, 0x0014011F, 0x00000008, 0x00000001, 0x0000000A, 0x00000024, 0x00000002, 0xFE363C80, 0x000000A2, 0x00000024, 0x00000002, 0xFE363C81, 0x00000002, 0x00000024, 0x00000002, 0xFE363C82, 0x00140120, 0x00000046, 0x00000001, D_80240CF0_B15DA0, 0x00000008, 0x00000001, 0x0000000A, 0x00000016, 0x00000001, 0x00000003, 0x0000000A, 0x00000002, 0xF70F2E89, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000003, 0x005A000B, 0x005A0003, 0x00000005, 0x00140124, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000003, 0x005A000B, 0x005A0003, 0x00000005, 0x00140123, 0x00000013, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000008B, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80243274_B18324 -.word 0x43910000, 0x41C80000, 0xC1F00000, 0x439B0000, 0x428C0000, 0xC28C0000, 0x43960000, 0x420C0000, 0xC2DC0000, 0x43910000, 0x42040000, 0xC2DC0000 - -dlabel D_802432A4_B18354 -.word 0x43910000, 0x42040000, 0xC2DC0000, 0x43960000, 0x420C0000, 0xC2DC0000, 0x439B0000, 0x41200000, 0xC28C0000, 0x43700000, 0x41C80000, 0xC1F00000 - -dlabel D_802432D4_B18384 -.word 0x43700000, 0x41C80000, 0xC1F00000, 0x43660000, 0x41A00000, 0xC1F00000, 0x42200000, 0x42A00000, 0xC2700000, 0xC30C0000, 0x43160000, 0xC2C80000, 0xC3340000, 0x43020000, 0xC2C80000, 0xC3430000, 0x42A00000, 0xC2C80000 - -dlabel D_8024331C_B183CC -.word 0xC32F0000, 0x42700000, 0xC2C80000, 0xC3200000, 0x43020000, 0xC2C80000, 0xC2F00000, 0x43160000, 0xC2C80000, 0xC28C0000, 0x43480000, 0xC2C80000 - -dlabel D_8024334C_B183FC -.word 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, GetNextPathPos, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802433C4_B18474 -.word 0x00000043, 0x00000004, SetNpcVar, 0x00000003, 0x00000000, 0x00000001, 0x00000056, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C80, 0x0000001A, 0x00000028, 0x00000002, 0xFE363C82, 0x00000002, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000003, 0x005A0009, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000003, 0xF24A8E80, 0x00000043, 0x00000005, NpcMoveTo, 0x00000003, 0xFE363C80, 0xFE363C82, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000003, 0x005A0003, 0x00000043, 0x00000003, NpcFacePlayer, 0x00000003, 0x00000005, 0x00000043, 0x00000004, SetNpcVar, 0x00000003, 0x00000000, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x0000001A, 0x00000027, 0x00000002, 0xFE363C82, 0x00000002, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00580006, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000001, 0xF24A8E80, 0x00000043, 0x00000005, NpcMoveTo, 0x00000001, 0xFE363C80, 0xFE363C82, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00580001, 0x00000043, 0x00000003, NpcFacePlayer, 0x00000001, 0x00000005, 0x00000057, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000004, GetNpcVar, 0x00000003, 0x00000000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802435D0_B18680 -.word 0x00000056, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000003, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000005, 0x00000043, 0x00000005, NpcMoveTo, 0x00000003, 0xFE363C80, 0xFE363C82, 0x00000005, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000003, 0x005A0013, 0x00000027, 0x00000002, 0xFE363C80, 0x00000005, 0x00000043, 0x00000005, NpcMoveTo, 0x00000003, 0xFE363C80, 0xFE363C82, 0x00000005, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C80, 0x00000005, 0x00000043, 0x00000005, NpcMoveTo, 0x00000001, 0xFE363C80, 0xFE363C82, 0x00000005, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00580012, 0x00000028, 0x00000002, 0xFE363C80, 0x00000005, 0x00000043, 0x00000005, NpcMoveTo, 0x00000001, 0xFE363C80, 0xFE363C82, 0x00000005, 0x00000057, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, SetPlayerAnimation, 0x000C0005, 0x00000008, 0x00000001, 0x00000001, 0x00000005, 0x00000001, 0x00000004, 0x00000027, 0x00000002, 0xFE363C81, 0x00000002, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x000C0018, 0x00000027, 0x00000002, 0xFE363C80, 0x0000000A, 0x00000005, 0x00000001, 0x00000005, 0x00000027, 0x00000002, 0xFE363C81, 0x00000004, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802437F4_B188A4 -.word 0x00000043, 0x00000004, InterpNpcYaw, 0x00000001, 0x0000005A, 0x00000003, 0x00000008, 0x00000001, 0x0000000A, 0x00000056, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000003, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000020, 0x00000027, 0x00000002, 0xFE363C82, 0x00000002, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0x0000001E, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000004, SetNpcVar, 0x00000003, 0x00000000, 0x00000001, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000003, 0x005A0008, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000003, 0xF24A8E80, 0x00000043, 0x00000005, NpcMoveTo, 0x00000003, 0x00000194, 0xFFFFFFE6, 0x00000000, 0x00000043, 0x00000004, SetNpcVar, 0x00000003, 0x00000000, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00580014, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000001, 0xF24A8E80, 0x00000043, 0x00000005, NpcMoveTo, 0x00000001, 0x000001B4, 0xFFFFFFEA, 0x00000000, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80243984_B18A34 -.word 0x00000043, 0x00000004, PlaySoundAtCollider, 0x00000002, 0x000001C1, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x00000078, 0x0000000A, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateModel, 0x00000003, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80243A34_B18AE4 -.word 0x00000043, 0x00000005, MakeLerp, 0x00000078, 0x00000000, 0x0000000A, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateModel, 0x00000003, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x00000002, 0x000001C2, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80243AE4_B18B94 -.word 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x0020000E, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000A, 0x00000043, 0x00000005, LoadPath, 0x00000014, D_80243274_B18324, 0x00000004, 0x00000000, 0x00000046, 0x00000001, D_8024334C_B183FC, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00200002, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80243B80_B18C30 -.word 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x0000000A, ShowSweat, 0x00000000, 0x00000001, 0xFFFFFFD3, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000014, 0x00000008, 0x00000001, 0x00000014, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80243BE0_B18C90 -.word 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x0000000A, ShowSweat, 0xFFFFFFFC, 0x00000001, 0xFFFFFFD3, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000014, 0x00000008, 0x00000001, 0x00000014, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, SetCamLeadPlayer, 0x00000000, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000006, RotateModel, 0x00000003, 0x00000078, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000004, func_802D1270, 0x000000FA, 0xFFFFFFE2, 0xF24A8280, 0x00000046, 0x00000001, D_80243A34_B18AE4, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000044, 0x00000001, D_80243AE4_B18B94, 0x00000056, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x000C0005, 0x00000008, 0x00000001, 0x0000003C, 0x00000043, 0x00000002, SetPlayerAnimation, 0x000A0001, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000001, 0x00000263, 0x00000000, 0x00000043, 0x0000000A, ShowEmote, 0x00000001, 0x00000002, 0xFFFFFFD3, 0x0000000F, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000001, 0x0000005A, 0x00000005, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00580017, 0x00000043, 0x00000006, NpcJump0, 0x00000001, 0x000000AF, 0x00000000, 0xFFFFFFE7, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00580001, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x00580008, 0x00580001, 0x00000000, 0x001400EF, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000003, 0x005A0009, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000003, 0xF24A8E80, 0x00000043, 0x00000005, NpcMoveTo, 0x00000003, 0x00000082, 0xFFFFFFE7, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000003, 0x005A0003, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x000000BE, 0x00000000, 0xFFFFFFE7, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x000000BE, 0x00000000, 0xFFFFFFE7, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF24EC680, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24ABE80, 0xF24A4E80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8E80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000007, SpeakToNpc, 0x00000003, 0x005A000B, 0x005A0003, 0x00000000, 0x00000001, 0x001400F0, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000001, 0x0000010E, 0x00000000, 0x00000043, 0x00000007, SpeakToNpc, 0x00000001, 0x00580008, 0x00580001, 0x00000000, 0x00000003, 0x001400F1, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000003, 0x005A0006, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000003, 0xF24A8280, 0x00000043, 0x00000005, NpcMoveTo, 0x00000003, 0x00000082, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000003, 0x005A0003, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000003, 0x005A000B, 0x005A0003, 0x00000000, 0x001400F2, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000001, 0x0000005A, 0x00000005, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C80, 0x00000028, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00580004, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000001, 0xF24A8280, 0x00000043, 0x00000005, NpcMoveTo, 0x00000001, 0xFE363C80, 0xFE363C82, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x00580008, 0x00580001, 0x00000000, 0x001400F3, 0x00000056, 0x00000000, 0x00000043, 0x00000004, func_802D1270, 0x00000000, 0xFFFFFFE7, 0xF24A8280, 0x00000043, 0x00000002, SetPlayerAnimation, 0x000C0014, 0x00000043, 0x00000004, SetPlayerPos, 0xFFFFFF1A, 0x00000017, 0xFFFFFF74, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0x00000001, 0x00000000, 0xFFFFFFE7, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00580003, 0x00000043, 0x00000005, SetNpcPos, 0x00000001, 0xFFFFFEC0, 0x0000001E, 0xFFFFFF74, 0x00000043, 0x00000003, SetNpcYaw, 0x00000001, 0x0000005A, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000003, 0x005A0006, 0x00000043, 0x00000005, NpcMoveTo, 0x00000003, 0x00000000, 0xFFFFFFE7, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000003, 0x005A0003, 0x00000043, 0x00000005, SetNpcPos, 0x00000003, 0xFFFFFF1A, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetNpcYaw, 0x00000003, 0x0000005A, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000003C, 0x00000043, 0x00000005, LoadPath, 0x00000032, D_802432A4_B18354, 0x00000004, 0x00000000, 0x00000046, 0x00000001, D_8024334C_B183FC, 0x00000045, 0x00000002, D_80243BE0_B18C90, 0xFE363C8A, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x0020000C, 0x0020000C, 0x00000005, 0x001400F4, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFFFFFF1A, 0x00000000, 0xFFFFFF74, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFFFFFF1A, 0x00000000, 0xFFFFFF74, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A7DB4, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00200008, 0x00000043, 0x00000005, LoadPath, 0x00000064, D_802432D4_B18384, 0x00000006, 0x00000000, 0x00000046, 0x00000001, D_8024334C_B183FC, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00200001, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000077, 0x00000000, 0x00000008, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000003, 0x005A000B, 0x005A0003, 0x00000005, 0x001400F5, 0x00000043, 0x00000002, PlaySound, 0x0000008A, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000003, 0x005A000B, 0x005A0003, 0x00000005, 0x001400F6, 0x00000043, 0x00000002, PlaySound, 0x0000008A, 0x00000043, 0x00000002, SetPlayerAnimation, 0x000C0011, 0x00000043, 0x00000003, PlaySoundAtPlayer, 0x00000263, 0x00000000, 0x00000043, 0x0000000A, ShowEmote, 0x00000000, 0x00000002, 0x0000002D, 0x0000000D, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000D, 0x00000043, 0x00000003, PlaySoundAtPlayer, 0x00000263, 0x00000000, 0x00000043, 0x0000000A, ShowEmote, 0x00000000, 0x00000002, 0xFFFFFFD3, 0x0000000D, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000D, 0x00000043, 0x00000003, PlaySoundAtPlayer, 0x00000263, 0x00000000, 0x00000043, 0x0000000A, ShowEmote, 0x00000000, 0x00000002, 0x0000002D, 0x0000000D, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, SetPlayerAnimation, 0x000C0014, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000003, 0x005A0006, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000003, 0x00000200, 0x00000001, 0x00000043, 0x00000005, NpcMoveTo, 0x00000003, 0xFFFFFE75, 0x00000000, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000003, 0x0000005A, 0x00000007, 0x00000043, 0x00000005, NpcMoveTo, 0x00000003, 0xFFFFFE75, 0xFFFFFFE2, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000003, 0x00000200, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000003, 0x005A0003, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFFFFFE75, 0x0000000A, 0xFFFFFFD8, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFFFFFE75, 0x0000000A, 0xFFFFFFD8, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF24EC680, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24ABE80, 0xF24A4E80, 0x00000043, 0x00000004, SetCamPosA, 0x00000000, 0xF244B280, 0xF24B1A80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8A80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000077, 0x00000001, 0x00000008, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000003, 0x005A000B, 0x005A0003, 0x00000005, 0x001400F8, 0x00000046, 0x00000001, D_80240DD0_B15E80, 0x00000024, 0x00000002, 0xF70F2E88, 0x00000000, 0x00000024, 0x00000002, 0xF70F2E89, 0x00000000, 0x00000024, 0x00000002, 0xF70F2E8A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x001400FC, 0x00000024, 0x00000002, 0xFE363C82, 0x00000028, 0x00000024, 0x00000002, 0xFE363C83, 0x001400FD, 0x00000024, 0x00000002, 0xFE363C84, 0x001E002C, 0x00000024, 0x00000002, 0xFE363C85, 0x00000001, 0x00000024, 0x00000002, 0xFE363C86, 0x00140111, 0x00000046, 0x00000001, D_802412D8_B16388, 0x00000024, 0x00000002, 0xFE363C81, 0x001400FE, 0x00000024, 0x00000002, 0xFE363C82, 0x0000000A, 0x00000024, 0x00000002, 0xFE363C83, 0x001400FF, 0x00000024, 0x00000002, 0xFE363C84, 0x001E002D, 0x00000024, 0x00000002, 0xFE363C85, 0x00000000, 0x00000024, 0x00000002, 0xFE363C86, 0x00140112, 0x00000046, 0x00000001, D_802412D8_B16388, 0x00000024, 0x00000002, 0xFE363C81, 0x00140100, 0x00000024, 0x00000002, 0xFE363C82, 0x0000003C, 0x00000024, 0x00000002, 0xFE363C83, 0x00140101, 0x00000024, 0x00000002, 0xFE363C84, 0x001E002E, 0x00000024, 0x00000002, 0xFE363C85, 0x00000002, 0x00000024, 0x00000002, 0xFE363C86, 0x00140113, 0x00000046, 0x00000001, D_802412D8_B16388, 0x00000024, 0x00000002, 0xFE363C81, 0x00140102, 0x00000024, 0x00000002, 0xFE363C82, 0x0000000A, 0x00000024, 0x00000002, 0xFE363C83, 0x00140103, 0x00000024, 0x00000002, 0xFE363C84, 0x001E002F, 0x00000024, 0x00000002, 0xFE363C85, 0x00000000, 0x00000024, 0x00000002, 0xFE363C86, 0x00140114, 0x00000046, 0x00000001, D_802412D8_B16388, 0x00000024, 0x00000002, 0xFE363C81, 0x00140104, 0x00000024, 0x00000002, 0xFE363C82, 0x0000001E, 0x00000024, 0x00000002, 0xFE363C83, 0x00140105, 0x00000024, 0x00000002, 0xFE363C84, 0x001E0030, 0x00000024, 0x00000002, 0xFE363C85, 0x00000002, 0x00000024, 0x00000002, 0xFE363C86, 0x00140115, 0x00000046, 0x00000001, D_802412D8_B16388, 0x00000024, 0x00000002, 0xFE363C81, 0x00140106, 0x00000024, 0x00000002, 0xFE363C82, 0x00000014, 0x00000024, 0x00000002, 0xFE363C83, 0x00140107, 0x00000024, 0x00000002, 0xFE363C84, 0x001E0031, 0x00000024, 0x00000002, 0xFE363C85, 0x00000000, 0x00000024, 0x00000002, 0xFE363C86, 0x00140116, 0x00000046, 0x00000001, D_802412D8_B16388, 0x00000024, 0x00000002, 0xFE363C81, 0x00140108, 0x00000024, 0x00000002, 0xFE363C82, 0x0000001E, 0x00000024, 0x00000002, 0xFE363C83, 0x00140109, 0x00000024, 0x00000002, 0xFE363C84, 0x001E0032, 0x00000024, 0x00000002, 0xFE363C85, 0x00000001, 0x00000024, 0x00000002, 0xFE363C86, 0x00140117, 0x00000046, 0x00000001, D_802412D8_B16388, 0x00000024, 0x00000002, 0xFE363C81, 0x0014010A, 0x00000024, 0x00000002, 0xFE363C82, 0x0000003C, 0x00000024, 0x00000002, 0xFE363C83, 0x0014010B, 0x00000024, 0x00000002, 0xFE363C84, 0x001E0033, 0x00000024, 0x00000002, 0xFE363C85, 0x00000001, 0x00000024, 0x00000002, 0xFE363C86, 0x00140118, 0x00000046, 0x00000001, D_802412D8_B16388, 0x00000024, 0x00000002, 0xFE363C81, 0x0014010C, 0x00000024, 0x00000002, 0xFE363C82, 0x0000003C, 0x00000024, 0x00000002, 0xFE363C83, 0x0014010D, 0x00000024, 0x00000002, 0xFE363C84, 0x001E0034, 0x00000024, 0x00000002, 0xFE363C85, 0x00000000, 0x00000024, 0x00000002, 0xFE363C86, 0x00140119, 0x00000046, 0x00000001, D_802412D8_B16388, 0x00000024, 0x00000002, 0xFE363C81, 0x0014010E, 0x00000024, 0x00000002, 0xFE363C82, 0x0000001E, 0x00000024, 0x00000002, 0xFE363C83, 0x0014010F, 0x00000024, 0x00000002, 0xFE363C84, 0x001E0035, 0x00000024, 0x00000002, 0xFE363C85, 0x00000000, 0x00000024, 0x00000002, 0xFE363C86, 0x0014011A, 0x00000046, 0x00000001, D_802412D8_B16388, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000074, 0x00000000, 0x00000008, 0x00000046, 0x00000001, D_80242C84_B17D34, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFFFFFF1A, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF24F2A80, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24ABE80, 0xF24A4680, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A7C80, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000003, 0x005A0006, 0x00000043, 0x00000005, NpcMoveTo, 0x00000003, 0xFFFFFF1A, 0x00000000, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000003, 0x0000005A, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000003, 0x005A0003, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000077, 0x00000002, 0x00000008, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000003, 0x005A000B, 0x005A0003, 0x00000000, 0x00140125, 0x00000043, 0x00000004, SetNpcVar, 0x00000003, 0x00000000, 0x00000001, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000004, PlayerMoveTo, 0xFFFFFF47, 0xFFFFFF74, 0x00000014, 0x00000043, 0x00000004, PlayerMoveTo, 0xFFFFFF47, 0x00000000, 0x00000046, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000004, SetNpcVar, 0x00000003, 0x00000000, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000008, NpcFlyTo, 0xFFFFFFFC, 0xFFFFFF60, 0x00000032, 0x00000000, 0x0000005A, 0x00000000, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00580004, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000001, 0x00000200, 0x00000001, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000002, 0xF24A8280, 0x00000043, 0x00000005, NpcMoveTo, 0x00000001, 0xFFFFFE70, 0xFFFFFF74, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000001, 0x00000200, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00580001, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x00580004, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000002, 0x00000200, 0x00000001, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000002, 0xF24A8280, 0x00000043, 0x00000005, NpcMoveTo, 0x00000002, 0x00000000, 0xFFFFFF74, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000002, 0x00000200, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000002, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000057, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000004, GetNpcVar, 0x00000003, 0x00000000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFFFFFF42, 0x00000000, 0x00000046, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000010E, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0x0000010E, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000003, 0x005A000B, 0x005A0003, 0x00000000, 0x00140126, 0x00000043, 0x00000004, ShowGotItem, 0x0000006D, 0x00000001, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000003, 0x005A000B, 0x005A0003, 0x00000000, 0x00140127, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000066, 0x00000000, 0x00000008, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x0000014A, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x0000014A, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF24FF280, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24ABE80, 0xF24A4680, 0x00000043, 0x00000004, SetCamPosB, 0x00000000, 0xF24E6280, 0xF24B1A80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000005, SetNpcPos, 0x00000003, 0xFFFFFEA2, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000001, 0xFFFFFEBB, 0x00000000, 0xFFFFFFE2, 0x00000043, 0x00000003, SetNpcYaw, 0x00000001, 0x0000005A, 0x00000044, 0x00000001, D_80243984_B18A34, 0x00000043, 0x00000005, SetNpcPos, 0x00000000, 0x0000019A, 0x00000000, 0xFFFFFFE7, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000000, 0xF24A8280, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00800004, 0x00000043, 0x00000005, NpcMoveTo, 0x00000000, 0x000000FA, 0xFFFFFFE7, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00800002, 0x00000043, 0x00000007, SpeakToNpc, 0x00000000, 0x00800006, 0x00800002, 0x00000000, 0x00000003, 0x00140128, 0x00000043, 0x00000006, ContinueSpeech, 0x00000000, 0x00800007, 0x00800002, 0x00000000, 0x00140129, 0x00000043, 0x00000004, SetNpcVar, 0x00000000, 0x00000001, 0x00000001, 0x00000056, 0x00000000, 0x00000043, 0x00000004, SetPlayerPos, 0xFFFFFF47, 0x00000000, 0xFFFFFF9C, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000005A, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, GetNpcPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000C, 0x00000002, 0xFE363C80, 0xFFFFFFEC, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000010E, 0x00000000, 0x00000045, 0x00000002, D_80243B80_B18C30, 0xFE363C8A, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000004, GetNpcVar, 0x00000000, 0x00000001, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000005A, 0x00000007, 0x00000043, 0x00000004, func_802D1270, 0xFFFFFF4C, 0xFFFFFFE8, 0xF24A8280, 0x00000043, 0x00000004, func_802D1270, 0xFFFFFF88, 0xFFFFFFE8, 0xF24A8280, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFFFFFF51, 0x0000003C, 0xFFFFFF9C, 0x00000043, 0x00000003, SetNpcYaw, 0xFFFFFFFC, 0x0000005A, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, GetNpcPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000C, 0x00000002, 0xFE363C80, 0xFFFFFFF6, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0x0000010E, 0x00000000, 0x00000045, 0x00000002, D_80243BE0_B18C90, 0xFE363C8A, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000004, GetNpcVar, 0x00000000, 0x00000001, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00200005, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0x0000005A, 0x00000005, 0x00000043, 0x00000005, LoadPath, 0x00000032, D_8024331C_B183CC, 0x00000004, 0x00000000, 0x00000046, 0x00000001, D_8024334C_B183FC, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00200001, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFFFFFED4, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF24F2A80, 0x00000057, 0x00000000, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000000, 0xF24A8980, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00800004, 0x00000043, 0x00000005, NpcMoveTo, 0x00000000, 0xFFFFFEFC, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00800002, 0x00000043, 0x00000004, SetNpcVar, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000004, SetNpcVar, 0x00000000, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000005, 0x00000001, 0x00000002, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00800006, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00800002, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000003, 0x005A000B, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000003, 0x005A0003, 0x00000008, 0x00000001, 0x00000003, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000007, SpeakToNpc, 0x00000000, 0x00800006, 0x00800002, 0x00000000, 0x00000003, 0x0014012A, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000000, 0x0000005A, 0x00000005, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFFFFFF42, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8680, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000008, 0x00000001, 0x0000000A, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, SetPlayerJumpscale, 0xF24A7E80, 0x00000043, 0x00000005, PlayerJump1, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000A, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000010E, 0x00000005, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x0080000D, 0x00000043, 0x00000005, GetNpcPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, NpcJump0, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000A, 0x00000057, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x0080000D, 0x0080000D, 0x00000005, 0x0014012B, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00800002, 0x00000043, 0x00000005, EndSpeech, 0x00000000, 0x00800006, 0x00800002, 0x00000005, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x00580008, 0x00580001, 0x00000005, 0x0014012C, 0x00000046, 0x00000001, D_802433C4_B18474, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000003, 0x005A000B, 0x005A0003, 0x00000005, 0x0014012D, 0x00000046, 0x00000001, D_802435D0_B18680, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFE, 0x000C0018, 0x000C0018, 0x00000005, 0x0014012E, 0x00000046, 0x00000001, D_802437F4_B188A4, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000003, FadeOutMusic, 0x00000000, 0x000003E8, 0x00000046, 0x00000001, 0x802400C0, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/splat.yaml b/ver/us/splat.yaml index 0f50dc6197..80fc2ea688 100644 --- a/ver/us/splat.yaml +++ b/ver/us/splat.yaml @@ -10019,6 +10019,7 @@ segments: start: 0x929270 vram: 0x80240000 subsegments: + - [0x929270, c, sbk_00_0_header] - [0x929270, c, sbk_00_1_main] - [0x9292B0, c, sbk_00_2_npc] - [0x9292B0, c, sbk_00_3_entity] @@ -11761,319 +11762,301 @@ segments: start: 0xABB290 vram: 0x80240000 subsegments: - - [0xABB290, c] - - [0xABB340, c] - - [0xABC250, data] - - [0xABC3D0, data] - - [0xABEC70, data] - - [0xABEF20, data] - - [0xAC40D0, data] - - [0xAC4FB0] + - [0xABB290, c, kkj_00_0_header] + - [0xABB290, c, kkj_00_1_music] + - [0xABB290, c, kkj_00_2_main] + - [0xABB340, c, kkj_00_3_npc_intro] + - [0xABC1D0, c, kkj_00_4_scene_intro] + - [0xABC1D0, c, kkj_00_5_npc_ending] + - [0xABC1D0, c, kkj_00_6_scene_ending] + - [0xABC250] - name: kkj_01 dir: world/area_kkj/kkj_01 type: code start: 0xAC5170 vram: 0x80240000 subsegments: - - [0xAC5170, c] - - [0xAC6000, data] - - [0xAC6140, data] - - [0xAC67E0, data] - - [0xAC8B60] + - [0xAC5170, c, kkj_01_0_header] + - [0xAC5170, c, kkj_01_1_music] + - [0xAC5170, c, kkj_01_2_main] + - [0xAC5170, c, kkj_01_3_npc] + - [0xAC6000] - name: kkj_02 dir: world/area_kkj/kkj_02 type: code start: 0xAC8D20 vram: 0x80240000 subsegments: - - [0xAC8D20, c] - - [0xAC8D20, data] - - [0xAC8E40, data] - - [0xAC9160, data] - - [0xAC9700] + - [0xAC8D20, c, kkj_02_0_header] + - [0xAC8D20, c, kkj_02_1_music] + - [0xAC8D20, c, kkj_02_2_main] + - [0xAC8D20, c, kkj_02_3_npc] + - [0xAC8D20] - name: kkj_03 dir: world/area_kkj/kkj_03 type: code start: 0xAC9710 vram: 0x80240000 subsegments: - - [0xAC9710, c] - - [0xAC9730, c] - - [0xAC9A40, data] - - [0xAC9C00, data] - - [0xACA010, data] - - [0xACA250, data] - - [0xACAB00] + - [0xAC9710, c, kkj_03_0_header] + - [0xAC9730, c, kkj_03_1_music] + - [0xAC9A40, c, kkj_03_2_main] + - [0xAC9A40, c, kkj_03_3_npc] + - [0xAC9A40, c, kkj_03_4_scenes] + - [0xAC9A40] - name: kkj_10 dir: world/area_kkj/kkj_10 type: code start: 0xACAB20 vram: 0x80240000 subsegments: - - [0xACAB20, c] - - [0xACAB90, c] - - [0xACABD0, c] - - [0xACB3C0, c] - - [0xACBBF0, data] - - [0xACC510, data] - - [0xACC700, data] - - [0xACE0D0] + - [0xACAB20, c, kkj_10_0_header] + - [0xACAB20, c, kkj_10_1_main] + - [0xACAB90, c, kkj_10_2_entity] + - [0xACABD0, c, kkj_10_3_npcs_early] + - [0xACB3C0, c, kkj_10_4_npcs_later] + - [0xACBBF0] - name: kkj_11 dir: world/area_kkj/kkj_11 type: code start: 0xACE140 vram: 0x80240000 subsegments: - - [0xACE140, c] - - [0xACE1B0, c] - - [0xACE1F0, c] - - [0xACE9E0, c] - - [0xACF210, data] - - [0xACFD40, data] - - [0xACFF30, data] - - [0xAD02E0, data] - - [0xAD27F0, data] - - [0xAD4010] + - [0xACE140, c, kkj_11_0_header] + - [0xACE140, c, kkj_11_1_main] + - [0xACE1B0, c, kkj_11_2_entity] + - [0xACE1F0, c, kkj_11_3_scene] + - [0xACE1F0, c, kkj_11_4_demo] + - [0xACE1F0, c, kkj_11_5_npcs_early] + - [0xACE9E0, c, kkj_11_6_npcs_later] + - [0xACF210] - name: kkj_12 dir: world/area_kkj/kkj_12 type: code start: 0xAD4090 vram: 0x80240000 subsegments: - - [0xAD4090, c] - - [0xAD4100, c] - - [0xAD4940, data] - - [0xAD5EA0] + - [0xAD4090, c, kkj_12_0_header] + - [0xAD4090, c, kkj_12_1_main] + - [0xAD4100, c, kkj_12_2_npc] + - [0xAD4940] - name: kkj_13 dir: world/area_kkj/kkj_13 type: code start: 0xAD5ED0 vram: 0x80240000 subsegments: - - [0xAD5ED0, c] - - [0xAD5EF0, c] - - [0xAD6200, c] - - [0xAD6630, data] - - [0xAD6780, data] - - [0xAD6820, data] - - [0xAD6E60, data] - - [0xAD8650, data] - - [0xAD9460, data] - - [0xADAE60] + - [0xAD5ED0, c, kkj_13_0_header] + - [0xAD5EF0, c, kkj_13_1_music] + - [0xAD6200, c, kkj_13_2_main] + - [0xAD6200, c, kkj_13_3_npcs_finale] + - [0xAD6260, c, kkj_13_4_npcs_intro] + - [0xAD6260, c, kkj_13_5_intro_scenes] + - [0xAD6630] - name: kkj_14 dir: world/area_kkj/kkj_14 type: code start: 0xADAEA0 vram: 0x80240000 subsegments: - - [0xADAEA0, c] - - [0xADAEF0, c] - - [0xADB360, data] - - [0xADB5C0, data] - - [0xADC0F0, data] - - [0xADD870, data] - - [0xADE870, data] - - [0xADED00, data] - - [0xADF190, data] - - [0xADFA50, data] - - [0xAE1B30, data] - - [0xAE1E80, data] - - [0xAE3160, data] - - [0xAE32D0, data] - - [0xAE3610, data] - - [0xAE3850, data] - - [0xAE5550] + - [0xADAEA0, c, kkj_14_0_header] + - [0xADAEF0, c, kkj_14_1_music] + - [0xADAEF0, c, kkj_14_2_main] + - [0xADB240, c, kkj_14_3_interactables] + - [0xADB360, c, kkj_14_4_npc_guards] + - [0xADB360, c, kkj_14_5_npc_ch0] + - [0xADB360, c, kkj_14_6_npc_ch2] + - [0xADB360, c, kkj_14_7_npc_ch7] + - [0xADB360, c, kkj_14_8_chapter0] + - [0xADB360, c, kkj_14_9_chapter1] + - [0xADB360, c, kkj_14_10_chapter2] + - [0xADB360, c, kkj_14_11_chapter3] + - [0xADB360, c, kkj_14_12_chapter4] + - [0xADB360, c, kkj_14_13_chapter5] + - [0xADB360, c, kkj_14_14_chapter6] + - [0xADB360, c, kkj_14_15_chapter7] + - [0xADB360] - name: kkj_15 dir: world/area_kkj/kkj_15 type: code start: 0xAE5590 vram: 0x80240000 subsegments: - - [0xAE5590, c] - - [0xAE58D0, c] - - [0xAE5A90, c] - - [0xAE5B60, c] - - [0xAE5BA0, data] - - [0xAE5CE0, data] - - [0xAE5D80, data] - - [0xAE65A0, data] - - [0xAE6BF0, data] - - [0xAE8A50, data] - - [0xAEA0D0, data] - - [0xAEA230, data] - - [0xAEB820, data] - - [0xAECB30, data] - - [0xAED3E0] + - [0xAE5590, c, kkj_15_0_header] + - [0xAE5590, c, kkj_15_1_music] + - [0xAE5590, c, kkj_15_2_main] + - [0xAE58D0, c, kkj_15_3_rotating_wall] + - [0xAE5A90, c, kkj_15_4_chapter0] + - [0xAE5B60, c, kkj_15_5_chapter1] + - [0xAE5B60, c, kkj_15_6_chapter2] + - [0xAE5B60, c, kkj_15_7_chapter3] + - [0xAE5BA0, c, kkj_15_8_npc_chapter0] + - [0xAE5BA0, c, kkj_15_9_npc_chapter1] + - [0xAE5BA0, c, kkj_15_10_npc_chapter3] + - [0xAE5BA0] - name: kkj_16 dir: world/area_kkj/kkj_16 type: code start: 0xAED410 vram: 0x80240000 subsegments: - - [0xAED410, c] - - [0xAEDC60, c] - - [0xAEE490, data] - - [0xAEE7F0, data] - - [0xAF09D0, data] - - [0xAF1B10, data] - - [0xAF1C10] + - [0xAED410, c, kkj_16_0_header] + - [0xAED410, c, kkj_16_1_main] + - [0xAED470, c, kkj_16_2_npcs_early] + - [0xAEDC60, c, kkj_16_3_npcs_later] + - [0xAEE490, c, kkj_16_4_stealth] + - [0xAEE490, c, kkj_16_5_entity] + - [0xAEE490] - name: kkj_17 dir: world/area_kkj/kkj_17 type: code start: 0xAF1C60 vram: 0x80240000 subsegments: - - [0xAF1C60, c] - - [0xAF2200, data] - - [0xAF2440, data] - - [0xAF2520, data] - - [0xAF2C90] + - [0xAF1C60, c, kkj_17_0_header] + - [0xAF1C60, c, kkj_17_1_main] + - [0xAF1C60, c, kkj_17_2_entity] + - [0xAF1C60, c, kkj_17_3_chest] + - [0xAF2200] - name: kkj_18 dir: world/area_kkj/kkj_18 type: code start: 0xAF2CA0 vram: 0x80240000 subsegments: - - [0xAF2CA0, c] - - [0xAF2FE0, c] - - [0xAF34C0, data] - - [0xAF3560, data] - - [0xAF3600, data] - - [0xAF3CB0, data] - - [0xAF4BB0, data] - - [0xAF7920] + - [0xAF2CA0, c, kkj_18_0_header] + - [0xAF2CA0, c, kkj_18_1_music] + - [0xAF2CA0, c, kkj_18_2_main] + - [0xAF2FE0, c, kkj_18_3_npc] + - [0xAF2FE0, c, kkj_18_4_gourmet] + - [0xAF34C0] - name: kkj_19 dir: world/area_kkj/kkj_19 type: code start: 0xAF7950 vram: 0x80240000 subsegments: - - [0xAF7950, c] - - [0xAF7C00, c] - - [0xAF8660, data] - - [0xAF8B40, data] - - [0xAF9050, data] - - [0xAF9460, data] - - [0xAFDAF0] + - [0xAF7950, c, kkj_19_0_header] + - [0xAF7950, c, kkj_19_1_music] + - [0xAF7C00, c, kkj_19_2_main] + - [0xAF7C00, c, kkj_19_3_npcs_intro] + - [0xAF7C00, c, kkj_19_4_npcs_peach] + - [0xAF7C00, c, kkj_19_5_baking] + - [0xAF8660] - name: kkj_20 dir: world/area_kkj/kkj_20 type: code start: 0xAFDB40 vram: 0x80240000 subsegments: - - [0xAFDB40, c] - - [0xAFDE00, c] - - [0xAFE130, data] - - [0xAFE1E0, data] - - [0xAFE3C0, data] - - [0xAFE610, data] - - [0xB02290] + - [0xAFDB40, c, kkj_20_0_header] + - [0xAFDB40, c, kkj_20_1_music] + - [0xAFDB40, c, kkj_20_2_main] + - [0xAFDB40, c, kkj_20_3_entity] + - [0xAFDE00, c, kkj_20_4_npc] + - [0xAFE130] - name: kkj_21 dir: world/area_kkj/kkj_21 type: code start: 0xB022A0 vram: 0x80240000 subsegments: - - [0xB022A0, c] - - [0xB022A0, data] - - [0xB024E0] + - [0xB022A0, c, kkj_21_0_header] + - [0xB022A0, c, kkj_21_1_main] + - [0xB022A0] - name: kkj_22 dir: world/area_kkj/kkj_22 type: code start: 0xB024F0 vram: 0x80240000 subsegments: - - [0xB024F0, c] - - [0xB024F0, data] - - [0xB025A0, data] - - [0xB02870] + - [0xB024F0, c, kkj_22_0_header] + - [0xB024F0, c, kkj_22_1_music] + - [0xB024F0, c, kkj_22_2_main] + - [0xB024F0] - name: kkj_23 dir: world/area_kkj/kkj_23 type: code start: 0xB02880 vram: 0x80240000 subsegments: - - [0xB02880, c] - - [0xB028A0, c] - - [0xB03190, c] - - [0xB03250, data] - - [0xB03300, data] - - [0xB036B0, data] - - [0xB04420, data] - - [0xB04FB0, data] - - [0xB06530] + - [0xB02880, c, kkj_23_0_header] + - [0xB028A0, c, kkj_23_1_music] + - [0xB028A0, c, kkj_23_2_main] + - [0xB02900, c, kkj_23_3_npcs_finale] + - [0xB02960, c, kkj_23_4_npcs_peach] + - [0xB03190, c, kkj_23_5_scene] + - [0xB03250] - name: kkj_24 dir: world/area_kkj/kkj_24 type: code start: 0xB06570 vram: 0x80240000 subsegments: - - [0xB06570, c] - - [0xB06590, data] - - [0xB06640, data] - - [0xB069B0, data] - - [0xB069F0] + - [0xB06570, c, kkj_24_0_header] + - [0xB06570, c, kkj_24_1_music] + - [0xB06570, c, kkj_24_2_main] + - [0xB06590, c, kkj_24_3_entity] + - [0xB06590] - name: kkj_25 dir: world/area_kkj/kkj_25 type: code start: 0xB06A00 vram: 0x80240000 subsegments: - - [0xB06A00, c] - - [0xB06A20, c] - - [0xB06A50, c] - - [0xB06A80, c] - - [0xB06D10, c] - - [0xB07940, data] - - [0xB081C0, data] - - [0xB0B310, data] - - [0xB0E3A0, data] - - [0xB0F280, data] - - [0xB13100] + - [0xB06A00, c, kkj_25_0_header] + - [0xB06A20, c, kkj_25_1_main] + - [0xB06A20, c, kkj_25_2_npc_initial] + - [0xB06A50, c, kkj_25_3_npc_midpoint] + - [0xB06A80, c, kkj_25_4_npc_final] + - [0xB06A80, c, kkj_25_5_arena] + - [0xB06D10, c, kkj_25_6_peach_free] + - [0xB07660, c, kkj_25_7_kammy_defeated] + - [0xB07730, c, kkj_25_8_bowser_defeated] + - [0xB07940, c, kkj_25_9_entity] + - [0xB07940] - name: kkj_26 dir: world/area_kkj/kkj_26 type: code start: 0xB13120 vram: 0x80240000 subsegments: - - [0xB13120, c] - - [0xB13150, data] - - [0xB13500, data] - - [0xB13A40, data] - - [0xB13D50] + - [0xB13120, c, kkj_26_0_header] + - [0xB13120, c, kkj_26_1_main] + - [0xB13150, c, kkj_26_2_scenes] + - [0xB13150, c, kkj_26_3_demo] + - [0xB13150] - name: kkj_27 dir: world/area_kkj/kkj_27 type: code start: 0xB13D70 vram: 0x80240000 subsegments: - - [0xB13D70, c] - - [0xB14080, c] - - [0xB14210, data] - - [0xB14340, data] - - [0xB143E0, data] - - [0xB14E90] + - [0xB13D70, c, kkj_27_0_header] + - [0xB13D70, c, kkj_27_1_music] + - [0xB13D70, c, kkj_27_2_main] + - [0xB14080, c, kkj_27_3_rotating_wall] + - [0xB14210] - name: kkj_28 dir: world/area_kkj/kkj_28 type: code start: 0xB14EA0 vram: 0x80240000 subsegments: - - [0xB14EA0, c] - - [0xB14EA0, data] - - [0xB150A0] + - [0xB14EA0, c, kkj_28_0_header] + - [0xB14EA0, c, kkj_28_1_main] + - [0xB14EA0] - name: kkj_29 dir: world/area_kkj/kkj_29 type: code start: 0xB150B0 vram: 0x80240000 subsegments: - - [0xB150B0, c] - - [0xB150E0, c] - - [0xB15120, data] - - [0xB15410, data] - - [0xB15DA0, data] - - [0xB1A8F0] + - [0xB150B0, c, kkj_29_0_header] + - [0xB150B0, c, kkj_29_1_main] + - [0xB150E0, c, kkj_29_2_npc] + - [0xB150E0, c, kkj_29_3_quiz] + - [0xB15120] - name: tst_01 dir: world/area_tst/tst_01 type: code @@ -16528,28 +16511,19 @@ segments: - [0xEF7FB0, c, flo_18_4_npc] - [0xEF8010, c, flo_18_5_foliage] - [0xEF8250] - #- name: dead_flo_19 - # dir: world/dead/area_flo/flo_19 - # type: code - # start: 0xEFEB00 - # vram: 0x80240000 - # subsegments: - # - [0xEFEB00, c, flo_19_0_header] - # - [0xEFEB00, c, flo_19_1_music] - # - [0xEFEB00, c, flo_19_2_entity] - # - [0xEFEB00, c, flo_19_3_main] - # - [0xEFEE40, c, flo_19_4_clouds] - # - [0xEFEFD0, c, flo_19_5_beanstalk] - # - [0xEFF440] - - # should end at 0xF01B10 - - - type: code + - name: dead_flo_19 + dir: world/dead/area_flo/flo_19 + type: code start: 0xEFEB00 vram: 0x80240000 subsegments: - - [0xEFEB00, c] - - [0xEFF440, bin] # part of overlay + - [0xEFEB00, c, flo_19_0_header] + - [0xEFEB00, c, flo_19_1_music] + - [0xEFEB00, c, flo_19_2_entity] + - [0xEFEB00, c, flo_19_3_main] + - [0xEFEE40, c, flo_19_4_clouds] + - [0xEFEFD0, c, flo_19_5_beanstalk] + - [0xEFF440] ############# ### Audio ### diff --git a/ver/us/symbol_addrs.txt b/ver/us/symbol_addrs.txt index 48a4eeb185..13ec95518c 100644 --- a/ver/us/symbol_addrs.txt +++ b/ver/us/symbol_addrs.txt @@ -13826,7 +13826,7 @@ func_80218220_6DBFC0 = 0x80218220; // type:func rom:0x6DBFC0 func_8021833C_6DC0DC = 0x8021833C; // type:func rom:0x6DC0DC func_802183EC_6DC18C = 0x802183EC; // type:func rom:0x6DC18C func_8021849C_6DC23C = 0x8021849C; // type:func rom:0x6DC23C -b_area_kkj_UnkLightningFXFunc = 0x80218550; // type:func rom:0x6DC2F0 +b_area_kkj_SetLightningBoltPurple = 0x80218550; // type:func rom:0x6DC2F0 b_area_dig_UnkBattleFunc1 = 0x80218000; // type:func rom:0x6DDDC0 b_area_dig_UnkBattleFunc2 = 0x802180D0; // type:func rom:0x6DDE90 b_area_dig_UnkBattleFunc2_2 = 0x80218184; // type:func rom:0x6DDF44 @@ -18955,21 +18955,21 @@ D_80243A18_AC8B88 = 0x80243A18; // type:data rom:0xAC8B88 kkj_03_SetPlayerSpriteSet2_MapInit = 0x80240000; // type:func rom:0xAC9710 kkj_03_UpdateTexturePanSmooth = 0x80240020; // type:func rom:0xAC9730 kkj_03_UpdateTexturePanStepped = 0x80240144; // type:func rom:0xAC9854 -func_80240000_ACAB20 = 0x80240000; // type:func rom:0xACAB20 +DisableAllLightSources = 0x80240000; // type:func rom:0xACAB20 func_80240034_ACAB54 = 0x80240034; // type:func rom:0xACAB54 kkj_10_RemovePadlock = 0x80240070; // type:func rom:0xACAB90 kkj_10_UnkPhysicsFunc = 0x802400B0; // type:func rom:0xACABD0 kkj_10_UnkModelMatrixFunc = 0x802402C0; // type:func rom:0xACADE0 -kkj_10_UnkModelMatrixFunc2 = 0x8024036C; // type:func rom:0xACAE8C -kkj_10_UnkAtan2Func = 0x80240644; // type:func rom:0xACB164 -kkj_10_UnkGooberFunc = 0x80240728; // type:func rom:0xACB248 +kkj_10_UpdateSearchlight = 0x8024036C; // type:func rom:0xACAE8C +kkj_10_GetAngleBetweenPoints = 0x80240644; // type:func rom:0xACB164 +kkj_10_ApproachPlayer100Units = 0x80240728; // type:func rom:0xACB248 dup_kkj_10_UnkPhysicsFunc = 0x802408A0; // type:func rom:0xACB3C0 dup_kkj_10_UnkModelMatrixFunc = 0x80240AB0; // type:func rom:0xACB5D0 -dup_kkj_10_UnkModelMatrixFunc2 = 0x80240B5C; // type:func rom:0xACB67C -dup_kkj_10_UnkAtan2Func = 0x80240E34; // type:func rom:0xACB954 +dup_kkj_10_UpdateSearchlight = 0x80240B5C; // type:func rom:0xACB67C +dup_kkj_10_GetAngleBetweenPoints = 0x80240E34; // type:func rom:0xACB954 dup_kkj_10_GetPeachDisguise = 0x80240F18; // type:func rom:0xACBA38 func_80240F44_ACBA64 = 0x80240F44; // type:func rom:0xACBA64 -dup_kkj_10_UnkGooberFunc = 0x80240F60; // type:func rom:0xACBA80 +dup_kkj_10_ApproachPlayer100Units = 0x80240F60; // type:func rom:0xACBA80 D_802435E0_ACE100 = 0x802435E0; // type:data rom:0xACE100 D_802435E8_ACE108 = 0x802435E8; // type:data rom:0xACE108 D_802435F0_ACE110 = 0x802435F0; // type:data rom:0xACE110 @@ -18981,16 +18981,16 @@ func_80240034_ACE174 = 0x80240034; // type:func rom:0xACE174 kkj_11_RemovePadlock = 0x80240070; // type:func rom:0xACE1B0 kkj_11_UnkPhysicsFunc = 0x802400B0; // type:func rom:0xACE1F0 kkj_11_UnkModelMatrixFunc = 0x802402C0; // type:func rom:0xACE400 -kkj_11_UnkModelMatrixFunc2 = 0x8024036C; // type:func rom:0xACE4AC -kkj_11_UnkAtan2Func = 0x80240644; // type:func rom:0xACE784 -kkj_11_UnkGooberFunc = 0x80240728; // type:func rom:0xACE868 +kkj_11_UpdateSearchlight = 0x8024036C; // type:func rom:0xACE4AC +kkj_11_GetAngleBetweenPoints = 0x80240644; // type:func rom:0xACE784 +kkj_11_ApproachPlayer100Units = 0x80240728; // type:func rom:0xACE868 dup_kkj_11_UnkPhysicsFunc = 0x802408A0; // type:func rom:0xACE9E0 dup_kkj_11_UnkModelMatrixFunc = 0x80240AB0; // type:func rom:0xACEBF0 -dup_kkj_11_UnkModelMatrixFunc2 = 0x80240B5C; // type:func rom:0xACEC9C -dup_kkj_11_UnkAtan2Func = 0x80240E34; // type:func rom:0xACEF74 +dup_kkj_11_UpdateSearchlight = 0x80240B5C; // type:func rom:0xACEC9C +dup_kkj_11_GetAngleBetweenPoints = 0x80240E34; // type:func rom:0xACEF74 kkj_11_GetPeachDisguise = 0x80240F18; // type:func rom:0xACF058 func_80240F44_ACF084 = 0x80240F44; // type:func rom:0xACF084 -dup_kkj_11_UnkGooberFunc = 0x80240F60; // type:func rom:0xACF0A0 +dup_kkj_11_ApproachPlayer100Units = 0x80240F60; // type:func rom:0xACF0A0 D_80245F10_AD4050 = 0x80245F10; // type:data rom:0xAD4050 D_80245F18_AD4058 = 0x80245F18; // type:data rom:0xAD4058 D_80245F20_AD4060 = 0x80245F20; // type:data rom:0xAD4060 @@ -19001,11 +19001,11 @@ func_80240000_AD4090 = 0x80240000; // type:func rom:0xAD4090 func_80240034_AD40C4 = 0x80240034; // type:func rom:0xAD40C4 kkj_12_UnkPhysicsFunc = 0x80240070; // type:func rom:0xAD4100 kkj_12_UnkModelMatrixFunc = 0x80240280; // type:func rom:0xAD4310 -kkj_12_UnkModelMatrixFunc2 = 0x8024032C; // type:func rom:0xAD43BC -kkj_12_UnkAtan2Func = 0x80240604; // type:func rom:0xAD4694 +kkj_12_UpdateSearchlight = 0x8024032C; // type:func rom:0xAD43BC +kkj_12_GetAngleBetweenPoints = 0x80240604; // type:func rom:0xAD4694 kkj_12_GetPeachDisguise = 0x802406E8; // type:func rom:0xAD4778 func_80240714_AD47A4 = 0x80240714; // type:func rom:0xAD47A4 -kkj_12_UnkGooberFunc = 0x80240730; // type:func rom:0xAD47C0 +kkj_12_ApproachPlayer100Units = 0x80240730; // type:func rom:0xAD47C0 func_8024089C_AD492C = 0x8024089C; // type:func rom:0xAD492C D_80241E20_AD5EB0 = 0x80241E20; // type:data rom:0xAD5EB0 D_80241E28_AD5EB8 = 0x80241E28; // type:data rom:0xAD5EB8 @@ -19047,16 +19047,16 @@ func_80240000_AED410 = 0x80240000; // type:func rom:0xAED410 func_80240028_AED438 = 0x80240028; // type:func rom:0xAED438 kkj_16_UnkPhysicsFunc = 0x80240060; // type:func rom:0xAED470 kkj_16_UnkModelMatrixFunc = 0x80240270; // type:func rom:0xAED680 -kkj_16_UnkModelMatrixFunc2 = 0x8024031C; // type:func rom:0xAED72C -kkj_16_UnkAtan2Func = 0x802405F4; // type:func rom:0xAEDA04 -kkj_16_UnkGooberFunc50 = 0x802406D8; // type:func rom:0xAEDAE8 +kkj_16_UpdateSearchlight = 0x8024031C; // type:func rom:0xAED72C +kkj_16_GetAngleBetweenPoints = 0x802405F4; // type:func rom:0xAEDA04 +kkj_16_ApproachPlayer50Units = 0x802406D8; // type:func rom:0xAEDAE8 dup_kkj_16_UnkPhysicsFunc = 0x80240850; // type:func rom:0xAEDC60 dup_kkj_16_UnkModelMatrixFunc = 0x80240A60; // type:func rom:0xAEDE70 -dup_kkj_16_UnkModelMatrixFunc2 = 0x80240B0C; // type:func rom:0xAEDF1C -dup_kkj_16_UnkAtan2Func = 0x80240DE4; // type:func rom:0xAEE1F4 +dup_kkj_16_UpdateSearchlight = 0x80240B0C; // type:func rom:0xAEDF1C +dup_kkj_16_GetAngleBetweenPoints = 0x80240DE4; // type:func rom:0xAEE1F4 kkj_16_GetPeachDisguise = 0x80240EC8; // type:func rom:0xAEE2D8 func_80240EF4_AEE304 = 0x80240EF4; // type:func rom:0xAEE304 -dup_kkj_16_UnkGooberFunc50 = 0x80240F10; // type:func rom:0xAEE320 +dup_kkj_16_ApproachPlayer50Units = 0x80240F10; // type:func rom:0xAEE320 D_80244810_AF1C20 = 0x80244810; // type:data rom:0xAF1C20 D_80244818_AF1C28 = 0x80244818; // type:data rom:0xAF1C28 D_80244820_AF1C30 = 0x80244820; // type:data rom:0xAF1C30 @@ -19137,11 +19137,11 @@ func_80240048_B028C8 = 0x80240048; // type:func rom:0xB028C8 func_80240080_B02900 = 0x80240080; // type:func rom:0xB02900 kkj_23_UnkPhysicsFunc = 0x802400E0; // type:func rom:0xB02960 kkj_23_UnkModelMatrixFunc = 0x802402F0; // type:func rom:0xB02B70 -kkj_23_UnkModelMatrixFunc2 = 0x8024039C; // type:func rom:0xB02C1C -kkj_23_UnkAtan2Func = 0x80240674; // type:func rom:0xB02EF4 +kkj_23_UpdateSearchlight = 0x8024039C; // type:func rom:0xB02C1C +kkj_23_GetAngleBetweenPoints = 0x80240674; // type:func rom:0xB02EF4 kkj_23_GetPeachDisguise = 0x80240758; // type:func rom:0xB02FD8 func_80240784_B03004 = 0x80240784; // type:func rom:0xB03004 -kkj_23_UnkGooberFunc50 = 0x802407A0; // type:func rom:0xB03020 +kkj_23_ApproachPlayer50Units = 0x802407A0; // type:func rom:0xB03020 func_80240910_B03190 = 0x80240910; // type:func rom:0xB03190 func_802409AC_B0322C = 0x802409AC; // type:func rom:0xB0322C D_80243CD0_B06550 = 0x80243CD0; // type:data rom:0xB06550 @@ -19152,7 +19152,7 @@ kkj_25_SetPlayerSpriteSet2_MapInit = 0x80240000; // type:func rom:0xB06A00 func_80240020_B06A20 = 0x80240020; // type:func rom:0xB06A20 kkj_25_UnkFunc1 = 0x80240050; // type:func rom:0xB06A50 kkj_25_GetFloorCollider = 0x80240080; // type:func rom:0xB06A80 -kkj_25_UnkLightningFXFunc = 0x802400AC; // type:func rom:0xB06AAC +kkj_25_SetLightningBoltPurple = 0x802400AC; // type:func rom:0xB06AAC kkj_25_SetEntityPositionF = 0x802400FC; // type:func rom:0xB06AFC kkj_25_GetEntityPosition = 0x802401C4; // type:func rom:0xB06BC4 func_80240264_B06C64 = 0x80240264; // type:func rom:0xB06C64 @@ -19173,7 +19173,7 @@ func_80240D30_B07730 = 0x80240D30; // type:func rom:0xB07730 func_80240E54_B07854 = 0x80240E54; // type:func rom:0xB07854 func_80240EB8_B078B8 = 0x80240EB8; // type:func rom:0xB078B8 func_80240F2C_B0792C = 0x80240F2C; // type:func rom:0xB0792C -func_80240000_B13120 = 0x80240000; // type:func rom:0xB13120 +RestoreFromPeachState = 0x80240000; // type:func rom:0xB13120 kkj_27_UpdateTexturePanSmooth = 0x80240000; // type:func rom:0xB13D70 kkj_27_UpdateTexturePanStepped = 0x80240124; // type:func rom:0xB13E94 func_80240310_B14080 = 0x80240310; // type:func rom:0xB14080