From 37e138402f1a88907f466dc9cc15caea3587894a Mon Sep 17 00:00:00 2001 From: HailSanta <53960937+HailSanta@users.noreply.github.com> Date: Tue, 11 Oct 2022 17:19:39 -0400 Subject: [PATCH] sbk done (#815) * sbk_02 * tex panner enum everywhere * sbk_02 done * choice cleanup * todo imports * ai reorg * more reorg * all sbk done * all sbk * reduce warnings * really fix one Co-authored-by: HailSanta --- include/enums.h | 3 +- src/EA0C10.c | 16 +- src/EA36E0.c | 12 +- src/EA7320.c | 4 +- src/EA8AE0.c | 12 +- src/EB1170.c | 10 +- src/EB8E90.c | 2 +- src/EB9D90.c | 2 +- src/EC2200.c | 2 +- src/EC2240.c | 4 +- src/EC71B0.c | 2 +- src/EC7590.c | 4 +- src/EC9D00.c | 2 +- src/ECAA40.c | 2 +- src/ECAA80.c | 6 +- src/ECBB70.c | 2 +- src/ECFFF0.c | 2 +- src/ED0030.c | 2 +- src/ED0310.c | 2 +- src/ED4260.c | 2 +- src/ED42A0.c | 4 +- src/ED8E20.c | 2 +- src/EDC020.c | 8 +- src/EDEA00.c | 8 +- src/EE2040.c | 2 +- src/EE65B0.c | 2 +- src/EE70C0.c | 6 +- src/EED100.c | 2 +- src/EED140.c | 2 +- src/EED1E0.c | 4 +- src/EEDF50.c | 4 +- src/EF2610.c | 2 +- src/EF2680.c | 4 +- src/EF7A80.c | 2 +- src/EF7FB0.c | 2 +- src/EFEB00.c | 4 +- src/battle/area_dig/stage/dig_04.c | 4 +- src/battle/area_flo/stage/flo_03.c | 36 +- src/battle/area_flo2/stage/flo_03.c | 36 +- src/battle/area_hos/actor/magikoopa.c | 2 +- src/battle/area_hos/stage/hos_01.c | 12 +- src/battle/area_hos/stage/hos_02.c | 8 +- src/battle/area_kkj/actor/kammy_koopa.c | 4 +- src/battle/area_kmr_part_1/stage/kmr_03.c | 2 +- src/battle/area_kmr_part_1/stage/kmr_04.c | 2 +- src/battle/area_kmr_part_1/stage/kmr_05.c | 2 +- src/battle/area_kmr_part_1/stage/kmr_06.c | 2 +- src/battle/area_kmr_part_2/stage/kmr_03.c | 2 +- src/battle/area_kmr_part_2/stage/kmr_04.c | 2 +- src/battle/area_kmr_part_2/stage/kmr_05.c | 2 +- src/battle/area_kmr_part_2/stage/kmr_06.c | 2 +- src/battle/area_kmr_part_3/stage/kmr_03.c | 2 +- src/battle/area_kmr_part_3/stage/kmr_04.c | 2 +- src/battle/area_kmr_part_3/stage/kmr_05.c | 2 +- src/battle/area_kmr_part_3/stage/kmr_06.c | 2 +- src/battle/area_kmr_part_3/stage/kpa_01.c | 4 +- src/battle/area_kpa/stage/kpa_01.c | 4 +- src/battle/area_kpa/stage/kpa_01b.c | 4 +- src/battle/area_kpa/stage/kpa_04.c | 4 +- src/battle/area_kpa/stage/kpa_04b.c | 4 +- src/battle/area_kpa/stage/kpa_04c.c | 4 +- src/battle/area_kpa/stage/kpa_13.c | 4 +- src/battle/area_kpa/stage/kpa_14.c | 4 +- src/battle/area_kpa2/stage/kpa_01.c | 4 +- src/battle/area_kpa3/stage/kpa_01.c | 4 +- src/battle/area_kpa4/stage/kpa_01.c | 4 +- src/battle/area_kpa4/stage/kpa_01b.c | 4 +- src/battle/area_kpa4/stage/kpa_04.c | 4 +- src/battle/area_kpa4/stage/kpa_04b.c | 4 +- src/battle/area_kpa4/stage/kpa_04c.c | 4 +- src/battle/area_kpa4/stage/kpa_13.c | 4 +- src/battle/area_kpa4/stage/kpa_14.c | 4 +- src/battle/area_mac/actor/lee.c | 2 +- src/battle/area_omo/stage/omo_04.c | 4 +- src/battle/area_omo3/stage/omo_04.c | 4 +- src/battle/area_tik/stage/tik_01.c | 2 +- src/battle/area_tik/stage/tik_02.c | 2 +- src/battle/area_tik/stage/tik_03.c | 2 +- src/battle/area_tik/stage/tik_05.c | 4 +- src/battle/area_tik2/stage/tik_01.c | 2 +- src/battle/area_tik2/stage/tik_02.c | 2 +- src/battle/area_tik2/stage/tik_03.c | 2 +- src/battle/area_tik2/stage/tik_05.c | 4 +- src/battle/area_tik3/stage/tik_01.c | 2 +- src/battle/area_tik3/stage/tik_02.c | 2 +- src/battle/area_tik3/stage/tik_03.c | 2 +- src/battle/area_tik3/stage/tik_05.c | 4 +- src/battle/area_trd_part_1/stage/trd_03.c | 2 +- src/battle/area_trd_part_2/stage/trd_03.c | 2 +- src/battle/common/actor/ghost_goombario.inc.c | 2 +- src/battle/common/actor/gray_magikoopa.inc.c | 2 +- src/battle/common/actor/green_magikoopa.inc.c | 2 +- src/battle/common/actor/magikoopa.inc.c | 2 +- src/battle/common/actor/red_magikoopa.inc.c | 2 +- src/battle/common/actor/slot_machine.inc.c | 6 +- src/battle/common/actor/white_magikoopa.inc.c | 2 +- .../common/actor/yellow_magikoopa.inc.c | 2 +- src/battle/move/auto_jump/auto_jump.c | 2 +- .../move/auto_multibounce/auto_multibounce.c | 2 +- src/battle/move/auto_smash/763540.c | 4 +- src/battle/move/d_down_jump/781920.c | 2 +- src/battle/move/d_down_pound/74AD90.c | 4 +- src/battle/move/dizzy_stomp/748DD0.c | 2 +- src/battle/move/earthquake_jump/785B20.c | 2 +- src/battle/move/hammer/hammer.c | 4 +- src/battle/move/hammer_charge_0/74F130.c | 6 +- src/battle/move/hammer_charge_1/7595B0.c | 8 +- src/battle/move/hammer_charge_2/75E5D0.c | 8 +- src/battle/move/hammer_throw/752450.c | 4 +- src/battle/move/jump/jump.c | 2 +- src/battle/move/jump_charge_0/74D570.c | 4 +- src/battle/move/jump_charge_1/75C980.c | 6 +- src/battle/move/jump_charge_2/761920.c | 6 +- src/battle/move/mega_jump/770F30.c | 2 +- src/battle/move/mega_quake/756780.c | 4 +- src/battle/move/mega_smash/777690.c | 4 +- src/battle/move/multibounce/740CC0.c | 2 +- src/battle/move/power_bounce/743DF0.c | 2 +- src/battle/move/power_jump/76D760.c | 2 +- src/battle/move/power_quake/767C90.c | 4 +- src/battle/move/power_smash/772BA0.c | 4 +- src/battle/move/quake_hammer/quake_hammer.c | 4 +- src/battle/move/shell_crack/77F240.c | 4 +- src/battle/move/shrink_smash/77CB80.c | 4 +- src/battle/move/shrink_stomp/783BA0.c | 2 +- src/battle/move/sleep_stomp/746E10.c | 2 +- src/battle/move/spin_smash/spin_smash.c | 4 +- src/battle/move/super_jump/76F330.c | 2 +- src/battle/move/super_smash/775100.c | 4 +- src/battle/move/unknown_move/779C90.c | 2 +- src/world/area_arn/arn_05/arn_05_2_npc.c | 2 +- src/world/area_arn/arn_07/arn_07_1_main.c | 2 +- src/world/area_arn/arn_07/arn_07_3_entity.c | 4 +- src/world/area_dgb/dgb_00/BFA100.c | 2 +- src/world/area_dgb/dgb_01/BFD8C0.c | 4 +- src/world/area_dgb/dgb_01/BFD9A0.c | 14 +- src/world/area_dgb/dgb_02/C2EBA0.c | 4 +- src/world/area_dgb/dgb_03/C314E0.c | 8 +- src/world/area_dgb/dgb_03/C31730.c | 8 +- src/world/area_dgb/dgb_04/C36530.c | 6 +- src/world/area_dgb/dgb_05/C3AA10.c | 6 +- src/world/area_dgb/dgb_07/C3DBF0.c | 4 +- src/world/area_dgb/dgb_08/C3FDB0.c | 8 +- src/world/area_dgb/dgb_09/C46BE0.c | 10 +- src/world/area_dgb/dgb_10/C4C390.c | 12 +- src/world/area_dgb/dgb_12/C4DEF0.c | 2 +- src/world/area_dgb/dgb_13/C4E960.c | 2 +- src/world/area_dgb/dgb_15/C4F510.c | 6 +- src/world/area_dgb/dgb_15/C50CA0.c | 4 +- src/world/area_dgb/dgb_16/C52540.c | 4 +- src/world/area_dgb/dgb_18/C55F40.c | 4 +- src/world/area_dgb/dgb_18/C56EF0.c | 8 +- src/world/area_dro/dro_01/95B200.c | 2 +- src/world/area_dro/dro_01/95B7E0.c | 16 +- src/world/area_dro/dro_01/95E660.c | 4 +- src/world/area_dro/dro_01/95E7A0.c | 2 +- src/world/area_dro/dro_02/9694C0.c | 10 +- src/world/area_flo/flo_00/C9DF60.c | 46 +-- src/world/area_flo/flo_00/C9EE30.c | 2 +- src/world/area_flo/flo_03/CA72E0.c | 6 +- src/world/area_flo/flo_07/CAC1F0.c | 2 +- src/world/area_flo/flo_07/CAC5D0.c | 6 +- src/world/area_flo/flo_08/CAED40.c | 2 +- src/world/area_flo/flo_08/CAFAC0.c | 16 +- src/world/area_flo/flo_08/CB0B80.c | 2 +- src/world/area_flo/flo_09/CB5040.c | 2 +- src/world/area_flo/flo_09/CB50E0.c | 4 +- src/world/area_flo/flo_09/CB5320.c | 2 +- src/world/area_flo/flo_10/CB9280.c | 16 +- src/world/area_flo/flo_11/CBDCD0.c | 8 +- src/world/area_flo/flo_12/CC0E70.c | 10 +- src/world/area_flo/flo_13/CC3850.c | 14 +- src/world/area_flo/flo_13/CC6DE0.c | 2 +- src/world/area_flo/flo_14/CCB310.c | 8 +- src/world/area_flo/flo_14/CCBE20.c | 4 +- src/world/area_flo/flo_15/CD06C0.c | 8 +- src/world/area_flo/flo_16/CD1E70.c | 2 +- src/world/area_flo/flo_16/CD1F10.c | 14 +- src/world/area_flo/flo_16/CD2C80.c | 4 +- src/world/area_flo/flo_17/CD7350.c | 14 +- src/world/area_flo/flo_18/CDC6A0.c | 28 +- src/world/area_flo/flo_18/CDCBD0.c | 2 +- src/world/area_flo/flo_19/CE36F0.c | 10 +- src/world/area_flo/flo_21/CE6700.c | 4 +- src/world/area_flo/flo_21/CE7240.c | 2 +- src/world/area_flo/flo_22/CEC240.c | 2 +- src/world/area_flo/flo_23/CEE2A0.c | 10 +- src/world/area_flo/flo_24/CF0980.c | 12 +- src/world/area_flo/flo_25/CF2C10.c | 12 +- src/world/area_flo/flo_25/CF4E00.c | 2 +- src/world/area_gv/gv_01/gv_01.c | 4 +- src/world/area_hos/hos_00/A0C4E0.c | 6 +- src/world/area_hos/hos_01/A10880.c | 2 +- src/world/area_hos/hos_01/A11020.c | 2 +- src/world/area_hos/hos_01/A11650.c | 4 +- src/world/area_hos/hos_02/A17210.c | 4 +- src/world/area_hos/hos_03/A1B100.c | 2 +- src/world/area_hos/hos_03/A1BDB0.c | 2 +- src/world/area_hos/hos_06/A397F0.c | 10 +- src/world/area_hos/hos_06/A3A230.c | 8 +- src/world/area_hos/hos_06/A3B4B0.c | 10 +- src/world/area_hos/hos_10/A3F740.c | 2 +- src/world/area_isk/isk_02/978710.c | 2 +- src/world/area_isk/isk_02/978800.c | 2 +- src/world/area_isk/isk_04/97B630.c | 2 +- src/world/area_isk/isk_04/97B670.c | 4 +- src/world/area_isk/isk_04/97BF60.c | 2 +- src/world/area_isk/isk_05/97DAD0.c | 2 +- src/world/area_isk/isk_07/982440.c | 2 +- src/world/area_isk/isk_07/9824F0.c | 2 +- src/world/area_isk/isk_08/984E30.c | 4 +- src/world/area_isk/isk_09/9864E0.c | 8 +- src/world/area_isk/isk_10/988B60.c | 2 +- src/world/area_isk/isk_11/98AB30.c | 2 +- src/world/area_isk/isk_13/98F7E0.c | 2 +- src/world/area_isk/isk_14/992730.c | 2 +- src/world/area_isk/isk_16/9951F0.c | 2 +- src/world/area_isk/isk_18/997F70.c | 4 +- src/world/area_iwa/iwa_10/iwa_10_1_main.c | 6 +- src/world/area_iwa/iwa_10/iwa_10_4_entity.c | 4 +- .../area_iwa/iwa_10/iwa_10_6_new_party.c | 2 +- src/world/area_jan/jan_00/jan_00_1_main.c | 4 +- src/world/area_jan/jan_00/jan_00_2_npc.c | 4 +- src/world/area_jan/jan_01/B28030.c | 6 +- src/world/area_jan/jan_02/B2C8A0.c | 8 +- src/world/area_jan/jan_03/B34BD0.c | 10 +- src/world/area_jan/jan_04/B44AC0.c | 8 +- src/world/area_jan/jan_04/B45150.c | 2 +- src/world/area_jan/jan_04/B451F0.c | 4 +- src/world/area_jan/jan_05/B4ADC0.c | 2 +- src/world/area_jan/jan_05/B4B260.c | 6 +- src/world/area_jan/jan_06/B52BE0.c | 2 +- src/world/area_jan/jan_06/B52F70.c | 6 +- src/world/area_jan/jan_07/B59870.c | 2 +- src/world/area_jan/jan_08/B5E910.c | 2 +- src/world/area_jan/jan_08/B5F650.c | 4 +- src/world/area_jan/jan_09/B65AB0.c | 2 +- src/world/area_jan/jan_09/B663F0.c | 2 +- src/world/area_jan/jan_10/B6C6A0.c | 2 +- src/world/area_jan/jan_10/B6D4C0.c | 2 +- src/world/area_jan/jan_11/B70860.c | 6 +- src/world/area_jan/jan_11/B71010.c | 2 +- src/world/area_jan/jan_12/B730B0.c | 2 +- src/world/area_jan/jan_12/B73570.c | 2 +- src/world/area_jan/jan_14/B7A050.c | 2 +- src/world/area_jan/jan_14/B7A510.c | 2 +- src/world/area_jan/jan_15/B7D920.c | 2 +- src/world/area_jan/jan_22/B84180.c | 10 +- src/world/area_kgr/kgr_01/kgr_01_1_main.c | 4 +- src/world/area_kgr/kgr_02/kgr_02_1_main.c | 4 +- src/world/area_kkj/kkj_00/ABB340.c | 2 +- src/world/area_kkj/kkj_01/AC5170.c | 2 +- src/world/area_kkj/kkj_03/AC9710.c | 2 +- src/world/area_kkj/kkj_10/ACAB90.c | 2 +- src/world/area_kkj/kkj_10/ACABD0.c | 2 +- src/world/area_kkj/kkj_10/ACB3C0.c | 4 +- src/world/area_kkj/kkj_11/ACE1B0.c | 2 +- src/world/area_kkj/kkj_11/ACE1F0.c | 2 +- src/world/area_kkj/kkj_11/ACE9E0.c | 4 +- src/world/area_kkj/kkj_12/AD4100.c | 4 +- src/world/area_kkj/kkj_13/AD5ED0.c | 2 +- src/world/area_kkj/kkj_14/ADAEF0.c | 2 +- src/world/area_kkj/kkj_16/AED410.c | 2 +- src/world/area_kkj/kkj_16/AEDC60.c | 4 +- src/world/area_kkj/kkj_17/AF1C60.c | 10 +- src/world/area_kkj/kkj_18/AF2FE0.c | 4 +- src/world/area_kkj/kkj_19/AF7C00.c | 6 +- src/world/area_kkj/kkj_20/AFDB40.c | 8 +- src/world/area_kkj/kkj_20/AFDE00.c | 2 +- src/world/area_kkj/kkj_23/B02880.c | 2 +- src/world/area_kkj/kkj_23/B028A0.c | 4 +- src/world/area_kkj/kkj_25/B06A00.c | 2 +- src/world/area_kkj/kkj_25/B06A50.c | 2 +- src/world/area_kkj/kkj_25/B06A80.c | 6 +- src/world/area_kkj/kkj_25/B06D10.c | 2 +- src/world/area_kmr/kmr_02/8B0070.c | 14 +- src/world/area_kmr/kmr_02/8B33E0.c | 4 +- src/world/area_kmr/kmr_02/8B36B0.c | 4 +- src/world/area_kmr/kmr_03/8C7F90.c | 2 +- src/world/area_kmr/kmr_03/8C8140.c | 6 +- src/world/area_kmr/kmr_03/8C82B0.c | 4 +- src/world/area_kmr/kmr_04/8CA900.c | 2 +- src/world/area_kmr/kmr_04/8CA960.c | 6 +- src/world/area_kmr/kmr_05/8CE070.c | 2 +- src/world/area_kmr/kmr_06/8D1510.c | 2 +- src/world/area_kmr/kmr_07/8D3DC0.c | 2 +- src/world/area_kmr/kmr_09/8D5E00.c | 2 +- src/world/area_kmr/kmr_10/8D84D0.c | 10 +- src/world/area_kmr/kmr_11/8DA3A0.c | 4 +- src/world/area_kmr/kmr_20/8EBE50.c | 2 +- src/world/area_kmr/kmr_20/8ECBF0.c | 2 +- src/world/area_kmr/kmr_20/8ED0C0.c | 2 +- src/world/area_kmr/kmr_20/8ED440.c | 4 +- src/world/area_kmr/kmr_20/8ED5A0.c | 2 +- src/world/area_kmr/kmr_20/8EDB70.c | 2 +- src/world/area_kpa/kpa_01/A46F60.c | 2 +- src/world/area_kpa/kpa_01/A470C0.c | 4 +- src/world/area_kpa/kpa_03/A485C0.c | 2 +- src/world/area_kpa/kpa_03/A48720.c | 6 +- src/world/area_kpa/kpa_04/A4BF60.c | 2 +- src/world/area_kpa/kpa_08/A4CA20.c | 2 +- src/world/area_kpa/kpa_08/A4CAC0.c | 2 +- src/world/area_kpa/kpa_09/A4F000.c | 2 +- src/world/area_kpa/kpa_09/A4F0A0.c | 4 +- src/world/area_kpa/kpa_102/A93A50.c | 8 +- src/world/area_kpa/kpa_11/A52BD0.c | 2 +- src/world/area_kpa/kpa_111/A99590.c | 8 +- src/world/area_kpa/kpa_113/A9CC30.c | 2 +- src/world/area_kpa/kpa_113/A9CC70.c | 8 +- src/world/area_kpa/kpa_115/A9ED40.c | 8 +- src/world/area_kpa/kpa_130/AA2D20.c | 2 +- src/world/area_kpa/kpa_134/AA94B0.c | 6 +- src/world/area_kpa/kpa_14/A57830.c | 12 +- src/world/area_kpa/kpa_15/A596A0.c | 8 +- src/world/area_kpa/kpa_16/A5A340.c | 2 +- src/world/area_kpa/kpa_50/A609D0.c | 6 +- src/world/area_kpa/kpa_51/A640E0.c | 4 +- src/world/area_kpa/kpa_52/A67100.c | 4 +- src/world/area_kpa/kpa_52/A671E0.c | 4 +- src/world/area_kpa/kpa_60/A6CB00.c | 4 +- src/world/area_kpa/kpa_61/A6E6F0.c | 4 +- src/world/area_kpa/kpa_62/A72220.c | 4 +- src/world/area_kpa/kpa_70/A74B80.c | 2 +- src/world/area_kpa/kpa_81/A78510.c | 4 +- src/world/area_kpa/kpa_82/A7A550.c | 4 +- src/world/area_kpa/kpa_91/A86A50.c | 2 +- src/world/area_kpa/kpa_91/A88280.c | 4 +- src/world/area_kpa/kpa_95/A8CA80.c | 4 +- src/world/area_kpa/kpa_95/A8CB60.c | 2 +- src/world/area_kzn/kzn_02/kzn_02_3_npc.c | 5 +- src/world/area_kzn/kzn_03/kzn_03_2_npc.c | 2 +- src/world/area_kzn/kzn_03/kzn_03_3_entity.c | 4 +- src/world/area_kzn/kzn_04/kzn_04_2_entity.c | 4 +- src/world/area_kzn/kzn_04/kzn_04_3_npc.c | 2 +- src/world/area_kzn/kzn_06/kzn_06_3_extra.c | 4 +- src/world/area_kzn/kzn_08/kzn_08_2_entity.c | 8 +- src/world/area_kzn/kzn_09/kzn_09_2_entity.c | 4 +- src/world/area_kzn/kzn_09/kzn_09_4_npc.c | 2 +- src/world/area_kzn/kzn_11/kzn_11_1_main.c | 2 +- src/world/area_kzn/kzn_11/kzn_11_3_npc.c | 2 +- src/world/area_kzn/kzn_17/kzn_17_3_npc.c | 2 +- src/world/area_kzn/kzn_17/kzn_17_4_extra.c | 4 +- src/world/area_kzn/kzn_18/kzn_18_1_main.c | 4 +- src/world/area_kzn/kzn_18/kzn_18_2_extra.c | 6 +- src/world/area_kzn/kzn_19/kzn_19_1_main.c | 6 +- src/world/area_kzn/kzn_19/kzn_19_3_npc.c | 2 +- src/world/area_kzn/kzn_20/kzn_20_1_main.c | 4 +- src/world/area_kzn/kzn_20/kzn_20_2_npc.c | 2 +- src/world/area_mac/mac_00/7EAD10.c | 2 +- src/world/area_mac/mac_00/7EB340.c | 8 +- src/world/area_mac/mac_00/7ED280.c | 12 +- src/world/area_mac/mac_01/8017D0.c | 16 +- src/world/area_mac/mac_01/805DD0.c | 4 +- src/world/area_mac/mac_02/8232C0.c | 2 +- src/world/area_mac/mac_02/823BB0.c | 2 +- src/world/area_mac/mac_02/823BF0.c | 8 +- src/world/area_mac/mac_03/831800.c | 2 +- src/world/area_mac/mac_03/831B20.c | 6 +- src/world/area_mac/mac_03/833740.c | 4 +- src/world/area_mac/mac_04/843030.c | 8 +- src/world/area_mac/mac_04/844860.c | 2 +- src/world/area_mac/mac_05/852170.c | 12 +- src/world/area_mac/mac_06/mac_06_1_main.c | 4 +- src/world/area_mgm/mgm_00/mgm_00_1_main.c | 12 +- src/world/area_mgm/mgm_00/mgm_00_2_npc.c | 2 +- src/world/area_mgm/mgm_02/mgm_02_2_npc.c | 4 +- src/world/area_mim/mim.h | 13 + src/world/area_mim/mim_01/mim_01_2_main.c | 2 +- src/world/area_mim/mim_02/mim_02_2_main.c | 2 +- src/world/area_mim/mim_03/mim_03_2_main.c | 2 +- src/world/area_mim/mim_03/mim_03_4_hint.c | 26 +- src/world/area_mim/mim_04/mim_04_2_main.c | 2 +- src/world/area_mim/mim_04/mim_04_4_hint.c | 6 +- src/world/area_mim/mim_05/mim_05_2_main.c | 2 +- src/world/area_mim/mim_06/mim_06_2_main.c | 2 +- src/world/area_mim/mim_06/mim_06_4_hint.c | 44 +-- src/world/area_mim/mim_07/mim_07_2_main.c | 2 +- src/world/area_mim/mim_07/mim_07_4_hint.c | 6 +- src/world/area_mim/mim_08/mim_08_2_main.c | 2 +- src/world/area_mim/mim_09/mim_09_2_main.c | 2 +- src/world/area_mim/mim_11/mim_11_2_main.c | 4 +- src/world/area_nok/nok_01/9C53E0.c | 8 +- src/world/area_nok/nok_02/9D7020.c | 10 +- src/world/area_nok/nok_02/9D7AA0.c | 10 +- src/world/area_nok/nok_02/9DA8F0.c | 8 +- src/world/area_nok/nok_03/9EB7F0.c | 2 +- src/world/area_nok/nok_04/9EEA80.c | 2 +- src/world/area_nok/nok_11/9F4A40.c | 4 +- src/world/area_nok/nok_12/9FA970.c | 2 +- src/world/area_nok/nok_12/9FAAE0.c | 4 +- src/world/area_nok/nok_12/9FAD60.c | 4 +- src/world/area_nok/nok_13/A00600.c | 2 +- src/world/area_nok/nok_14/A029C0.c | 4 +- src/world/area_nok/nok_14/A02A00.c | 4 +- src/world/area_nok/nok_15/A06F00.c | 6 +- src/world/area_obk/obk_01/BBD1A0.c | 4 +- src/world/area_obk/obk_01/BBD980.c | 10 +- src/world/area_obk/obk_02/BC2A90.c | 2 +- src/world/area_obk/obk_03/BC4280.c | 4 +- src/world/area_obk/obk_03/BC43F0.c | 10 +- src/world/area_obk/obk_04/BC7EB0.c | 4 +- src/world/area_obk/obk_05/BCD060.c | 4 +- src/world/area_obk/obk_07/BCEBF0.c | 8 +- src/world/area_obk/obk_07/BCEEB0.c | 2 +- src/world/area_obk/obk_08/BD3870.c | 2 +- src/world/area_omo/omo_02/D9D4D0.c | 4 +- src/world/area_omo/omo_02/D9D510.c | 10 +- src/world/area_omo/omo_03/DA5240.c | 2 +- src/world/area_omo/omo_03/DA5260.c | 2 +- src/world/area_omo/omo_04/DAD400.c | 20 +- src/world/area_omo/omo_04/DAF240.c | 2 +- src/world/area_omo/omo_05/DB22C0.c | 10 +- src/world/area_omo/omo_06/DB7910.c | 2 +- src/world/area_omo/omo_06/DB8180.c | 8 +- src/world/area_omo/omo_07/DBD2B0.c | 10 +- src/world/area_omo/omo_07/DC01D0.c | 12 +- src/world/area_omo/omo_07/DC04D0.c | 2 +- src/world/area_omo/omo_08/DC43D0.c | 2 +- src/world/area_omo/omo_08/DC4C40.c | 2 +- src/world/area_omo/omo_09/DCD3F0.c | 8 +- src/world/area_omo/omo_09/DCD6B0.c | 16 +- src/world/area_omo/omo_09/DD02E0.c | 2 +- src/world/area_omo/omo_10/DD79B0.c | 2 +- src/world/area_omo/omo_11/DDCFC0.c | 2 +- src/world/area_omo/omo_12/DDF310.c | 6 +- src/world/area_omo/omo_12/DDF730.c | 2 +- src/world/area_omo/omo_13/DE2710.c | 8 +- src/world/area_omo/omo_13/DE36C0.c | 8 +- src/world/area_omo/omo_14/DE56B0.c | 2 +- src/world/area_omo/omo_15/DE8770.c | 2 +- src/world/area_omo/omo_16/DEBED0.c | 2 +- src/world/area_omo/omo_17/DEEEA0.c | 2 +- src/world/area_omo/omo_17/DEF400.c | 12 +- src/world/area_osr/osr_00/AAC830.c | 2 +- src/world/area_osr/osr_01/AB0350.c | 10 +- src/world/area_osr/osr_02/AB2170.c | 2 +- src/world/area_osr/osr_02/AB2290.c | 2 +- src/world/area_osr/osr_03/AB6290.c | 2 +- src/world/area_pra/pra_01/D4D040.c | 2 +- src/world/area_pra/pra_01/D4D060.c | 4 +- src/world/area_pra/pra_02/D4FFF0.c | 2 +- src/world/area_pra/pra_02/D50010.c | 14 +- src/world/area_pra/pra_03/D53CB0.c | 2 +- src/world/area_pra/pra_04/D54690.c | 2 +- src/world/area_pra/pra_04/D54840.c | 2 +- src/world/area_pra/pra_05/D55BB0.c | 2 +- src/world/area_pra/pra_05/D55BD0.c | 8 +- src/world/area_pra/pra_09/D58890.c | 2 +- src/world/area_pra/pra_09/D588B0.c | 4 +- src/world/area_pra/pra_10/D5F2B0.c | 2 +- src/world/area_pra/pra_10/D5F2D0.c | 2 +- src/world/area_pra/pra_11/D61500.c | 2 +- src/world/area_pra/pra_11/D61520.c | 8 +- src/world/area_pra/pra_12/D62D10.c | 8 +- src/world/area_pra/pra_13/D645E0.c | 2 +- src/world/area_pra/pra_13/D64600.c | 4 +- src/world/area_pra/pra_14/D67D00.c | 2 +- src/world/area_pra/pra_14/D67D20.c | 8 +- src/world/area_pra/pra_15/D69810.c | 2 +- src/world/area_pra/pra_16/D69B20.c | 2 +- src/world/area_pra/pra_18/D6B620.c | 2 +- src/world/area_pra/pra_19/D6E9B0.c | 2 +- src/world/area_pra/pra_19/D6E9D0.c | 4 +- src/world/area_pra/pra_20/D763A0.c | 2 +- src/world/area_pra/pra_21/D77F20.c | 2 +- src/world/area_pra/pra_22/D78880.c | 2 +- src/world/area_pra/pra_22/D788A0.c | 2 +- src/world/area_pra/pra_27/D799F0.c | 8 +- src/world/area_pra/pra_28/D7B2A0.c | 8 +- src/world/area_pra/pra_29/D7CB50.c | 2 +- src/world/area_pra/pra_31/D7ED80.c | 4 +- src/world/area_pra/pra_31/D7F270.c | 2 +- src/world/area_pra/pra_32/D86A00.c | 2 +- src/world/area_pra/pra_32/D86A20.c | 2 +- src/world/area_pra/pra_33/D896E0.c | 2 +- src/world/area_pra/pra_34/D8B3B0.c | 2 +- src/world/area_pra/pra_34/D8B3D0.c | 4 +- src/world/area_pra/pra_35/D8D250.c | 2 +- src/world/area_pra/pra_35/D8D270.c | 6 +- src/world/area_pra/pra_35/D8FBA0.c | 8 +- src/world/area_pra/pra_37/D92F40.c | 4 +- src/world/area_pra/pra_38/D955F0.c | 2 +- src/world/area_pra/pra_39/D97890.c | 2 +- src/world/area_pra/pra_40/D999B0.c | 2 +- src/world/area_sam/sam_01/CF7E80.c | 16 +- src/world/area_sam/sam_02/D05730.c | 2 +- src/world/area_sam/sam_03/D110C0.c | 2 +- src/world/area_sam/sam_04/D138E0.c | 4 +- src/world/area_sam/sam_05/D187E0.c | 2 +- src/world/area_sam/sam_06/D203E0.c | 12 +- src/world/area_sam/sam_07/D2BD30.c | 8 +- src/world/area_sam/sam_08/D2FC80.c | 2 +- src/world/area_sam/sam_08/D309C0.c | 2 +- src/world/area_sam/sam_09/D362F0.c | 4 +- src/world/area_sam/sam_10/D37800.c | 8 +- src/world/area_sam/sam_10/D37BD0.c | 2 +- src/world/area_sam/sam_11/D3A850.c | 4 +- src/world/area_sam/sam_11/D3A930.c | 4 +- src/world/area_sbk/sbk.h | 4 +- src/world/area_sbk/sbk_00/sbk_00_1_main.c | 2 +- src/world/area_sbk/sbk_01/sbk_01_1_main.c | 2 +- src/world/area_sbk/sbk_02/92A2B0.c | 74 ---- src/world/area_sbk/sbk_02/92A9A0.c | 79 ---- src/world/area_sbk/sbk_02/sbk_02.h | 13 +- src/world/area_sbk/sbk_02/sbk_02_0_header.c | 17 +- src/world/area_sbk/sbk_02/sbk_02_1_music.c | 14 + .../{sbk_02_1_main.c => sbk_02_2_main.c} | 16 +- .../{sbk_02_2_ruins.c => sbk_02_3_ruins.c} | 360 +++++++++--------- .../sbk_02/{sbk_02_3_npc.c => sbk_02_4_npc.c} | 212 +++-------- .../{sbk_02_4_entity.c => sbk_02_5_entity.c} | 0 src/world/area_sbk/sbk_03/sbk_03_1_main.c | 2 +- src/world/area_sbk/sbk_04/sbk_04_1_main.c | 2 +- src/world/area_sbk/sbk_05/sbk_05_1_main.c | 2 +- src/world/area_sbk/sbk_06/sbk_06_1_main.c | 2 +- src/world/area_sbk/sbk_10/sbk_10_1_main.c | 2 +- src/world/area_sbk/sbk_11/sbk_11_1_main.c | 2 +- src/world/area_sbk/sbk_12/sbk_12_1_main.c | 2 +- src/world/area_sbk/sbk_13/sbk_13_1_main.c | 2 +- src/world/area_sbk/sbk_14/sbk_14_1_main.c | 2 +- src/world/area_sbk/sbk_15/sbk_15_1_main.c | 2 +- src/world/area_sbk/sbk_16/sbk_16_1_main.c | 2 +- src/world/area_sbk/sbk_20/sbk_20_1_main.c | 2 +- src/world/area_sbk/sbk_21/sbk_21_1_main.c | 2 +- src/world/area_sbk/sbk_22/sbk_22_1_main.c | 2 +- src/world/area_sbk/sbk_23/sbk_23_1_main.c | 2 +- src/world/area_sbk/sbk_24/sbk_24_1_main.c | 2 +- src/world/area_sbk/sbk_25/sbk_25_1_main.c | 2 +- src/world/area_sbk/sbk_26/sbk_26_1_main.c | 2 +- src/world/area_sbk/sbk_30/93F5B0.c | 85 ----- src/world/area_sbk/sbk_30/sbk_30.h | 5 + src/world/area_sbk/sbk_30/sbk_30_0_header.c | 28 ++ src/world/area_sbk/sbk_30/sbk_30_1_music.c | 15 + .../{sbk_30_1_main.c => sbk_30_2_main.c} | 61 +-- .../sbk_30/{sbk_30_2_npc.c => sbk_30_3_npc.c} | 41 +- ...{sbk_30_3_foliage.c => sbk_30_4_foliage.c} | 0 src/world/area_sbk/sbk_31/sbk_31_1_main.c | 2 +- src/world/area_sbk/sbk_32/sbk_32_1_main.c | 2 +- src/world/area_sbk/sbk_33/sbk_33_2_main.c | 2 +- src/world/area_sbk/sbk_34/sbk_34_1_main.c | 2 +- src/world/area_sbk/sbk_34/sbk_34_2_npc.c | 2 +- src/world/area_sbk/sbk_35/sbk_35_1_main.c | 2 +- src/world/area_sbk/sbk_36/sbk_36_1_main.c | 2 +- src/world/area_sbk/sbk_40/sbk_40_1_main.c | 2 +- src/world/area_sbk/sbk_41/sbk_41_1_main.c | 2 +- src/world/area_sbk/sbk_42/sbk_42_1_main.c | 2 +- src/world/area_sbk/sbk_43/sbk_43_1_main.c | 2 +- src/world/area_sbk/sbk_44/sbk_44_1_main.c | 2 +- src/world/area_sbk/sbk_45/sbk_45_1_main.c | 2 +- src/world/area_sbk/sbk_46/sbk_46_1_main.c | 2 +- src/world/area_sbk/sbk_50/sbk_50_1_main.c | 2 +- src/world/area_sbk/sbk_51/sbk_51_1_main.c | 2 +- src/world/area_sbk/sbk_52/sbk_52_1_main.c | 2 +- src/world/area_sbk/sbk_53/sbk_53_1_main.c | 2 +- src/world/area_sbk/sbk_54/sbk_54_1_main.c | 2 +- src/world/area_sbk/sbk_55/sbk_55_1_main.c | 2 +- src/world/area_sbk/sbk_56/sbk_56_1_main.c | 2 +- src/world/area_sbk/sbk_56/sbk_56_2_entity.c | 4 +- src/world/area_sbk/sbk_60/sbk_60_1_main.c | 2 +- src/world/area_sbk/sbk_61/sbk_61_1_main.c | 2 +- src/world/area_sbk/sbk_62/sbk_62_1_main.c | 2 +- src/world/area_sbk/sbk_63/sbk_63_1_main.c | 2 +- src/world/area_sbk/sbk_64/sbk_64_1_main.c | 2 +- src/world/area_sbk/sbk_65/sbk_65_1_main.c | 2 +- src/world/area_sbk/sbk_66/sbk_66_1_main.c | 2 +- src/world/area_tik/tik_01/8694B0.c | 2 +- src/world/area_tik/tik_01/869AA0.c | 4 +- src/world/area_tik/tik_02/86CA50.c | 8 +- src/world/area_tik/tik_02/86CD10.c | 2 +- src/world/area_tik/tik_03/86EB00.c | 2 +- src/world/area_tik/tik_03/86F0F0.c | 2 +- src/world/area_tik/tik_04/871A30.c | 2 +- src/world/area_tik/tik_04/872020.c | 4 +- src/world/area_tik/tik_05/8750D0.c | 12 +- src/world/area_tik/tik_06/876EE0.c | 2 +- src/world/area_tik/tik_06/8774D0.c | 2 +- src/world/area_tik/tik_07/879BE0.c | 4 +- src/world/area_tik/tik_07/87AC00.c | 4 +- src/world/area_tik/tik_08/87EDF0.c | 2 +- src/world/area_tik/tik_08/87F3E0.c | 4 +- src/world/area_tik/tik_08/87F820.c | 2 +- src/world/area_tik/tik_09/8821C0.c | 2 +- src/world/area_tik/tik_09/8827B0.c | 4 +- src/world/area_tik/tik_09/882BF0.c | 2 +- src/world/area_tik/tik_10/8866D0.c | 4 +- src/world/area_tik/tik_12/888BD0.c | 2 +- src/world/area_tik/tik_12/8891C0.c | 12 +- src/world/area_tik/tik_12/88A530.c | 4 +- src/world/area_tik/tik_14/88D600.c | 2 +- src/world/area_tik/tik_14/88DBF0.c | 2 +- src/world/area_tik/tik_15/88FBA0.c | 2 +- src/world/area_tik/tik_15/890190.c | 6 +- src/world/area_tik/tik_17/892A50.c | 2 +- src/world/area_tik/tik_17/893790.c | 2 +- src/world/area_tik/tik_18/8959F0.c | 2 +- src/world/area_tik/tik_19/8975E0.c | 2 +- src/world/area_tik/tik_19/897BD0.c | 2 +- src/world/area_tik/tik_20/89A350.c | 4 +- src/world/area_tik/tik_20/89ACB0.c | 2 +- src/world/area_tik/tik_21/89D7A0.c | 4 +- src/world/area_tik/tik_22/89FEF0.c | 4 +- src/world/area_tik/tik_23/8A23D0.c | 4 +- src/world/area_tik/tik_23/8A2D30.c | 2 +- src/world/area_tik/tik_24/8A5DE0.c | 4 +- src/world/area_tik/tik_25/8A7F80.c | 2 +- src/world/area_tik/tik_25/8A8600.c | 2 +- src/world/area_trd/trd_00/trd_00_1_main.c | 6 +- src/world/area_trd/trd_00/trd_00_3_npc.c | 2 +- src/world/area_trd/trd_01/trd_01_1_main.c | 4 +- src/world/area_trd/trd_01/trd_01_2_entity.c | 4 +- src/world/area_trd/trd_02/trd_02_1_main.c | 4 +- src/world/area_trd/trd_02/trd_02_2_entity.c | 4 +- src/world/area_trd/trd_03/trd_03_1_main.c | 20 +- src/world/area_trd/trd_03/trd_03_4_puzzle.c | 2 +- src/world/area_trd/trd_04/trd_04_1_main.c | 6 +- src/world/area_trd/trd_04/trd_04_2_entity.c | 6 +- src/world/area_trd/trd_05/trd_05_1_main.c | 12 +- src/world/area_trd/trd_05/trd_05_3_trap.c | 2 +- src/world/area_trd/trd_06/trd_06_1_main.c | 10 +- .../area_trd/trd_06/trd_06_6_party_image.c | 2 +- src/world/area_trd/trd_08/trd_08_1_main.c | 2 +- src/world/area_trd/trd_08/trd_08_3_npc.c | 2 +- src/world/area_trd/trd_10/trd_10_1_main.c | 2 +- src/world/area_tst/tst_03/tst_03_1_main.c | 4 +- src/world/area_tst/tst_13/tst_13_1_main.c | 4 +- src/world/common/atomic/Chest.inc.c | 8 +- src/world/common/atomic/Chest.old.inc.c | 6 +- ...m.data.inc.c => CreateDarkness.data.inc.c} | 0 .../{DarkRoom.inc.c => CreateDarkness.inc.c} | 0 .../common/atomic/ItemChoice_PartA.inc.c | 4 +- src/world/common/atomic/LetterChoice.inc.c | 133 +------ src/world/common/atomic/WhaleAnim.inc.c | 2 +- src/world/common/atomic/kzn_SpinyTromp.inc.c | 12 +- src/world/common/complete/GiveReward.inc.c | 38 +- src/world/common/complete/KeyItemChoice.inc.c | 58 ++- .../common/complete/NormalItemChoice.inc.c | 104 +++++ .../common/enemy/{ => ai}/BulletBillAI.inc.c | 0 src/world/common/enemy/{ => ai}/CleftAI.inc.c | 0 .../enemy/{ => ai}/ClubbaNappingAI.inc.c | 2 +- .../enemy/{ => ai}/ClubbaPatrolAI.inc.c | 4 +- .../common/enemy/{ => ai}/FireBarAI.inc.c | 0 .../common/enemy/{ => ai}/FlyingAI.inc.c | 0 .../enemy/{ => ai}/FlyingMagikoopaAI.inc.c | 2 +- .../enemy/{ => ai}/FlyingNoAttackAI.inc.c | 0 .../common/enemy/{ => ai}/GrooveGuyAI.inc.c | 0 .../common/enemy/{ => ai}/HoppingAI.inc.c | 0 .../common/enemy/{ => ai}/KoopaPatrolAI.inc.c | 4 +- .../common/enemy/{ => ai}/LakituAI.inc.c | 2 +- .../common/enemy/{ => ai}/MagikoopaAI.inc.c | 2 +- .../enemy/{ => ai}/MagikoopaSpellAI.inc.c | 0 .../common/enemy/{ => ai}/MeleeHitbox.inc.c | 0 .../common/enemy/{ => ai}/MontyMoleAI.inc.c | 2 +- .../common/enemy/{ => ai}/ParatroopaAI.inc.c | 2 +- .../enemy/{ => ai}/PatrolNoAttackAI.inc.c | 2 +- .../enemy/{ => ai}/PiranhaPlantAI.inc.c | 2 +- .../enemy/{ => ai}/ProjectileHitbox.inc.c | 0 .../enemy/{ => ai}/RangedAttackAI.inc.c | 2 +- .../common/enemy/{ => ai}/SentinelAI.inc.c | 2 +- .../enemy/{ => ai}/ShyGuyPatrolAI.inc.c | 2 +- .../enemy/{ => ai}/ShyGuyWanderAI.inc.c | 0 .../common/enemy/{ => ai}/SpearGuyAI.inc.c | 2 +- src/world/common/enemy/{ => ai}/SpinyAI.inc.c | 2 +- .../enemy/{ => ai}/States_PatrolAI.inc.c | 0 .../enemy/{ => ai}/States_TackleAI.inc.c | 0 .../common/enemy/{ => ai}/StationaryAI.inc.c | 0 .../common/enemy/{ => ai}/StoneChompAI.inc.c | 2 +- .../common/enemy/{ => ai}/TackleAI.inc.c | 2 +- .../common/enemy/{ => ai}/UnkFloAI.inc.c | 0 .../common/enemy/{ => ai}/WanderMeleeAI.inc.c | 2 +- .../enemy/complete/Bobomb_Stationary.inc.c | 2 +- src/world/common/enemy/complete/Bzzap.inc.c | 2 +- src/world/common/enemy/complete/Cleft.inc.c | 2 +- .../enemy/complete/ForestFuzzy.inc copy.c | 2 +- .../common/enemy/complete/ForestFuzzy.inc.c | 2 +- .../common/enemy/complete/HyperCleft.inc.c | 2 +- .../enemy/complete/HyperGoomba_Patrol.inc.c | 2 +- .../enemy/complete/HyperParagoomba.inc.c | 2 +- .../enemy/complete/KoopaTroopa_Patrol.inc.c | 2 +- .../enemy/complete/KoopaTroopa_Wander.inc.c | 2 +- .../common/enemy/complete/LavaBubble.inc.c | 4 +- .../complete/MontyMole_StoneThrower.inc.c | 6 +- .../common/enemy/complete/Paratroopa.inc.c | 2 +- .../common/enemy/complete/PiranhaPlant.inc.c | 2 +- src/world/common/enemy/complete/Pokey.inc.c | 2 +- .../common/enemy/complete/PutridPiranha.inc.c | 2 +- .../common/enemy/complete/SpikeTop.inc.c | 4 +- .../common/{atomic => entity}/Pipe.data.inc.c | 2 +- .../common/{atomic => entity}/Pipe.inc.c | 10 +- .../common/{atomic => entity}/Pipe.inc.h | 0 .../common/{atomic => entity}/PipeData.inc.c | 4 +- .../{atomic => entity}/SuperBlock.data.inc.c | 0 .../{atomic => entity}/SuperBlock.inc.c | 38 +- .../{atomic => entity}/SuperBlock.inc.h | 0 src/world/common/npc/Boo_Patrol.inc.c | 2 +- .../{ => todo}/AddPlayerHandsOffset.inc.c | 0 .../{ => todo}/AwaitPlayerNearNpc.inc.c | 0 .../{ => todo}/CheckPartnerFlags1000.inc.c | 0 .../common/{ => todo}/DeadUnkFunc1.inc.c | 0 .../{ => todo}/GetEncounterEnemyIsOwner.inc.c | 0 .../common/{ => todo}/GetEntityPosition.inc.c | 0 .../common/{ => todo}/GetFloorCollider.inc.c | 0 .../common/{ => todo}/GetItemEmptyCount.inc.c | 0 src/world/common/{ => todo}/GetItemName.inc.c | 0 .../{ => todo}/GetLeftRightPoints.inc.c | 0 .../{ => todo}/GetNpcCollisionHeight.inc.c | 0 .../common/{ => todo}/GetPeachDisguise.inc.c | 0 .../common/{ => todo}/GetPlayerCoins.inc.c | 0 .../{ => todo}/HeartPlant_SpawnHeart.inc.c | 0 .../{ => todo}/IsBerserkerEquipped.inc.c | 0 .../{ => todo}/IsHammerMaxCharged.inc.c | 0 src/world/common/{ => todo}/IsItemBadge.inc.c | 0 .../common/{ => todo}/IsJumpMaxCharged.inc.c | 0 .../common/{ => todo}/IsRightOnEquipped.inc.c | 0 .../common/{ => todo}/LetterDelivery.inc.c | 0 .../common/{ => todo}/LoadPartyImage.inc.c | 0 src/world/common/{ => todo}/PullVine.inc.c | 0 .../common/{ => todo}/RemovePadlock.inc.c | 0 .../common/{ => todo}/Set80151310_0.inc.c | 0 .../{ => todo}/SetCamera0Flag1000.inc.c | 0 .../{ => todo}/SetCamera0MoveFlag1.inc.c | 0 .../common/{ => todo}/SetEntityPosition.inc.c | 0 .../{ => todo}/SetEntityPositionF.inc.c | 0 .../{ => todo}/SetForeverForestFog.inc.c | 0 .../{ => todo}/SetGameStatusUnk84_1.inc.c | 0 src/world/common/{ => todo}/SetNpcB5_3.inc.c | 0 .../{ => todo}/SetPlayerSpriteSet2.inc.c | 0 .../{ => todo}/SomeItemEntityFunc.inc.c | 0 .../common/{ => todo}/SpawnSunEffect.inc.c | 0 .../{ => todo}/SpinyTromp_CheckDist.inc.c | 0 .../{ => todo}/StarSpiritEffectFunc.inc.c | 0 src/world/common/{ => todo}/StashVars.inc.c | 0 .../common/{ => todo}/SwitchToPartner.inc.c | 0 .../common/{ => todo}/SyncStatusMenu.inc.c | 0 .../common/{ => todo}/UnkAngleFunc004.inc.c | 0 .../common/{ => todo}/UnkAngleFunc005.inc.c | 0 .../common/{ => todo}/UnkDistFunc2.inc.c | 0 .../common/{ => todo}/UnkFloatFunc001.inc.c | 0 .../common/{ => todo}/UnkFloatFuncAbs.inc.c | 0 src/world/common/{ => todo}/UnkFoldFunc.inc.c | 0 src/world/common/{ => todo}/UnkFunc001.inc.c | 0 src/world/common/{ => todo}/UnkFunc1.inc.c | 0 src/world/common/{ => todo}/UnkFunc11.inc.c | 0 src/world/common/{ => todo}/UnkFunc12.inc.c | 0 src/world/common/{ => todo}/UnkFunc42.inc.c | 0 src/world/common/{ => todo}/UnkFunc43.inc.c | 0 src/world/common/{ => todo}/UnkFunc44.inc.c | 0 src/world/common/{ => todo}/UnkFunc46.inc.c | 0 src/world/common/{ => todo}/UnkFunc48.inc.c | 0 src/world/common/{ => todo}/UnkFunc49.inc.c | 0 src/world/common/{ => todo}/UnkFunc50.inc.c | 0 src/world/common/{ => todo}/UnkFunc51.inc.c | 0 src/world/common/{ => todo}/UnkFunc52.inc.c | 0 src/world/common/{ => todo}/UnkFunc56.inc.c | 0 src/world/common/{ => todo}/UnkFunc62.inc.c | 0 .../common/{ => todo}/UnkGooberFunc.inc.c | 0 .../common/{ => todo}/UnkGooberFunc50.inc.c | 0 .../common/{ => todo}/UnkMachiFunc.inc.c | 0 .../common/{ => todo}/UnkMoveFunc1.inc.c | 0 .../common/{ => todo}/UnkMoveFunc2.inc.c | 0 .../common/{ => todo}/UnkMoveFunc3.inc.c | 0 .../common/{ => todo}/UnkNpcPosFunc.inc.c | 0 .../{ => todo}/UnkPartnerPosFuncs.inc.c | 0 src/world/common/{ => todo}/UnkPosFunc2.inc.c | 0 .../common/{ => todo}/UnkPositionFunc.inc.c | 0 .../common/{ => todo}/UnkShadowFunc001.inc.c | 0 src/world/common/{ => todo}/UnkVtxFunc.inc.c | 0 .../{ => todo}/UnsetCamera0Flag1000.inc.c | 0 .../{ => todo}/UnsetCamera0MoveFlag1.inc.c | 0 .../{ => todo}/WaitForPlayerToLand.inc.c | 0 src/world/common/{ => todo}/clouds.inc.c | 0 src/world/world.c | 29 +- .../data/world/area_sbk/sbk_02/92AEB0.data.s | 6 - .../data/world/area_sbk/sbk_02/92AFF0.data.s | 21 - .../data/world/area_sbk/sbk_02/92B500.data.s | 66 ---- .../data/world/area_sbk/sbk_02/92E220.data.s | 48 --- .../data/world/area_sbk/sbk_02/92F830.data.s | 6 - .../data/world/area_sbk/sbk_30/940DC0.data.s | 144 ------- .../sbk_02/92A9A0/func_8024091C_92ABCC.s | 28 -- .../sbk_30/93F5B0/func_80241120_9406D0.s | 28 -- .../sbk_30/93F5B0/func_80241174_940724.s | 18 - ver/us/splat.yaml | 30 +- ver/us/symbol_addrs.txt | 4 +- 781 files changed, 1988 insertions(+), 2630 deletions(-) delete mode 100644 src/world/area_sbk/sbk_02/92A2B0.c delete mode 100644 src/world/area_sbk/sbk_02/92A9A0.c create mode 100644 src/world/area_sbk/sbk_02/sbk_02_1_music.c rename src/world/area_sbk/sbk_02/{sbk_02_1_main.c => sbk_02_2_main.c} (87%) rename src/world/area_sbk/sbk_02/{sbk_02_2_ruins.c => sbk_02_3_ruins.c} (65%) rename src/world/area_sbk/sbk_02/{sbk_02_3_npc.c => sbk_02_4_npc.c} (72%) rename src/world/area_sbk/sbk_02/{sbk_02_4_entity.c => sbk_02_5_entity.c} (100%) delete mode 100644 src/world/area_sbk/sbk_30/93F5B0.c create mode 100644 src/world/area_sbk/sbk_30/sbk_30_0_header.c create mode 100644 src/world/area_sbk/sbk_30/sbk_30_1_music.c rename src/world/area_sbk/sbk_30/{sbk_30_1_main.c => sbk_30_2_main.c} (66%) rename src/world/area_sbk/sbk_30/{sbk_30_2_npc.c => sbk_30_3_npc.c} (94%) rename src/world/area_sbk/sbk_30/{sbk_30_3_foliage.c => sbk_30_4_foliage.c} (100%) rename src/world/common/atomic/{DarkRoom.data.inc.c => CreateDarkness.data.inc.c} (100%) rename src/world/common/atomic/{DarkRoom.inc.c => CreateDarkness.inc.c} (100%) create mode 100644 src/world/common/complete/NormalItemChoice.inc.c rename src/world/common/enemy/{ => ai}/BulletBillAI.inc.c (100%) rename src/world/common/enemy/{ => ai}/CleftAI.inc.c (100%) rename src/world/common/enemy/{ => ai}/ClubbaNappingAI.inc.c (99%) rename src/world/common/enemy/{ => ai}/ClubbaPatrolAI.inc.c (97%) rename src/world/common/enemy/{ => ai}/FireBarAI.inc.c (100%) rename src/world/common/enemy/{ => ai}/FlyingAI.inc.c (100%) rename src/world/common/enemy/{ => ai}/FlyingMagikoopaAI.inc.c (99%) rename src/world/common/enemy/{ => ai}/FlyingNoAttackAI.inc.c (100%) rename src/world/common/enemy/{ => ai}/GrooveGuyAI.inc.c (100%) rename src/world/common/enemy/{ => ai}/HoppingAI.inc.c (100%) rename src/world/common/enemy/{ => ai}/KoopaPatrolAI.inc.c (96%) rename src/world/common/enemy/{ => ai}/LakituAI.inc.c (99%) rename src/world/common/enemy/{ => ai}/MagikoopaAI.inc.c (99%) rename src/world/common/enemy/{ => ai}/MagikoopaSpellAI.inc.c (100%) rename src/world/common/enemy/{ => ai}/MeleeHitbox.inc.c (100%) rename src/world/common/enemy/{ => ai}/MontyMoleAI.inc.c (99%) rename src/world/common/enemy/{ => ai}/ParatroopaAI.inc.c (99%) rename src/world/common/enemy/{ => ai}/PatrolNoAttackAI.inc.c (98%) rename src/world/common/enemy/{ => ai}/PiranhaPlantAI.inc.c (90%) rename src/world/common/enemy/{ => ai}/ProjectileHitbox.inc.c (100%) rename src/world/common/enemy/{ => ai}/RangedAttackAI.inc.c (98%) rename src/world/common/enemy/{ => ai}/SentinelAI.inc.c (99%) rename src/world/common/enemy/{ => ai}/ShyGuyPatrolAI.inc.c (98%) rename src/world/common/enemy/{ => ai}/ShyGuyWanderAI.inc.c (100%) rename src/world/common/enemy/{ => ai}/SpearGuyAI.inc.c (99%) rename src/world/common/enemy/{ => ai}/SpinyAI.inc.c (99%) rename src/world/common/enemy/{ => ai}/States_PatrolAI.inc.c (100%) rename src/world/common/enemy/{ => ai}/States_TackleAI.inc.c (100%) rename src/world/common/enemy/{ => ai}/StationaryAI.inc.c (100%) rename src/world/common/enemy/{ => ai}/StoneChompAI.inc.c (98%) rename src/world/common/enemy/{ => ai}/TackleAI.inc.c (98%) rename src/world/common/enemy/{ => ai}/UnkFloAI.inc.c (100%) rename src/world/common/enemy/{ => ai}/WanderMeleeAI.inc.c (98%) rename src/world/common/{atomic => entity}/Pipe.data.inc.c (98%) rename src/world/common/{atomic => entity}/Pipe.inc.c (86%) rename src/world/common/{atomic => entity}/Pipe.inc.h (100%) rename src/world/common/{atomic => entity}/PipeData.inc.c (97%) rename src/world/common/{atomic => entity}/SuperBlock.data.inc.c (100%) rename src/world/common/{atomic => entity}/SuperBlock.inc.c (90%) rename src/world/common/{atomic => entity}/SuperBlock.inc.h (100%) rename src/world/common/{ => todo}/AddPlayerHandsOffset.inc.c (100%) rename src/world/common/{ => todo}/AwaitPlayerNearNpc.inc.c (100%) rename src/world/common/{ => todo}/CheckPartnerFlags1000.inc.c (100%) rename src/world/common/{ => todo}/DeadUnkFunc1.inc.c (100%) rename src/world/common/{ => todo}/GetEncounterEnemyIsOwner.inc.c (100%) rename src/world/common/{ => todo}/GetEntityPosition.inc.c (100%) rename src/world/common/{ => todo}/GetFloorCollider.inc.c (100%) rename src/world/common/{ => todo}/GetItemEmptyCount.inc.c (100%) rename src/world/common/{ => todo}/GetItemName.inc.c (100%) rename src/world/common/{ => todo}/GetLeftRightPoints.inc.c (100%) rename src/world/common/{ => todo}/GetNpcCollisionHeight.inc.c (100%) rename src/world/common/{ => todo}/GetPeachDisguise.inc.c (100%) rename src/world/common/{ => todo}/GetPlayerCoins.inc.c (100%) rename src/world/common/{ => todo}/HeartPlant_SpawnHeart.inc.c (100%) rename src/world/common/{ => todo}/IsBerserkerEquipped.inc.c (100%) rename src/world/common/{ => todo}/IsHammerMaxCharged.inc.c (100%) rename src/world/common/{ => todo}/IsItemBadge.inc.c (100%) rename src/world/common/{ => todo}/IsJumpMaxCharged.inc.c (100%) rename src/world/common/{ => todo}/IsRightOnEquipped.inc.c (100%) rename src/world/common/{ => todo}/LetterDelivery.inc.c (100%) rename src/world/common/{ => todo}/LoadPartyImage.inc.c (100%) rename src/world/common/{ => todo}/PullVine.inc.c (100%) rename src/world/common/{ => todo}/RemovePadlock.inc.c (100%) rename src/world/common/{ => todo}/Set80151310_0.inc.c (100%) rename src/world/common/{ => todo}/SetCamera0Flag1000.inc.c (100%) rename src/world/common/{ => todo}/SetCamera0MoveFlag1.inc.c (100%) rename src/world/common/{ => todo}/SetEntityPosition.inc.c (100%) rename src/world/common/{ => todo}/SetEntityPositionF.inc.c (100%) rename src/world/common/{ => todo}/SetForeverForestFog.inc.c (100%) rename src/world/common/{ => todo}/SetGameStatusUnk84_1.inc.c (100%) rename src/world/common/{ => todo}/SetNpcB5_3.inc.c (100%) rename src/world/common/{ => todo}/SetPlayerSpriteSet2.inc.c (100%) rename src/world/common/{ => todo}/SomeItemEntityFunc.inc.c (100%) rename src/world/common/{ => todo}/SpawnSunEffect.inc.c (100%) rename src/world/common/{ => todo}/SpinyTromp_CheckDist.inc.c (100%) rename src/world/common/{ => todo}/StarSpiritEffectFunc.inc.c (100%) rename src/world/common/{ => todo}/StashVars.inc.c (100%) rename src/world/common/{ => todo}/SwitchToPartner.inc.c (100%) rename src/world/common/{ => todo}/SyncStatusMenu.inc.c (100%) rename src/world/common/{ => todo}/UnkAngleFunc004.inc.c (100%) rename src/world/common/{ => todo}/UnkAngleFunc005.inc.c (100%) rename src/world/common/{ => todo}/UnkDistFunc2.inc.c (100%) rename src/world/common/{ => todo}/UnkFloatFunc001.inc.c (100%) rename src/world/common/{ => todo}/UnkFloatFuncAbs.inc.c (100%) rename src/world/common/{ => todo}/UnkFoldFunc.inc.c (100%) rename src/world/common/{ => todo}/UnkFunc001.inc.c (100%) rename src/world/common/{ => todo}/UnkFunc1.inc.c (100%) rename src/world/common/{ => todo}/UnkFunc11.inc.c (100%) rename src/world/common/{ => todo}/UnkFunc12.inc.c (100%) rename src/world/common/{ => todo}/UnkFunc42.inc.c (100%) rename src/world/common/{ => todo}/UnkFunc43.inc.c (100%) rename src/world/common/{ => todo}/UnkFunc44.inc.c (100%) rename src/world/common/{ => todo}/UnkFunc46.inc.c (100%) rename src/world/common/{ => todo}/UnkFunc48.inc.c (100%) rename src/world/common/{ => todo}/UnkFunc49.inc.c (100%) rename src/world/common/{ => todo}/UnkFunc50.inc.c (100%) rename src/world/common/{ => todo}/UnkFunc51.inc.c (100%) rename src/world/common/{ => todo}/UnkFunc52.inc.c (100%) rename src/world/common/{ => todo}/UnkFunc56.inc.c (100%) rename src/world/common/{ => todo}/UnkFunc62.inc.c (100%) rename src/world/common/{ => todo}/UnkGooberFunc.inc.c (100%) rename src/world/common/{ => todo}/UnkGooberFunc50.inc.c (100%) rename src/world/common/{ => todo}/UnkMachiFunc.inc.c (100%) rename src/world/common/{ => todo}/UnkMoveFunc1.inc.c (100%) rename src/world/common/{ => todo}/UnkMoveFunc2.inc.c (100%) rename src/world/common/{ => todo}/UnkMoveFunc3.inc.c (100%) rename src/world/common/{ => todo}/UnkNpcPosFunc.inc.c (100%) rename src/world/common/{ => todo}/UnkPartnerPosFuncs.inc.c (100%) rename src/world/common/{ => todo}/UnkPosFunc2.inc.c (100%) rename src/world/common/{ => todo}/UnkPositionFunc.inc.c (100%) rename src/world/common/{ => todo}/UnkShadowFunc001.inc.c (100%) rename src/world/common/{ => todo}/UnkVtxFunc.inc.c (100%) rename src/world/common/{ => todo}/UnsetCamera0Flag1000.inc.c (100%) rename src/world/common/{ => todo}/UnsetCamera0MoveFlag1.inc.c (100%) rename src/world/common/{ => todo}/WaitForPlayerToLand.inc.c (100%) rename src/world/common/{ => todo}/clouds.inc.c (100%) delete mode 100644 ver/us/asm/data/world/area_sbk/sbk_02/92AEB0.data.s delete mode 100644 ver/us/asm/data/world/area_sbk/sbk_02/92AFF0.data.s delete mode 100644 ver/us/asm/data/world/area_sbk/sbk_02/92B500.data.s delete mode 100644 ver/us/asm/data/world/area_sbk/sbk_02/92E220.data.s delete mode 100644 ver/us/asm/data/world/area_sbk/sbk_02/92F830.data.s delete mode 100644 ver/us/asm/data/world/area_sbk/sbk_30/940DC0.data.s delete mode 100644 ver/us/asm/nonmatchings/world/area_sbk/sbk_02/92A9A0/func_8024091C_92ABCC.s delete mode 100644 ver/us/asm/nonmatchings/world/area_sbk/sbk_30/93F5B0/func_80241120_9406D0.s delete mode 100644 ver/us/asm/nonmatchings/world/area_sbk/sbk_30/93F5B0/func_80241174_940724.s diff --git a/include/enums.h b/include/enums.h index a3a9af1e80..d8570a06fd 100644 --- a/include/enums.h +++ b/include/enums.h @@ -1933,7 +1933,8 @@ enum ItemIDs { enum GotItemType { ITEM_TYPE_CONSUMABLE = 0, ITEM_TYPE_KEY = 1, - ITEM_TYPE_BADGE = 2 + ITEM_TYPE_BADGE = 2, + ITEM_TYPE_STAR_PIECE = 3, }; enum ItemPickupFlags { diff --git a/src/EA0C10.c b/src/EA0C10.c index 258717b8ac..176db675cc 100644 --- a/src/EA0C10.c +++ b/src/EA0C10.c @@ -12,7 +12,7 @@ extern s32 EA0C10_D_802466D0[]; void func_8004D8E0(DeadEnemy*); -#include "world/common/enemy/WanderMeleeAI.inc.c" +#include "world/common/enemy/ai/WanderMeleeAI.inc.c" #include "world/common/enemy/wip/PiranhaPlantAI_00.inc.c" #include "world/common/enemy/wip/PiranhaPlantAI_01.inc.c" #include "world/common/enemy/wip/PiranhaPlantAI_10.inc.c" @@ -22,17 +22,17 @@ void func_8004D8E0(DeadEnemy*); #include "world/common/enemy/wip/PiranhaPlantAI_14.inc.c" #include "world/common/enemy/wip/Dead_PiranhaPlantAI_Main.inc.c" -#include "world/common/enemy/TackleAI.inc.c" +#include "world/common/enemy/ai/TackleAI.inc.c" -#include "world/common/AwaitPlayerNearNpc.inc.c" +#include "world/common/todo/AwaitPlayerNearNpc.inc.c" -#include "world/common/StashVars.inc.c" +#include "world/common/todo/StashVars.inc.c" -#include "world/common/GetItemName.inc.c" +#include "world/common/todo/GetItemName.inc.c" -#include "world/common/GetNpcCollisionHeight.inc.c" +#include "world/common/todo/GetNpcCollisionHeight.inc.c" -#include "world/common/AddPlayerHandsOffset.inc.c" +#include "world/common/todo/AddPlayerHandsOffset.inc.c" // Requires data migration #ifdef NON_MATCHING @@ -89,4 +89,4 @@ ApiStatus func_80242A4C_EA334C(Evt* script, s32 isInitialCall) { } extern s32 N(LetterDelivery_SavedNpcAnim); -#include "world/common/LetterDelivery.inc.c" +#include "world/common/todo/LetterDelivery.inc.c" diff --git a/src/EA36E0.c b/src/EA36E0.c index 8bc19b7ec2..9c267a42af 100644 --- a/src/EA36E0.c +++ b/src/EA36E0.c @@ -22,14 +22,14 @@ ApiStatus N(GetActingPartner)(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -#include "world/common/UnkFunc46.inc.c" +#include "world/common/todo/UnkFunc46.inc.c" -#include "world/common/SpinyTromp_CheckDist.inc.c" +#include "world/common/todo/SpinyTromp_CheckDist.inc.c" -#include "world/common/UnkFunc48.inc.c" +#include "world/common/todo/UnkFunc48.inc.c" -#include "world/common/UnkFunc49.inc.c" +#include "world/common/todo/UnkFunc49.inc.c" -#include "world/common/UnkFunc50.inc.c" +#include "world/common/todo/UnkFunc50.inc.c" -#include "world/common/UnkFunc51.inc.c" +#include "world/common/todo/UnkFunc51.inc.c" diff --git a/src/EA7320.c b/src/EA7320.c index 4876d8da64..fb9cef2c99 100644 --- a/src/EA7320.c +++ b/src/EA7320.c @@ -3,9 +3,9 @@ #define NAMESPACE EA7320 -#include "world/common/SetCamera0Flag1000.inc.c" +#include "world/common/todo/SetCamera0Flag1000.inc.c" -#include "world/common/UnsetCamera0Flag1000.inc.c" +#include "world/common/todo/UnsetCamera0Flag1000.inc.c" ApiStatus func_80240388_EA7358(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; diff --git a/src/EA8AE0.c b/src/EA8AE0.c index 9926902520..67f5dcb752 100644 --- a/src/EA8AE0.c +++ b/src/EA8AE0.c @@ -16,7 +16,7 @@ void func_8012DFE8(s32, UNK_FUN_ARG); #include "world/common/atomic/TexturePan.inc.c" -#include "world/common/StarSpiritEffectFunc.inc.c" +#include "world/common/todo/StarSpiritEffectFunc.inc.c" static char* N(exit_str_0) = "kmr_23"; static char* N(exit_str_1) = "kzn_18"; @@ -78,13 +78,13 @@ ApiStatus func_8024140C_EA9EEC(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -#include "world/common/StashVars.inc.c" +#include "world/common/todo/StashVars.inc.c" -#include "world/common/GetItemName.inc.c" +#include "world/common/todo/GetItemName.inc.c" -#include "world/common/GetNpcCollisionHeight.inc.c" +#include "world/common/todo/GetNpcCollisionHeight.inc.c" -#include "world/common/AddPlayerHandsOffset.inc.c" +#include "world/common/todo/AddPlayerHandsOffset.inc.c" #ifdef NON_MATCHING ApiStatus func_802417AC_EAA28C(Evt* script, s32 isInitialCall) { @@ -129,6 +129,6 @@ ApiStatus func_80241838_EAA318(Evt* script, s32 isInitialCall) { } extern s32 N(LetterDelivery_SavedNpcAnim); -#include "world/common/LetterDelivery.inc.c" +#include "world/common/todo/LetterDelivery.inc.c" INCLUDE_ASM(s32, "EA8AE0", func_80241BC0_EAA6A0); diff --git a/src/EB1170.c b/src/EB1170.c index f4f277693d..2784dfd022 100644 --- a/src/EB1170.c +++ b/src/EB1170.c @@ -12,13 +12,13 @@ extern s32 EB1170_D_802442D0[]; extern s32 EB1170_LetterDelivery_SavedNpcAnim; extern s32 D_800B8DEC; -#include "world/common/StashVars.inc.c" +#include "world/common/todo/StashVars.inc.c" -#include "world/common/GetItemName.inc.c" +#include "world/common/todo/GetItemName.inc.c" -#include "world/common/GetNpcCollisionHeight.inc.c" +#include "world/common/todo/GetNpcCollisionHeight.inc.c" -#include "world/common/AddPlayerHandsOffset.inc.c" +#include "world/common/todo/AddPlayerHandsOffset.inc.c" // Needs data migrated #ifdef NON_MATCHING @@ -67,7 +67,7 @@ ApiStatus func_802406E0_EB1540(Evt* script, s32 isInitialCall) { } extern s32 N(LetterDelivery_SavedNpcAnim); -#include "world/common/LetterDelivery.inc.c" +#include "world/common/todo/LetterDelivery.inc.c" ApiStatus func_80240A68_EB18C8(Evt* script, s32 isInitialCall) { func_80059AC8(0, 1); diff --git a/src/EB8E90.c b/src/EB8E90.c index 66297181da..3100524721 100644 --- a/src/EB8E90.c +++ b/src/EB8E90.c @@ -5,7 +5,7 @@ #define NAMESPACE EB8E90 -#include "world/common/enemy/PatrolNoAttackAI.inc.c" +#include "world/common/enemy/ai/PatrolNoAttackAI.inc.c" ApiStatus N(PostChapter6StatUpdate)(Evt* script, s32 isInitialCall) { PlayerData* playerData = &gPlayerData; diff --git a/src/EB9D90.c b/src/EB9D90.c index 13c5fb43d6..23eb577c1b 100644 --- a/src/EB9D90.c +++ b/src/EB9D90.c @@ -52,7 +52,7 @@ ApiStatus func_802410E4_EB9F34(Evt* script, s32 isInitialCall) { #include "common/CosInterpMinMax.inc.c" -#include "world/common/SyncStatusMenu.inc.c" +#include "world/common/todo/SyncStatusMenu.inc.c" ApiStatus func_802413CC_EBA21C(Evt* script, s32 isInitialCall) { increment_status_menu_disabled(); diff --git a/src/EC2200.c b/src/EC2200.c index 3bb5ace5e7..8b6f4d6f80 100644 --- a/src/EC2200.c +++ b/src/EC2200.c @@ -3,4 +3,4 @@ #define NAMESPACE EC2200 -#include "world/common/DeadUnkFunc1.inc.c" +#include "world/common/todo/DeadUnkFunc1.inc.c" diff --git a/src/EC2240.c b/src/EC2240.c index 8ab02e5fac..44d654114b 100644 --- a/src/EC2240.c +++ b/src/EC2240.c @@ -9,9 +9,9 @@ const char* ascii_EC7170 = "flo_09"; const char* ascii_EC7178 = "flo_22"; const char* ascii_EC7180 = "flo_18\0"; -#include "world/common/StashVars.inc.c" +#include "world/common/todo/StashVars.inc.c" -#include "world/common/GetItemName.inc.c" +#include "world/common/todo/GetItemName.inc.c" //const char* D_80244F98_EC7198 = "touch_choro\n"; diff --git a/src/EC71B0.c b/src/EC71B0.c index 0d79d1eaaa..abdae80b74 100644 --- a/src/EC71B0.c +++ b/src/EC71B0.c @@ -7,7 +7,7 @@ #include "world/common/atomic/TexturePan.inc.c" -#include "world/common/SpawnSunEffect.inc.c" +#include "world/common/todo/SpawnSunEffect.inc.c" ApiStatus func_80240344_EC74F4(Evt* script, s32 isInitialCall) { EffectInstance* effect = fx_misc_particles(3, -272.0f, 80.0f, 20.0f, 200.0f, 120.0f, 4.0f, 8, 0); diff --git a/src/EC7590.c b/src/EC7590.c index 730c5ab854..9ff6f0ae47 100644 --- a/src/EC7590.c +++ b/src/EC7590.c @@ -5,6 +5,6 @@ #include "common/foliage.inc.c" -#include "world/common/StashVars.inc.c" +#include "world/common/todo/StashVars.inc.c" -#include "world/common/GetItemName.inc.c" +#include "world/common/todo/GetItemName.inc.c" diff --git a/src/EC9D00.c b/src/EC9D00.c index 3fa5636f16..43962918a8 100644 --- a/src/EC9D00.c +++ b/src/EC9D00.c @@ -5,4 +5,4 @@ #define NAMESPACE EC9D00 -#include "world/common/atomic/SuperBlock.inc.c" +#include "world/common/entity/SuperBlock.inc.c" diff --git a/src/ECAA40.c b/src/ECAA40.c index 98b8c7b1c1..bbcc093648 100644 --- a/src/ECAA40.c +++ b/src/ECAA40.c @@ -3,4 +3,4 @@ #define NAMESPACE ECAA40 -#include "world/common/DeadUnkFunc1.inc.c" +#include "world/common/todo/DeadUnkFunc1.inc.c" diff --git a/src/ECAA80.c b/src/ECAA80.c index d02951e599..a53b9321d7 100644 --- a/src/ECAA80.c +++ b/src/ECAA80.c @@ -14,14 +14,14 @@ extern s32 ECAA80_ItemChoice_SelectedItemID; void ECAA80_UnkFloAI_Chase(Evt* script, MobileAISettings* aiSettings, EnemyDetectVolume* territory); -#include "world/common/enemy/UnkFloAI.inc.c" +#include "world/common/enemy/ai/UnkFloAI.inc.c" // following four functions can be folded into this combined include when the last two are done // #include "world/common/atomic/ItemChoice_PartA.inc.c" -#include "world/common/GetNpcCollisionHeight.inc.c" +#include "world/common/todo/GetNpcCollisionHeight.inc.c" -#include "world/common/AddPlayerHandsOffset.inc.c" +#include "world/common/todo/AddPlayerHandsOffset.inc.c" // Needs data migrated #ifdef NON_MATCHING diff --git a/src/ECBB70.c b/src/ECBB70.c index dfb15f37b7..41ac41b2ee 100644 --- a/src/ECBB70.c +++ b/src/ECBB70.c @@ -3,4 +3,4 @@ #define NAMESPACE ECBB70 -#include "world/common/UnkFunc43.inc.c" +#include "world/common/todo/UnkFunc43.inc.c" diff --git a/src/ECFFF0.c b/src/ECFFF0.c index 21f48557f3..95989d8147 100644 --- a/src/ECFFF0.c +++ b/src/ECFFF0.c @@ -3,4 +3,4 @@ #define NAMESPACE ECFFF0 -#include "world/common/DeadUnkFunc1.inc.c" +#include "world/common/todo/DeadUnkFunc1.inc.c" diff --git a/src/ED0030.c b/src/ED0030.c index 053d2b3947..57fcae1641 100644 --- a/src/ED0030.c +++ b/src/ED0030.c @@ -3,4 +3,4 @@ #define NAMESPACE ED0030 -#include "world/common/UnkFunc43.inc.c" +#include "world/common/todo/UnkFunc43.inc.c" diff --git a/src/ED0310.c b/src/ED0310.c index e1254c68a3..47f351666e 100644 --- a/src/ED0310.c +++ b/src/ED0310.c @@ -5,4 +5,4 @@ #define NAMESPACE ED0310 -#include "world/common/enemy/FlyingAI.inc.c" +#include "world/common/enemy/ai/FlyingAI.inc.c" diff --git a/src/ED4260.c b/src/ED4260.c index 141f1cdb58..d8a685e1bb 100644 --- a/src/ED4260.c +++ b/src/ED4260.c @@ -3,4 +3,4 @@ #define NAMESPACE ED4260 -#include "world/common/DeadUnkFunc1.inc.c" +#include "world/common/todo/DeadUnkFunc1.inc.c" diff --git a/src/ED42A0.c b/src/ED42A0.c index 80386a0376..fab07f3c1a 100644 --- a/src/ED42A0.c +++ b/src/ED42A0.c @@ -3,9 +3,9 @@ #define NAMESPACE ED42A0 -#include "world/common/StashVars.inc.c" +#include "world/common/todo/StashVars.inc.c" -#include "world/common/GetItemName.inc.c" +#include "world/common/todo/GetItemName.inc.c" #include "world/common/atomic/TexturePan.inc.c" diff --git a/src/ED8E20.c b/src/ED8E20.c index 3fdd52d82a..353f11b689 100644 --- a/src/ED8E20.c +++ b/src/ED8E20.c @@ -5,7 +5,7 @@ #define NAMESPACE ED8E20 -#include "world/common/atomic/Pipe.inc.c" +#include "world/common/entity/Pipe.inc.c" ApiStatus func_80240318_ED9138(Evt* script, s32 isInitialCall) { fx_sun(0, 0, 0, 0, 0, 0); diff --git a/src/EDC020.c b/src/EDC020.c index 4cdda32088..044323d02a 100644 --- a/src/EDC020.c +++ b/src/EDC020.c @@ -9,13 +9,13 @@ extern s32 EDC020_D_802429E0[]; #include "common/foliage.inc.c" -#include "world/common/StashVars.inc.c" +#include "world/common/todo/StashVars.inc.c" -#include "world/common/GetItemName.inc.c" +#include "world/common/todo/GetItemName.inc.c" -#include "world/common/GetNpcCollisionHeight.inc.c" +#include "world/common/todo/GetNpcCollisionHeight.inc.c" -#include "world/common/AddPlayerHandsOffset.inc.c" +#include "world/common/todo/AddPlayerHandsOffset.inc.c" #ifdef NON_MATCHING // TODO(data) ApiStatus func_802405C0_EDC5A0(Evt* script, s32 isInitialCall) { diff --git a/src/EDEA00.c b/src/EDEA00.c index 192fbd174c..a04190caee 100644 --- a/src/EDEA00.c +++ b/src/EDEA00.c @@ -8,18 +8,18 @@ #include "world/common/util/ChangeNpcToPartner.inc.c" // must include this before LakituAI for the debug string to end up in the right position -#include "world/common/enemy/FlyingAI.inc.c" +#include "world/common/enemy/ai/FlyingAI.inc.c" const char D_80247B44_EE6504[] = "JUGEMU MOVE"; #define AI_LAKITU_FIRST_SPINY_ID 50 #define AI_LAKITU_LAST_SPINY_ID 55 -#include "world/common/enemy/LakituAI.inc.c" -#include "world/common/enemy/SpinyAI.inc.c" +#include "world/common/enemy/ai/LakituAI.inc.c" +#include "world/common/enemy/ai/SpinyAI.inc.c" const char D_80247BB8_EE6578[] = "TOGEZO TYPE1 : NORMAL MOVE"; -#include "world/common/UnkFunc42.inc.c" +#include "world/common/todo/UnkFunc42.inc.c" ApiStatus func_80243470_EE1E30(Evt* script, s32 isInitialCall) { Npc* npc = get_npc_unsafe(1); diff --git a/src/EE2040.c b/src/EE2040.c index bd0ed95fc6..8159475569 100644 --- a/src/EE2040.c +++ b/src/EE2040.c @@ -5,4 +5,4 @@ #define PARTY_IMAGE "party_pokopi" -#include "world/common/LoadPartyImage.inc.c" +#include "world/common/todo/LoadPartyImage.inc.c" diff --git a/src/EE65B0.c b/src/EE65B0.c index d78d463cb2..3cae93ab50 100644 --- a/src/EE65B0.c +++ b/src/EE65B0.c @@ -16,7 +16,7 @@ ApiStatus func_8024030C_EE68BC(Evt *script, s32 isInitialCall) { return ApiStatus_DONE2; } -#include "world/common/UnkFunc43.inc.c" +#include "world/common/todo/UnkFunc43.inc.c" ApiStatus func_802403D4_EE6984(Evt* script, s32 isInitialCall) { if (gPlayerData.currentPartner == PARTNER_NONE) { diff --git a/src/EE70C0.c b/src/EE70C0.c index 2f0bad73f2..c18ed3fb87 100644 --- a/src/EE70C0.c +++ b/src/EE70C0.c @@ -10,11 +10,11 @@ extern const s32 D_802453E0_EEB990[]; extern s32 D_8024462C_EEABDC; extern s32 D_80244630_EEABE0; -#include "world/common/enemy/FlyingAI.inc.c" +#include "world/common/enemy/ai/FlyingAI.inc.c" -#include "world/common/GetNpcCollisionHeight.inc.c" +#include "world/common/todo/GetNpcCollisionHeight.inc.c" -#include "world/common/AddPlayerHandsOffset.inc.c" +#include "world/common/todo/AddPlayerHandsOffset.inc.c" // Needs data migrated #ifdef NON_MATCHING diff --git a/src/EED100.c b/src/EED100.c index f3c8691688..be87c759e6 100644 --- a/src/EED100.c +++ b/src/EED100.c @@ -3,4 +3,4 @@ #define NAMESPACE EED100 -#include "world/common/DeadUnkFunc1.inc.c" +#include "world/common/todo/DeadUnkFunc1.inc.c" diff --git a/src/EED140.c b/src/EED140.c index 5fcb95084a..4c6b1660bd 100644 --- a/src/EED140.c +++ b/src/EED140.c @@ -3,4 +3,4 @@ #define NAMESPACE EED140 -#include "world/common/UnkFunc43.inc.c" +#include "world/common/todo/UnkFunc43.inc.c" diff --git a/src/EED1E0.c b/src/EED1E0.c index 303482679b..6c17670abb 100644 --- a/src/EED1E0.c +++ b/src/EED1E0.c @@ -5,6 +5,6 @@ #define NAMESPACE EED1E0 -#include "world/common/atomic/SuperBlock.inc.c" +#include "world/common/entity/SuperBlock.inc.c" -#include "world/common/UnkFunc44.inc.c" +#include "world/common/todo/UnkFunc44.inc.c" diff --git a/src/EEDF50.c b/src/EEDF50.c index eb543e35d2..d8b2111165 100644 --- a/src/EEDF50.c +++ b/src/EEDF50.c @@ -5,7 +5,7 @@ #define NAMESPACE EEDF50 -#include "world/common/enemy/FlyingAI.inc.c" +#include "world/common/enemy/ai/FlyingAI.inc.c" -#include "world/common/enemy/FlyingNoAttackAI.inc.c" +#include "world/common/enemy/ai/FlyingNoAttackAI.inc.c" diff --git a/src/EF2610.c b/src/EF2610.c index 60fde1b0a9..3691cf5995 100644 --- a/src/EF2610.c +++ b/src/EF2610.c @@ -3,4 +3,4 @@ #define NAMESPACE EF2610 -#include "world/common/DeadUnkFunc1.inc.c" +#include "world/common/todo/DeadUnkFunc1.inc.c" diff --git a/src/EF2680.c b/src/EF2680.c index 70a49723b9..cea42098b9 100644 --- a/src/EF2680.c +++ b/src/EF2680.c @@ -7,5 +7,5 @@ #define AI_LAKITU_FIRST_SPINY_ID 50 #define AI_LAKITU_LAST_SPINY_ID 53 -#include "world/common/enemy/LakituAI.inc.c" -#include "world/common/enemy/SpinyAI.inc.c" +#include "world/common/enemy/ai/LakituAI.inc.c" +#include "world/common/enemy/ai/SpinyAI.inc.c" diff --git a/src/EF7A80.c b/src/EF7A80.c index 200c334e09..af6b61997e 100644 --- a/src/EF7A80.c +++ b/src/EF7A80.c @@ -7,7 +7,7 @@ #include "world/common/atomic/TexturePan.inc.c" -#include "world/common/DeadUnkFunc1.inc.c" +#include "world/common/todo/DeadUnkFunc1.inc.c" typedef struct unk_effect { char unk_00[0x30]; diff --git a/src/EF7FB0.c b/src/EF7FB0.c index 8b4cefdad1..2c440fe4a8 100644 --- a/src/EF7FB0.c +++ b/src/EF7FB0.c @@ -3,4 +3,4 @@ #define NAMESPACE EF7FB0 -#include "world/common/UnkFunc42.inc.c" +#include "world/common/todo/UnkFunc42.inc.c" diff --git a/src/EFEB00.c b/src/EFEB00.c index d9a7c81efc..4ff4891ede 100644 --- a/src/EFEB00.c +++ b/src/EFEB00.c @@ -7,9 +7,9 @@ #include "world/common/atomic/TexturePan.inc.c" -#include "world/common/DeadUnkFunc1.inc.c" +#include "world/common/todo/DeadUnkFunc1.inc.c" -#include "world/common/UnkFloatFuncAbs.inc.c" +#include "world/common/todo/UnkFloatFuncAbs.inc.c" ApiStatus func_802404D0_EFEFD0(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; diff --git a/src/battle/area_dig/stage/dig_04.c b/src/battle/area_dig/stage/dig_04.c index 1f0053c00d..f95addd71d 100644 --- a/src/battle/area_dig/stage/dig_04.c +++ b/src/battle/area_dig/stage/dig_04.c @@ -12,12 +12,12 @@ extern ActorBlueprint N(slot_machine_start); EvtScript N(beforeBattle) = { EVT_CALL(SetSpriteShading, -1) EVT_CALL(SetCamBGColor, 1, 0, 0, 0) - EVT_CALL(SetTexPanner, 29, 10) + EVT_CALL(SetTexPanner, 29, TEX_PANNER_A) EVT_THREAD EVT_SET(LVarE, 0) EVT_LOOP(0) EVT_ADD(LVarE, 32768) - EVT_CALL(SetTexPanOffset, 10, 0, LVarE, 0) + EVT_CALL(SetTexPanOffset, TEX_PANNER_A, TEX_PANNER_MAIN, LVarE, 0) EVT_WAIT(10) EVT_END_LOOP EVT_END_THREAD diff --git a/src/battle/area_flo/stage/flo_03.c b/src/battle/area_flo/stage/flo_03.c index bc3068528d..02043b0cad 100644 --- a/src/battle/area_flo/stage/flo_03.c +++ b/src/battle/area_flo/stage/flo_03.c @@ -12,12 +12,12 @@ EvtScript N(80232A30) = { EVT_IF_EQ(LVar0, 0) EVT_BREAK_LOOP EVT_END_IF - EVT_CALL(SetTexPanner, LVar0, 14) + EVT_CALL(SetTexPanner, LVar0, TEX_PANNER_E) EVT_BUF_READ1(LVar0) EVT_IF_EQ(LVar0, 0) EVT_BREAK_LOOP EVT_END_IF - EVT_CALL(SetTexPanner, LVar0, 15) + EVT_CALL(SetTexPanner, LVar0, TEX_PANNER_F) EVT_END_LOOP EVT_SET(LVar0, 0) EVT_SET(LVar1, 0) @@ -27,12 +27,12 @@ EvtScript N(80232A30) = { EVT_IF_LT(LVar0, 0) EVT_ADD(LVar0, 65536) EVT_END_IF - EVT_CALL(SetTexPanOffset, 14, 0, LVar0, 0) + EVT_CALL(SetTexPanOffset, TEX_PANNER_E, TEX_PANNER_MAIN, LVar0, 0) EVT_ADD(LVar1, -200) EVT_IF_LT(LVar1, 0) EVT_ADD(LVar1, 65536) EVT_END_IF - EVT_CALL(SetTexPanOffset, 15, 0, LVar1, 0) + EVT_CALL(SetTexPanOffset, TEX_PANNER_F, TEX_PANNER_MAIN, LVar1, 0) EVT_WAIT(1) EVT_GOTO(0) EVT_RETURN @@ -82,13 +82,13 @@ EvtScript N(beforeBattle) = { EVT_CALL(SetCamBGColor, 1, 0, 0, 0) EVT_SET(LVar0, N(modelList)) EVT_EXEC(N(80232A30)) - EVT_CALL(SetTexPanner, 36, 1) - EVT_CALL(SetTexPanner, 37, 2) - EVT_CALL(SetTexPanner, 38, 3) - EVT_CALL(SetTexPanner, 39, 4) - EVT_CALL(SetTexPanner, 40, 5) - EVT_CALL(SetTexPanner, 41, 6) - EVT_CALL(SetTexPanner, 42, 7) + EVT_CALL(SetTexPanner, 36, TEX_PANNER_1) + EVT_CALL(SetTexPanner, 37, TEX_PANNER_2) + EVT_CALL(SetTexPanner, 38, TEX_PANNER_3) + EVT_CALL(SetTexPanner, 39, TEX_PANNER_4) + EVT_CALL(SetTexPanner, 40, TEX_PANNER_5) + EVT_CALL(SetTexPanner, 41, TEX_PANNER_6) + EVT_CALL(SetTexPanner, 42, TEX_PANNER_7) EVT_THREAD EVT_SET(LVarE, 1) EVT_SET(LVarF, 0) @@ -125,13 +125,13 @@ EvtScript N(beforeBattle) = { EVT_DIV(LVar6, 8) EVT_MOD(LVar6, 2) EVT_MUL(LVar6, 32768) - EVT_CALL(SetTexPanOffset, 1, 0, LVar0, 0) - EVT_CALL(SetTexPanOffset, 2, 0, LVar1, 0) - EVT_CALL(SetTexPanOffset, 3, 0, LVar2, 0) - EVT_CALL(SetTexPanOffset, 4, 0, LVar3, 0) - EVT_CALL(SetTexPanOffset, 5, 0, LVar4, 0) - EVT_CALL(SetTexPanOffset, 6, 0, LVar5, 0) - EVT_CALL(SetTexPanOffset, 7, 0, LVar6, 0) + EVT_CALL(SetTexPanOffset, TEX_PANNER_1, TEX_PANNER_MAIN, LVar0, 0) + EVT_CALL(SetTexPanOffset, TEX_PANNER_2, TEX_PANNER_MAIN, LVar1, 0) + EVT_CALL(SetTexPanOffset, TEX_PANNER_3, TEX_PANNER_MAIN, LVar2, 0) + EVT_CALL(SetTexPanOffset, TEX_PANNER_4, TEX_PANNER_MAIN, LVar3, 0) + EVT_CALL(SetTexPanOffset, TEX_PANNER_5, TEX_PANNER_MAIN, LVar4, 0) + EVT_CALL(SetTexPanOffset, TEX_PANNER_6, TEX_PANNER_MAIN, LVar5, 0) + EVT_CALL(SetTexPanOffset, TEX_PANNER_7, TEX_PANNER_MAIN, LVar6, 0) EVT_WAIT(1) EVT_END_LOOP EVT_END_THREAD diff --git a/src/battle/area_flo2/stage/flo_03.c b/src/battle/area_flo2/stage/flo_03.c index 43aa402aae..6ce8a1781b 100644 --- a/src/battle/area_flo2/stage/flo_03.c +++ b/src/battle/area_flo2/stage/flo_03.c @@ -12,12 +12,12 @@ EvtScript N(80232A30) = { EVT_IF_EQ(LVar0, 0) EVT_BREAK_LOOP EVT_END_IF - EVT_CALL(SetTexPanner, LVar0, 14) + EVT_CALL(SetTexPanner, LVar0, TEX_PANNER_E) EVT_BUF_READ1(LVar0) EVT_IF_EQ(LVar0, 0) EVT_BREAK_LOOP EVT_END_IF - EVT_CALL(SetTexPanner, LVar0, 15) + EVT_CALL(SetTexPanner, LVar0, TEX_PANNER_F) EVT_END_LOOP EVT_SET(LVar0, 0) EVT_SET(LVar1, 0) @@ -27,12 +27,12 @@ EvtScript N(80232A30) = { EVT_IF_LT(LVar0, 0) EVT_ADD(LVar0, 65536) EVT_END_IF - EVT_CALL(SetTexPanOffset, 14, 0, LVar0, 0) + EVT_CALL(SetTexPanOffset, TEX_PANNER_E, TEX_PANNER_MAIN, LVar0, 0) EVT_ADD(LVar1, -200) EVT_IF_LT(LVar1, 0) EVT_ADD(LVar1, 65536) EVT_END_IF - EVT_CALL(SetTexPanOffset, 15, 0, LVar1, 0) + EVT_CALL(SetTexPanOffset, TEX_PANNER_F, TEX_PANNER_MAIN, LVar1, 0) EVT_WAIT(1) EVT_GOTO(0) EVT_RETURN @@ -82,13 +82,13 @@ EvtScript N(beforeBattle) = { EVT_CALL(SetCamBGColor, 1, 0, 0, 0) EVT_SET(LVar0, N(modelList)) EVT_EXEC(N(80232A30)) - EVT_CALL(SetTexPanner, 36, 1) - EVT_CALL(SetTexPanner, 37, 2) - EVT_CALL(SetTexPanner, 38, 3) - EVT_CALL(SetTexPanner, 39, 4) - EVT_CALL(SetTexPanner, 40, 5) - EVT_CALL(SetTexPanner, 41, 6) - EVT_CALL(SetTexPanner, 42, 7) + EVT_CALL(SetTexPanner, 36, TEX_PANNER_1) + EVT_CALL(SetTexPanner, 37, TEX_PANNER_2) + EVT_CALL(SetTexPanner, 38, TEX_PANNER_3) + EVT_CALL(SetTexPanner, 39, TEX_PANNER_4) + EVT_CALL(SetTexPanner, 40, TEX_PANNER_5) + EVT_CALL(SetTexPanner, 41, TEX_PANNER_6) + EVT_CALL(SetTexPanner, 42, TEX_PANNER_7) EVT_THREAD EVT_SET(LVarE, 1) EVT_SET(LVarF, 0) @@ -125,13 +125,13 @@ EvtScript N(beforeBattle) = { EVT_DIV(LVar6, 8) EVT_MOD(LVar6, 2) EVT_MUL(LVar6, 32768) - EVT_CALL(SetTexPanOffset, 1, 0, LVar0, 0) - EVT_CALL(SetTexPanOffset, 2, 0, LVar1, 0) - EVT_CALL(SetTexPanOffset, 3, 0, LVar2, 0) - EVT_CALL(SetTexPanOffset, 4, 0, LVar3, 0) - EVT_CALL(SetTexPanOffset, 5, 0, LVar4, 0) - EVT_CALL(SetTexPanOffset, 6, 0, LVar5, 0) - EVT_CALL(SetTexPanOffset, 7, 0, LVar6, 0) + EVT_CALL(SetTexPanOffset, TEX_PANNER_1, TEX_PANNER_MAIN, LVar0, 0) + EVT_CALL(SetTexPanOffset, TEX_PANNER_2, TEX_PANNER_MAIN, LVar1, 0) + EVT_CALL(SetTexPanOffset, TEX_PANNER_3, TEX_PANNER_MAIN, LVar2, 0) + EVT_CALL(SetTexPanOffset, TEX_PANNER_4, TEX_PANNER_MAIN, LVar3, 0) + EVT_CALL(SetTexPanOffset, TEX_PANNER_5, TEX_PANNER_MAIN, LVar4, 0) + EVT_CALL(SetTexPanOffset, TEX_PANNER_6, TEX_PANNER_MAIN, LVar5, 0) + EVT_CALL(SetTexPanOffset, TEX_PANNER_7, TEX_PANNER_MAIN, LVar6, 0) EVT_WAIT(1) EVT_END_LOOP EVT_END_THREAD diff --git a/src/battle/area_hos/actor/magikoopa.c b/src/battle/area_hos/actor/magikoopa.c index 6aba4bfb1f..82cd0391b0 100644 --- a/src/battle/area_hos/actor/magikoopa.c +++ b/src/battle/area_hos/actor/magikoopa.c @@ -1448,7 +1448,7 @@ EvtScript N(makeCopy) = { EVT_END }; -#include "world/common/UnkFunc52.inc.c" +#include "world/common/todo/UnkFunc52.inc.c" EvtScript N(boostAttack) = { EVT_SET(LocalFlag(0), 0) diff --git a/src/battle/area_hos/stage/hos_01.c b/src/battle/area_hos/stage/hos_01.c index 986c332950..e36c65ad40 100644 --- a/src/battle/area_hos/stage/hos_01.c +++ b/src/battle/area_hos/stage/hos_01.c @@ -157,10 +157,10 @@ EvtScript N(beforeBattle_80224BD0) = { EVT_CALL(SetModelFlags, MODEL_o347, 128, 1) EVT_THREAD - EVT_CALL(SetTexPanner, MODEL_o332, 0) - EVT_CALL(SetTexPanner, MODEL_o334, 0) - EVT_CALL(SetTexPanner, MODEL_o333, 0) - EVT_CALL(SetTexPanner, MODEL_o336, 0) + EVT_CALL(SetTexPanner, MODEL_o332, TEX_PANNER_0) + EVT_CALL(SetTexPanner, MODEL_o334, TEX_PANNER_0) + EVT_CALL(SetTexPanner, MODEL_o333, TEX_PANNER_0) + EVT_CALL(SetTexPanner, MODEL_o336, TEX_PANNER_0) EVT_SET(LVar0, 0) EVT_SET(LVar1, 0) EVT_SET(LVar2, 0) @@ -182,8 +182,8 @@ EvtScript N(beforeBattle_80224BD0) = { EVT_IF_GT(LVar3, 32768) EVT_ADD(LVar3, -32768) EVT_END_IF - EVT_CALL(SetTexPanOffset, 0, 0, LVar0, LVar1) - EVT_CALL(SetTexPanOffset, 0, 1, LVar2, LVar3) + EVT_CALL(SetTexPanOffset, TEX_PANNER_0, TEX_PANNER_MAIN, LVar0, LVar1) + EVT_CALL(SetTexPanOffset, TEX_PANNER_0, TEX_PANNER_AUX, LVar2, LVar3) EVT_WAIT(1) EVT_END_LOOP EVT_END_THREAD diff --git a/src/battle/area_hos/stage/hos_02.c b/src/battle/area_hos/stage/hos_02.c index 77bccfa89a..cafec8e2e6 100644 --- a/src/battle/area_hos/stage/hos_02.c +++ b/src/battle/area_hos/stage/hos_02.c @@ -6,8 +6,8 @@ EvtScript N(beforeBattle_802258E0) = { EVT_THREAD - EVT_CALL(SetTexPanner, MODEL_o372, 1) - EVT_CALL(SetTexPanner, MODEL_o375, 1) + EVT_CALL(SetTexPanner, MODEL_o372, TEX_PANNER_1) + EVT_CALL(SetTexPanner, MODEL_o375, TEX_PANNER_1) EVT_SET(LVar0, 0) EVT_SET(LVar1, 0) EVT_SET(LVar2, 0) @@ -17,8 +17,8 @@ EvtScript N(beforeBattle_802258E0) = { EVT_ADD(LVar1, 300) EVT_ADD(LVar2, 90) EVT_ADD(LVar3, -200) - EVT_CALL(SetTexPanOffset, 1, 0, LVar0, LVar1) - EVT_CALL(SetTexPanOffset, 1, 1, LVar2, LVar3) + EVT_CALL(SetTexPanOffset, TEX_PANNER_1, TEX_PANNER_MAIN, LVar0, LVar1) + EVT_CALL(SetTexPanOffset, TEX_PANNER_1, TEX_PANNER_AUX, LVar2, LVar3) EVT_WAIT(1) EVT_END_LOOP EVT_END_THREAD diff --git a/src/battle/area_kkj/actor/kammy_koopa.c b/src/battle/area_kkj/actor/kammy_koopa.c index 3a9480b869..d892240019 100644 --- a/src/battle/area_kkj/actor/kammy_koopa.c +++ b/src/battle/area_kkj/actor/kammy_koopa.c @@ -175,9 +175,9 @@ EvtScript N(handleEvent) = { EVT_END }; -#include "world/common/SetEntityPositionF.inc.c" +#include "world/common/todo/SetEntityPositionF.inc.c" -#include "world/common/GetEntityPosition.inc.c" +#include "world/common/todo/GetEntityPosition.inc.c" ApiStatus N(BlockAppear)(Evt* script, s32 isInitialCall) { Entity* entity = get_entity_by_index(script->varTable[9]); diff --git a/src/battle/area_kmr_part_1/stage/kmr_03.c b/src/battle/area_kmr_part_1/stage/kmr_03.c index 17c5115a71..c535387248 100644 --- a/src/battle/area_kmr_part_1/stage/kmr_03.c +++ b/src/battle/area_kmr_part_1/stage/kmr_03.c @@ -3,7 +3,7 @@ #define NAMESPACE b_area_kmr_part_1_kmr_03 -#include "world/common/clouds.inc.c" +#include "world/common/todo/clouds.inc.c" EvtScript N(beforeBattle_80220188) = { EVT_CALL(SetSpriteShading, -1) diff --git a/src/battle/area_kmr_part_1/stage/kmr_04.c b/src/battle/area_kmr_part_1/stage/kmr_04.c index 251d7e99d2..469ce6a71e 100644 --- a/src/battle/area_kmr_part_1/stage/kmr_04.c +++ b/src/battle/area_kmr_part_1/stage/kmr_04.c @@ -3,7 +3,7 @@ #define NAMESPACE b_area_kmr_part_1_kmr_04 -#include "world/common/clouds.inc.c" +#include "world/common/todo/clouds.inc.c" EvtScript N(beforeBattle_802205D8) = { EVT_CALL(SetSpriteShading, -1) diff --git a/src/battle/area_kmr_part_1/stage/kmr_05.c b/src/battle/area_kmr_part_1/stage/kmr_05.c index 8d03a61b67..dc64cf00e0 100644 --- a/src/battle/area_kmr_part_1/stage/kmr_05.c +++ b/src/battle/area_kmr_part_1/stage/kmr_05.c @@ -3,7 +3,7 @@ #define NAMESPACE b_area_kmr_part_1_kmr_05 -#include "world/common/clouds.inc.c" +#include "world/common/todo/clouds.inc.c" EvtScript N(beforeBattle_80220A28) = { EVT_CALL(SetSpriteShading, -1) diff --git a/src/battle/area_kmr_part_1/stage/kmr_06.c b/src/battle/area_kmr_part_1/stage/kmr_06.c index 117ff7c35a..09f7889a19 100644 --- a/src/battle/area_kmr_part_1/stage/kmr_06.c +++ b/src/battle/area_kmr_part_1/stage/kmr_06.c @@ -3,7 +3,7 @@ #define NAMESPACE b_area_kmr_part_1_kmr_06 -#include "world/common/clouds.inc.c" +#include "world/common/todo/clouds.inc.c" #include "common/UnkFogFunc.inc.c" EvtScript N(beforeBattle_80220E28) = { diff --git a/src/battle/area_kmr_part_2/stage/kmr_03.c b/src/battle/area_kmr_part_2/stage/kmr_03.c index acf4688274..4cd3373134 100644 --- a/src/battle/area_kmr_part_2/stage/kmr_03.c +++ b/src/battle/area_kmr_part_2/stage/kmr_03.c @@ -3,7 +3,7 @@ #define NAMESPACE b_area_kmr_part_2_kmr_03 -#include "world/common/clouds.inc.c" +#include "world/common/todo/clouds.inc.c" EvtScript N(beforeBattle_80224AE8) = { EVT_CALL(SetSpriteShading, -1) diff --git a/src/battle/area_kmr_part_2/stage/kmr_04.c b/src/battle/area_kmr_part_2/stage/kmr_04.c index 4e46db3269..d67dadf6dd 100644 --- a/src/battle/area_kmr_part_2/stage/kmr_04.c +++ b/src/battle/area_kmr_part_2/stage/kmr_04.c @@ -3,7 +3,7 @@ #define NAMESPACE b_area_kmr_part_2_kmr_04 -#include "world/common/clouds.inc.c" +#include "world/common/todo/clouds.inc.c" EvtScript N(beforeBattle_80224F38) = { EVT_CALL(SetSpriteShading, -1) diff --git a/src/battle/area_kmr_part_2/stage/kmr_05.c b/src/battle/area_kmr_part_2/stage/kmr_05.c index bbf6b49a3a..3496adc671 100644 --- a/src/battle/area_kmr_part_2/stage/kmr_05.c +++ b/src/battle/area_kmr_part_2/stage/kmr_05.c @@ -3,7 +3,7 @@ #define NAMESPACE b_area_kmr_part_2_kmr_05 -#include "world/common/clouds.inc.c" +#include "world/common/todo/clouds.inc.c" EvtScript N(beforeBattle_80225388) = { EVT_CALL(SetSpriteShading, -1) diff --git a/src/battle/area_kmr_part_2/stage/kmr_06.c b/src/battle/area_kmr_part_2/stage/kmr_06.c index b9c50bd2f1..5419b1e31a 100644 --- a/src/battle/area_kmr_part_2/stage/kmr_06.c +++ b/src/battle/area_kmr_part_2/stage/kmr_06.c @@ -3,7 +3,7 @@ #define NAMESPACE b_area_kmr_part_2_kmr_06 -#include "world/common/clouds.inc.c" +#include "world/common/todo/clouds.inc.c" #include "common/UnkFogFunc.inc.c" diff --git a/src/battle/area_kmr_part_3/stage/kmr_03.c b/src/battle/area_kmr_part_3/stage/kmr_03.c index aaf2dc1cc2..c6330980ff 100644 --- a/src/battle/area_kmr_part_3/stage/kmr_03.c +++ b/src/battle/area_kmr_part_3/stage/kmr_03.c @@ -3,7 +3,7 @@ #define NAMESPACE b_area_kmr_part_3_kmr_03 -#include "world/common/clouds.inc.c" +#include "world/common/todo/clouds.inc.c" EvtScript N(beforeBattle_802326B8) = { EVT_CALL(SetSpriteShading, -1) diff --git a/src/battle/area_kmr_part_3/stage/kmr_04.c b/src/battle/area_kmr_part_3/stage/kmr_04.c index bcf2375986..5cb5cd7f2a 100644 --- a/src/battle/area_kmr_part_3/stage/kmr_04.c +++ b/src/battle/area_kmr_part_3/stage/kmr_04.c @@ -3,7 +3,7 @@ #define NAMESPACE b_area_kmr_part_3_kmr_04 -#include "world/common/clouds.inc.c" +#include "world/common/todo/clouds.inc.c" EvtScript N(beforeBattle_80232B08) = { EVT_CALL(SetSpriteShading, -1) diff --git a/src/battle/area_kmr_part_3/stage/kmr_05.c b/src/battle/area_kmr_part_3/stage/kmr_05.c index 8dde70b737..ccdbf0ce92 100644 --- a/src/battle/area_kmr_part_3/stage/kmr_05.c +++ b/src/battle/area_kmr_part_3/stage/kmr_05.c @@ -3,7 +3,7 @@ #define NAMESPACE b_area_kmr_part_3_kmr_05 -#include "world/common/clouds.inc.c" +#include "world/common/todo/clouds.inc.c" EvtScript N(beforeBattle_80232F58) = { EVT_CALL(SetSpriteShading, -1) diff --git a/src/battle/area_kmr_part_3/stage/kmr_06.c b/src/battle/area_kmr_part_3/stage/kmr_06.c index 4a4ed6998f..297a879fe5 100644 --- a/src/battle/area_kmr_part_3/stage/kmr_06.c +++ b/src/battle/area_kmr_part_3/stage/kmr_06.c @@ -3,7 +3,7 @@ #define NAMESPACE b_area_kmr_part_3_kmr_06 -#include "world/common/clouds.inc.c" +#include "world/common/todo/clouds.inc.c" #include "common/UnkFogFunc.inc.c" diff --git a/src/battle/area_kmr_part_3/stage/kpa_01.c b/src/battle/area_kmr_part_3/stage/kpa_01.c index f95b64ce4c..d249c1fb6f 100644 --- a/src/battle/area_kmr_part_3/stage/kpa_01.c +++ b/src/battle/area_kmr_part_3/stage/kpa_01.c @@ -5,11 +5,11 @@ EvtScript N(80234CB0) = { EVT_SET(LVarA, LVar0) - EVT_CALL(SetTexPanner, LVarA, 1) + EVT_CALL(SetTexPanner, LVarA, TEX_PANNER_1) EVT_SET(LVar0, 0) EVT_SET(LVar1, 0) EVT_LOOP(0) - EVT_CALL(SetTexPanOffset, 1, 0, LVar0, LVar1) + EVT_CALL(SetTexPanOffset, TEX_PANNER_1, TEX_PANNER_MAIN, LVar0, LVar1) EVT_ADD(LVar0, 32768) EVT_ADD(LVar1, 0) EVT_WAIT(5) diff --git a/src/battle/area_kpa/stage/kpa_01.c b/src/battle/area_kpa/stage/kpa_01.c index 2a366fa189..6af4c8af45 100644 --- a/src/battle/area_kpa/stage/kpa_01.c +++ b/src/battle/area_kpa/stage/kpa_01.c @@ -6,11 +6,11 @@ EvtScript N(8022EFE0) = { EVT_SET(LVarA, LVar0) - EVT_CALL(SetTexPanner, LVarA, 1) + EVT_CALL(SetTexPanner, LVarA, TEX_PANNER_1) EVT_SET(LVar0, 0) EVT_SET(LVar1, 0) EVT_LOOP(0) - EVT_CALL(SetTexPanOffset, 1, 0, LVar0, LVar1) + EVT_CALL(SetTexPanOffset, TEX_PANNER_1, TEX_PANNER_MAIN, LVar0, LVar1) EVT_ADD(LVar0, 32768) EVT_ADD(LVar1, 0) EVT_WAIT(5) diff --git a/src/battle/area_kpa/stage/kpa_01b.c b/src/battle/area_kpa/stage/kpa_01b.c index a548ffdec1..5d9e77e514 100644 --- a/src/battle/area_kpa/stage/kpa_01b.c +++ b/src/battle/area_kpa/stage/kpa_01b.c @@ -6,11 +6,11 @@ EvtScript N(8022F180) = { EVT_SET(LVarA, LVar0) - EVT_CALL(SetTexPanner, LVarA, 1) + EVT_CALL(SetTexPanner, LVarA, TEX_PANNER_1) EVT_SET(LVar0, 0) EVT_SET(LVar1, 0) EVT_LOOP(0) - EVT_CALL(SetTexPanOffset, 1, 0, LVar0, LVar1) + EVT_CALL(SetTexPanOffset, TEX_PANNER_1, TEX_PANNER_MAIN, LVar0, LVar1) EVT_ADD(LVar0, 32768) EVT_ADD(LVar1, 0) EVT_WAIT(5) diff --git a/src/battle/area_kpa/stage/kpa_04.c b/src/battle/area_kpa/stage/kpa_04.c index 97bc6f482b..aa5b41b9d7 100644 --- a/src/battle/area_kpa/stage/kpa_04.c +++ b/src/battle/area_kpa/stage/kpa_04.c @@ -5,11 +5,11 @@ EvtScript N(8022F7F0) = { EVT_SET(LVarA, LVar0) - EVT_CALL(SetTexPanner, LVarA, 1) + EVT_CALL(SetTexPanner, LVarA, TEX_PANNER_1) EVT_SET(LVar0, 0) EVT_SET(LVar1, 0) EVT_LOOP(0) - EVT_CALL(SetTexPanOffset, 1, 0, LVar0, LVar1) + EVT_CALL(SetTexPanOffset, TEX_PANNER_1, TEX_PANNER_MAIN, LVar0, LVar1) EVT_ADD(LVar0, 32768) EVT_ADD(LVar1, 0) EVT_WAIT(5) diff --git a/src/battle/area_kpa/stage/kpa_04b.c b/src/battle/area_kpa/stage/kpa_04b.c index e4dd0e4d40..3aa9f8b1aa 100644 --- a/src/battle/area_kpa/stage/kpa_04b.c +++ b/src/battle/area_kpa/stage/kpa_04b.c @@ -5,11 +5,11 @@ EvtScript N(8022FA10) = { EVT_SET(LVarA, LVar0) - EVT_CALL(SetTexPanner, LVarA, 1) + EVT_CALL(SetTexPanner, LVarA, TEX_PANNER_1) EVT_SET(LVar0, 0) EVT_SET(LVar1, 0) EVT_LOOP(0) - EVT_CALL(SetTexPanOffset, 1, 0, LVar0, LVar1) + EVT_CALL(SetTexPanOffset, TEX_PANNER_1, TEX_PANNER_MAIN, LVar0, LVar1) EVT_ADD(LVar0, 32768) EVT_ADD(LVar1, 0) EVT_WAIT(5) diff --git a/src/battle/area_kpa/stage/kpa_04c.c b/src/battle/area_kpa/stage/kpa_04c.c index eb28d29440..0872af2ff7 100644 --- a/src/battle/area_kpa/stage/kpa_04c.c +++ b/src/battle/area_kpa/stage/kpa_04c.c @@ -5,11 +5,11 @@ EvtScript N(8022FC20) = { EVT_SET(LVarA, LVar0) - EVT_CALL(SetTexPanner, LVarA, 1) + EVT_CALL(SetTexPanner, LVarA, TEX_PANNER_1) EVT_SET(LVar0, 0) EVT_SET(LVar1, 0) EVT_LOOP(0) - EVT_CALL(SetTexPanOffset, 1, 0, LVar0, LVar1) + EVT_CALL(SetTexPanOffset, TEX_PANNER_1, TEX_PANNER_MAIN, LVar0, LVar1) EVT_ADD(LVar0, 32768) EVT_ADD(LVar1, 0) EVT_WAIT(5) diff --git a/src/battle/area_kpa/stage/kpa_13.c b/src/battle/area_kpa/stage/kpa_13.c index 630c26d22b..8785ab41e3 100644 --- a/src/battle/area_kpa/stage/kpa_13.c +++ b/src/battle/area_kpa/stage/kpa_13.c @@ -5,11 +5,11 @@ EvtScript N(80230440) = { EVT_SET(LVarA, LVar0) - EVT_CALL(SetTexPanner, LVarA, 1) + EVT_CALL(SetTexPanner, LVarA, TEX_PANNER_1) EVT_SET(LVar0, 0) EVT_SET(LVar1, 0) EVT_LOOP(0) - EVT_CALL(SetTexPanOffset, 1, 0, LVar0, LVar1) + EVT_CALL(SetTexPanOffset, TEX_PANNER_1, TEX_PANNER_MAIN, LVar0, LVar1) EVT_ADD(LVar0, 32768) EVT_ADD(LVar1, 0) EVT_WAIT(5) diff --git a/src/battle/area_kpa/stage/kpa_14.c b/src/battle/area_kpa/stage/kpa_14.c index d1f21b0c66..bf0ecc6831 100644 --- a/src/battle/area_kpa/stage/kpa_14.c +++ b/src/battle/area_kpa/stage/kpa_14.c @@ -5,11 +5,11 @@ EvtScript N(80230570) = { EVT_SET(LVarA, LVar0) - EVT_CALL(SetTexPanner, LVarA, 1) + EVT_CALL(SetTexPanner, LVarA, TEX_PANNER_1) EVT_SET(LVar0, 0) EVT_SET(LVar1, 0) EVT_LOOP(0) - EVT_CALL(SetTexPanOffset, 1, 0, LVar0, LVar1) + EVT_CALL(SetTexPanOffset, TEX_PANNER_1, TEX_PANNER_MAIN, LVar0, LVar1) EVT_ADD(LVar0, 32768) EVT_ADD(LVar1, 0) EVT_WAIT(5) diff --git a/src/battle/area_kpa2/stage/kpa_01.c b/src/battle/area_kpa2/stage/kpa_01.c index 5cc3fac44f..73dfaa489f 100644 --- a/src/battle/area_kpa2/stage/kpa_01.c +++ b/src/battle/area_kpa2/stage/kpa_01.c @@ -6,11 +6,11 @@ EvtScript N(8022EFE0) = { EVT_SET(LVarA, LVar0) - EVT_CALL(SetTexPanner, LVarA, 1) + EVT_CALL(SetTexPanner, LVarA, TEX_PANNER_1) EVT_SET(LVar0, 0) EVT_SET(LVar1, 0) EVT_LOOP(0) - EVT_CALL(SetTexPanOffset, 1, 0, LVar0, LVar1) + EVT_CALL(SetTexPanOffset, TEX_PANNER_1, TEX_PANNER_MAIN, LVar0, LVar1) EVT_ADD(LVar0, 32768) EVT_ADD(LVar1, 0) EVT_WAIT(5) diff --git a/src/battle/area_kpa3/stage/kpa_01.c b/src/battle/area_kpa3/stage/kpa_01.c index 957c48cf4a..37bca5ece3 100644 --- a/src/battle/area_kpa3/stage/kpa_01.c +++ b/src/battle/area_kpa3/stage/kpa_01.c @@ -6,11 +6,11 @@ EvtScript N(8022EFE0) = { EVT_SET(LVarA, LVar0) - EVT_CALL(SetTexPanner, LVarA, 1) + EVT_CALL(SetTexPanner, LVarA, TEX_PANNER_1) EVT_SET(LVar0, 0) EVT_SET(LVar1, 0) EVT_LOOP(0) - EVT_CALL(SetTexPanOffset, 1, 0, LVar0, LVar1) + EVT_CALL(SetTexPanOffset, TEX_PANNER_1, TEX_PANNER_MAIN, LVar0, LVar1) EVT_ADD(LVar0, 32768) EVT_ADD(LVar1, 0) EVT_WAIT(5) diff --git a/src/battle/area_kpa4/stage/kpa_01.c b/src/battle/area_kpa4/stage/kpa_01.c index da1984125b..dbf593a19a 100644 --- a/src/battle/area_kpa4/stage/kpa_01.c +++ b/src/battle/area_kpa4/stage/kpa_01.c @@ -6,11 +6,11 @@ EvtScript N(8022EFE0) = { EVT_SET(LVarA, LVar0) - EVT_CALL(SetTexPanner, LVarA, 1) + EVT_CALL(SetTexPanner, LVarA, TEX_PANNER_1) EVT_SET(LVar0, 0) EVT_SET(LVar1, 0) EVT_LOOP(0) - EVT_CALL(SetTexPanOffset, 1, 0, LVar0, LVar1) + EVT_CALL(SetTexPanOffset, TEX_PANNER_1, TEX_PANNER_MAIN, LVar0, LVar1) EVT_ADD(LVar0, 32768) EVT_ADD(LVar1, 0) EVT_WAIT(5) diff --git a/src/battle/area_kpa4/stage/kpa_01b.c b/src/battle/area_kpa4/stage/kpa_01b.c index 92659dd33e..4e84a2a0ed 100644 --- a/src/battle/area_kpa4/stage/kpa_01b.c +++ b/src/battle/area_kpa4/stage/kpa_01b.c @@ -6,11 +6,11 @@ EvtScript N(8022F180) = { EVT_SET(LVarA, LVar0) - EVT_CALL(SetTexPanner, LVarA, 1) + EVT_CALL(SetTexPanner, LVarA, TEX_PANNER_1) EVT_SET(LVar0, 0) EVT_SET(LVar1, 0) EVT_LOOP(0) - EVT_CALL(SetTexPanOffset, 1, 0, LVar0, LVar1) + EVT_CALL(SetTexPanOffset, TEX_PANNER_1, TEX_PANNER_MAIN, LVar0, LVar1) EVT_ADD(LVar0, 32768) EVT_ADD(LVar1, 0) EVT_WAIT(5) diff --git a/src/battle/area_kpa4/stage/kpa_04.c b/src/battle/area_kpa4/stage/kpa_04.c index d18ff97911..415301e164 100644 --- a/src/battle/area_kpa4/stage/kpa_04.c +++ b/src/battle/area_kpa4/stage/kpa_04.c @@ -5,11 +5,11 @@ EvtScript N(8022F7F0) = { EVT_SET(LVarA, LVar0) - EVT_CALL(SetTexPanner, LVarA, 1) + EVT_CALL(SetTexPanner, LVarA, TEX_PANNER_1) EVT_SET(LVar0, 0) EVT_SET(LVar1, 0) EVT_LOOP(0) - EVT_CALL(SetTexPanOffset, 1, 0, LVar0, LVar1) + EVT_CALL(SetTexPanOffset, TEX_PANNER_1, TEX_PANNER_MAIN, LVar0, LVar1) EVT_ADD(LVar0, 32768) EVT_ADD(LVar1, 0) EVT_WAIT(5) diff --git a/src/battle/area_kpa4/stage/kpa_04b.c b/src/battle/area_kpa4/stage/kpa_04b.c index 58199c6ebb..bdf89f3ab2 100644 --- a/src/battle/area_kpa4/stage/kpa_04b.c +++ b/src/battle/area_kpa4/stage/kpa_04b.c @@ -5,11 +5,11 @@ EvtScript N(8022FA10) = { EVT_SET(LVarA, LVar0) - EVT_CALL(SetTexPanner, LVarA, 1) + EVT_CALL(SetTexPanner, LVarA, TEX_PANNER_1) EVT_SET(LVar0, 0) EVT_SET(LVar1, 0) EVT_LOOP(0) - EVT_CALL(SetTexPanOffset, 1, 0, LVar0, LVar1) + EVT_CALL(SetTexPanOffset, TEX_PANNER_1, TEX_PANNER_MAIN, LVar0, LVar1) EVT_ADD(LVar0, 32768) EVT_ADD(LVar1, 0) EVT_WAIT(5) diff --git a/src/battle/area_kpa4/stage/kpa_04c.c b/src/battle/area_kpa4/stage/kpa_04c.c index 0e1dcc432b..b66d16a4aa 100644 --- a/src/battle/area_kpa4/stage/kpa_04c.c +++ b/src/battle/area_kpa4/stage/kpa_04c.c @@ -5,11 +5,11 @@ EvtScript N(8022FC20) = { EVT_SET(LVarA, LVar0) - EVT_CALL(SetTexPanner, LVarA, 1) + EVT_CALL(SetTexPanner, LVarA, TEX_PANNER_1) EVT_SET(LVar0, 0) EVT_SET(LVar1, 0) EVT_LOOP(0) - EVT_CALL(SetTexPanOffset, 1, 0, LVar0, LVar1) + EVT_CALL(SetTexPanOffset, TEX_PANNER_1, TEX_PANNER_MAIN, LVar0, LVar1) EVT_ADD(LVar0, 32768) EVT_ADD(LVar1, 0) EVT_WAIT(5) diff --git a/src/battle/area_kpa4/stage/kpa_13.c b/src/battle/area_kpa4/stage/kpa_13.c index 2b4c852285..d3b2d932d4 100644 --- a/src/battle/area_kpa4/stage/kpa_13.c +++ b/src/battle/area_kpa4/stage/kpa_13.c @@ -5,11 +5,11 @@ EvtScript N(80230440) = { EVT_SET(LVarA, LVar0) - EVT_CALL(SetTexPanner, LVarA, 1) + EVT_CALL(SetTexPanner, LVarA, TEX_PANNER_1) EVT_SET(LVar0, 0) EVT_SET(LVar1, 0) EVT_LOOP(0) - EVT_CALL(SetTexPanOffset, 1, 0, LVar0, LVar1) + EVT_CALL(SetTexPanOffset, TEX_PANNER_1, TEX_PANNER_MAIN, LVar0, LVar1) EVT_ADD(LVar0, 32768) EVT_ADD(LVar1, 0) EVT_WAIT(5) diff --git a/src/battle/area_kpa4/stage/kpa_14.c b/src/battle/area_kpa4/stage/kpa_14.c index 6baddea03d..3cdf9ca5e6 100644 --- a/src/battle/area_kpa4/stage/kpa_14.c +++ b/src/battle/area_kpa4/stage/kpa_14.c @@ -5,11 +5,11 @@ EvtScript N(80230570) = { EVT_SET(LVarA, LVar0) - EVT_CALL(SetTexPanner, LVarA, 1) + EVT_CALL(SetTexPanner, LVarA, TEX_PANNER_1) EVT_SET(LVar0, 0) EVT_SET(LVar1, 0) EVT_LOOP(0) - EVT_CALL(SetTexPanOffset, 1, 0, LVar0, LVar1) + EVT_CALL(SetTexPanOffset, TEX_PANNER_1, TEX_PANNER_MAIN, LVar0, LVar1) EVT_ADD(LVar0, 32768) EVT_ADD(LVar1, 0) EVT_WAIT(5) diff --git a/src/battle/area_mac/actor/lee.c b/src/battle/area_mac/actor/lee.c index 95d06d8808..70b1e45ea4 100644 --- a/src/battle/area_mac/actor/lee.c +++ b/src/battle/area_mac/actor/lee.c @@ -811,7 +811,7 @@ ApiStatus func_80218100_464590(Evt* script, s32 isInitialCall) { } } -#include "world/common/UnkFunc62.inc.c" +#include "world/common/todo/UnkFunc62.inc.c" #include "common/ActorJumpToPos.inc.c" diff --git a/src/battle/area_omo/stage/omo_04.c b/src/battle/area_omo/stage/omo_04.c index f4391cd0d3..1bcbf0c453 100644 --- a/src/battle/area_omo/stage/omo_04.c +++ b/src/battle/area_omo/stage/omo_04.c @@ -12,12 +12,12 @@ extern ActorBlueprint N(slot_machine_start); EvtScript N(beforeBattle) = { EVT_CALL(SetSpriteShading, -1) EVT_CALL(SetCamBGColor, 1, 0, 0, 0) - EVT_CALL(SetTexPanner, 29, 10) + EVT_CALL(SetTexPanner, 29, TEX_PANNER_A) EVT_THREAD EVT_SET(LVarE, 0) EVT_LOOP(0) EVT_ADD(LVarE, 32768) - EVT_CALL(SetTexPanOffset, 10, 0, LVarE, 0) + EVT_CALL(SetTexPanOffset, TEX_PANNER_A, TEX_PANNER_MAIN, LVarE, 0) EVT_WAIT(10) EVT_END_LOOP EVT_END_THREAD diff --git a/src/battle/area_omo3/stage/omo_04.c b/src/battle/area_omo3/stage/omo_04.c index 0a68f7616d..800d2e3ca0 100644 --- a/src/battle/area_omo3/stage/omo_04.c +++ b/src/battle/area_omo3/stage/omo_04.c @@ -12,12 +12,12 @@ extern ActorBlueprint N(slot_machine_start); EvtScript N(beforeBattle) = { EVT_CALL(SetSpriteShading, -1) EVT_CALL(SetCamBGColor, 1, 0, 0, 0) - EVT_CALL(SetTexPanner, 29, 10) + EVT_CALL(SetTexPanner, 29, TEX_PANNER_A) EVT_THREAD EVT_SET(LVarE, 0) EVT_LOOP(0) EVT_ADD(LVarE, 32768) - EVT_CALL(SetTexPanOffset, 10, 0, LVarE, 0) + EVT_CALL(SetTexPanOffset, TEX_PANNER_A, TEX_PANNER_MAIN, LVarE, 0) EVT_WAIT(10) EVT_END_LOOP EVT_END_THREAD diff --git a/src/battle/area_tik/stage/tik_01.c b/src/battle/area_tik/stage/tik_01.c index 83f38d3267..7970f3cb7c 100644 --- a/src/battle/area_tik/stage/tik_01.c +++ b/src/battle/area_tik/stage/tik_01.c @@ -3,7 +3,7 @@ #define NAMESPACE b_area_tik_tik_01 -#include "world/common/UnkFunc56.inc.c" +#include "world/common/todo/UnkFunc56.inc.c" EvtScript N(802301F0) = { EVT_SET(LVarA, LVar1) diff --git a/src/battle/area_tik/stage/tik_02.c b/src/battle/area_tik/stage/tik_02.c index bd9f254ac8..43e9d0c5d9 100644 --- a/src/battle/area_tik/stage/tik_02.c +++ b/src/battle/area_tik/stage/tik_02.c @@ -3,7 +3,7 @@ #define NAMESPACE b_area_tik_tik_02 -#include "world/common/UnkFunc56.inc.c" +#include "world/common/todo/UnkFunc56.inc.c" EvtScript N(80230DF0) = { EVT_SET(LVarA, LVar1) diff --git a/src/battle/area_tik/stage/tik_03.c b/src/battle/area_tik/stage/tik_03.c index df2d9bbc68..7c5fd25247 100644 --- a/src/battle/area_tik/stage/tik_03.c +++ b/src/battle/area_tik/stage/tik_03.c @@ -3,7 +3,7 @@ #define NAMESPACE b_area_tik_tik_03 -#include "world/common/UnkFunc56.inc.c" +#include "world/common/todo/UnkFunc56.inc.c" EvtScript N(802319F0) = { EVT_SET(LVar1, ArrayVar(5)) diff --git a/src/battle/area_tik/stage/tik_05.c b/src/battle/area_tik/stage/tik_05.c index 143fe08dce..a2ad324c9d 100644 --- a/src/battle/area_tik/stage/tik_05.c +++ b/src/battle/area_tik/stage/tik_05.c @@ -26,7 +26,7 @@ EvtScript N(80233540) = { EvtScript N(beforeBattle) = { EVT_CALL(SetSpriteShading, -1) EVT_CALL(SetCamBGColor, 1, 0, 0, 0) - EVT_CALL(SetTexPanner, 15, 1) + EVT_CALL(SetTexPanner, 15, TEX_PANNER_1) EVT_CALL(EnableTexPanning, 15, 1) EVT_THREAD EVT_SET(LVar0, 1) @@ -44,7 +44,7 @@ EvtScript N(beforeBattle) = { EVT_SET(LVarC, 0) EVT_EXEC(N(80233540)) EVT_END_THREAD - EVT_CALL(SetTexPanner, 16, 2) + EVT_CALL(SetTexPanner, 16, TEX_PANNER_2) EVT_CALL(EnableTexPanning, 16, 1) EVT_THREAD EVT_SET(LVar0, 2) diff --git a/src/battle/area_tik2/stage/tik_01.c b/src/battle/area_tik2/stage/tik_01.c index e3c7b03e1d..c56e45b2ed 100644 --- a/src/battle/area_tik2/stage/tik_01.c +++ b/src/battle/area_tik2/stage/tik_01.c @@ -3,7 +3,7 @@ #define NAMESPACE b_area_tik2_tik_01 -#include "world/common/UnkFunc56.inc.c" +#include "world/common/todo/UnkFunc56.inc.c" EvtScript N(802301F0) = { EVT_SET(LVarA, LVar1) diff --git a/src/battle/area_tik2/stage/tik_02.c b/src/battle/area_tik2/stage/tik_02.c index 721a6a2ff1..384e589d3f 100644 --- a/src/battle/area_tik2/stage/tik_02.c +++ b/src/battle/area_tik2/stage/tik_02.c @@ -3,7 +3,7 @@ #define NAMESPACE b_area_tik2_tik_02 -#include "world/common/UnkFunc56.inc.c" +#include "world/common/todo/UnkFunc56.inc.c" EvtScript N(80230DF0) = { EVT_SET(LVarA, LVar1) diff --git a/src/battle/area_tik2/stage/tik_03.c b/src/battle/area_tik2/stage/tik_03.c index 851e389742..ea0353d44c 100644 --- a/src/battle/area_tik2/stage/tik_03.c +++ b/src/battle/area_tik2/stage/tik_03.c @@ -3,7 +3,7 @@ #define NAMESPACE b_area_tik2_tik_03 -#include "world/common/UnkFunc56.inc.c" +#include "world/common/todo/UnkFunc56.inc.c" EvtScript N(802319F0) = { EVT_SET(LVar1, ArrayVar(5)) diff --git a/src/battle/area_tik2/stage/tik_05.c b/src/battle/area_tik2/stage/tik_05.c index bdb6ae1c3d..0f2bc60f6f 100644 --- a/src/battle/area_tik2/stage/tik_05.c +++ b/src/battle/area_tik2/stage/tik_05.c @@ -26,7 +26,7 @@ EvtScript N(80233540) = { EvtScript N(beforeBattle) = { EVT_CALL(SetSpriteShading, -1) EVT_CALL(SetCamBGColor, 1, 0, 0, 0) - EVT_CALL(SetTexPanner, 15, 1) + EVT_CALL(SetTexPanner, 15, TEX_PANNER_1) EVT_CALL(EnableTexPanning, 15, 1) EVT_THREAD EVT_SET(LVar0, 1) @@ -44,7 +44,7 @@ EvtScript N(beforeBattle) = { EVT_SET(LVarC, 0) EVT_EXEC(N(80233540)) EVT_END_THREAD - EVT_CALL(SetTexPanner, 16, 2) + EVT_CALL(SetTexPanner, 16, TEX_PANNER_2) EVT_CALL(EnableTexPanning, 16, 1) EVT_THREAD EVT_SET(LVar0, 2) diff --git a/src/battle/area_tik3/stage/tik_01.c b/src/battle/area_tik3/stage/tik_01.c index 232eb9600b..24bc8a0eb8 100644 --- a/src/battle/area_tik3/stage/tik_01.c +++ b/src/battle/area_tik3/stage/tik_01.c @@ -3,7 +3,7 @@ #define NAMESPACE b_area_tik3_tik_01 -#include "world/common/UnkFunc56.inc.c" +#include "world/common/todo/UnkFunc56.inc.c" EvtScript N(802301F0) = { EVT_SET(LVarA, LVar1) diff --git a/src/battle/area_tik3/stage/tik_02.c b/src/battle/area_tik3/stage/tik_02.c index 11dd55f611..94a2e161eb 100644 --- a/src/battle/area_tik3/stage/tik_02.c +++ b/src/battle/area_tik3/stage/tik_02.c @@ -3,7 +3,7 @@ #define NAMESPACE b_area_tik3_tik_02 -#include "world/common/UnkFunc56.inc.c" +#include "world/common/todo/UnkFunc56.inc.c" EvtScript N(80230DF0) = { EVT_SET(LVarA, LVar1) diff --git a/src/battle/area_tik3/stage/tik_03.c b/src/battle/area_tik3/stage/tik_03.c index 2d832e62f0..049bfa1eff 100644 --- a/src/battle/area_tik3/stage/tik_03.c +++ b/src/battle/area_tik3/stage/tik_03.c @@ -3,7 +3,7 @@ #define NAMESPACE b_area_tik3_tik_03 -#include "world/common/UnkFunc56.inc.c" +#include "world/common/todo/UnkFunc56.inc.c" EvtScript N(802319F0) = { EVT_SET(LVar1, ArrayVar(5)) diff --git a/src/battle/area_tik3/stage/tik_05.c b/src/battle/area_tik3/stage/tik_05.c index d6c194876c..24a4e4d55a 100644 --- a/src/battle/area_tik3/stage/tik_05.c +++ b/src/battle/area_tik3/stage/tik_05.c @@ -26,7 +26,7 @@ EvtScript N(80233540) = { EvtScript N(beforeBattle) = { EVT_CALL(SetSpriteShading, -1) EVT_CALL(SetCamBGColor, 1, 0, 0, 0) - EVT_CALL(SetTexPanner, 15, 1) + EVT_CALL(SetTexPanner, 15, TEX_PANNER_1) EVT_CALL(EnableTexPanning, 15, 1) EVT_THREAD EVT_SET(LVar0, 1) @@ -44,7 +44,7 @@ EvtScript N(beforeBattle) = { EVT_SET(LVarC, 0) EVT_EXEC(N(80233540)) EVT_END_THREAD - EVT_CALL(SetTexPanner, 16, 2) + EVT_CALL(SetTexPanner, 16, TEX_PANNER_2) EVT_CALL(EnableTexPanning, 16, 1) EVT_THREAD EVT_SET(LVar0, 2) diff --git a/src/battle/area_trd_part_1/stage/trd_03.c b/src/battle/area_trd_part_1/stage/trd_03.c index c6a644d23a..fc441f4a5f 100644 --- a/src/battle/area_trd_part_1/stage/trd_03.c +++ b/src/battle/area_trd_part_1/stage/trd_03.c @@ -3,7 +3,7 @@ #define NAMESPACE b_area_trd_part_1_trd_03 -#include "world/common/clouds.inc.c" +#include "world/common/todo/clouds.inc.c" EvtScript N(beforeBattle_80223F08) = { EVT_CALL(SetSpriteShading, -1) diff --git a/src/battle/area_trd_part_2/stage/trd_03.c b/src/battle/area_trd_part_2/stage/trd_03.c index 5bd9c7fe06..5e8d88cae4 100644 --- a/src/battle/area_trd_part_2/stage/trd_03.c +++ b/src/battle/area_trd_part_2/stage/trd_03.c @@ -3,7 +3,7 @@ #define NAMESPACE b_area_trd_part_2_trd_03 -#include "world/common/clouds.inc.c" +#include "world/common/todo/clouds.inc.c" EvtScript N(beforeBattle_80232888) = { EVT_CALL(SetSpriteShading, -1) diff --git a/src/battle/common/actor/ghost_goombario.inc.c b/src/battle/common/actor/ghost_goombario.inc.c index 492c564178..84e80a9e5c 100644 --- a/src/battle/common/actor/ghost_goombario.inc.c +++ b/src/battle/common/actor/ghost_goombario.inc.c @@ -5,7 +5,7 @@ extern EvtScript N(goombario_takeTurn); extern EvtScript N(goombario_idle); extern EvtScript N(goombario_handleEvent); -#include "world/common/UnkFunc62.inc.c" +#include "world/common/todo/UnkFunc62.inc.c" #include "common/ActorJumpToPos.inc.c" #include "common/UnkActorSizeFunc.inc.c" #include "common/UnkEffect6CFunc.inc.c" diff --git a/src/battle/common/actor/gray_magikoopa.inc.c b/src/battle/common/actor/gray_magikoopa.inc.c index f1ce0134ae..85e01a7ef1 100644 --- a/src/battle/common/actor/gray_magikoopa.inc.c +++ b/src/battle/common/actor/gray_magikoopa.inc.c @@ -219,7 +219,7 @@ EvtScript N(idle) = { #include "common/GetSelectedMoveID.inc.c" #include "common/UnkBattleFunc1.inc.c" #include "common/StartRumbleWithParams.inc.c" -#include "world/common/UnkFunc52.inc.c" +#include "world/common/todo/UnkFunc52.inc.c" EvtScript N(handleEvent) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) diff --git a/src/battle/common/actor/green_magikoopa.inc.c b/src/battle/common/actor/green_magikoopa.inc.c index 336bcaec70..a291f26ec0 100644 --- a/src/battle/common/actor/green_magikoopa.inc.c +++ b/src/battle/common/actor/green_magikoopa.inc.c @@ -221,7 +221,7 @@ EvtScript N(idle) = { #include "common/GetSelectedMoveID.inc.c" #include "common/UnkBattleFunc1.inc.c" #include "common/StartRumbleWithParams.inc.c" -#include "world/common/UnkFunc52.inc.c" +#include "world/common/todo/UnkFunc52.inc.c" EvtScript N(handleEvent) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) diff --git a/src/battle/common/actor/magikoopa.inc.c b/src/battle/common/actor/magikoopa.inc.c index 37cc8b0983..1fd87791cc 100644 --- a/src/battle/common/actor/magikoopa.inc.c +++ b/src/battle/common/actor/magikoopa.inc.c @@ -1499,7 +1499,7 @@ EvtScript N(makeClone) = { EVT_END }; -#include "world/common/UnkFunc52.inc.c" +#include "world/common/todo/UnkFunc52.inc.c" EvtScript N(boostAttack) = { EVT_SET(LocalFlag(0), 0) diff --git a/src/battle/common/actor/red_magikoopa.inc.c b/src/battle/common/actor/red_magikoopa.inc.c index 15ff970589..c175b284a1 100644 --- a/src/battle/common/actor/red_magikoopa.inc.c +++ b/src/battle/common/actor/red_magikoopa.inc.c @@ -219,7 +219,7 @@ EvtScript N(idle) = { #include "common/GetSelectedMoveID.inc.c" #include "common/UnkBattleFunc1.inc.c" #include "common/StartRumbleWithParams.inc.c" -#include "world/common/UnkFunc52.inc.c" +#include "world/common/todo/UnkFunc52.inc.c" EvtScript N(handleEvent) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) diff --git a/src/battle/common/actor/slot_machine.inc.c b/src/battle/common/actor/slot_machine.inc.c index 5c58e4ec0a..66628a69ad 100644 --- a/src/battle/common/actor/slot_machine.inc.c +++ b/src/battle/common/actor/slot_machine.inc.c @@ -234,15 +234,15 @@ EvtScript N(idle) = { EVT_END_IF EVT_IF_EQ(ArrayVar(1), 0) EVT_ADD(LVarF, -277) - EVT_CALL(SetTexPanOffset, 11, 0, 0, LVarF) + EVT_CALL(SetTexPanOffset, TEX_PANNER_B, TEX_PANNER_MAIN, 0, LVarF) EVT_END_IF EVT_IF_EQ(ArrayVar(1), 1) EVT_ADD(LVarF, -1110) - EVT_CALL(SetTexPanOffset, 11, 0, 0, LVarF) + EVT_CALL(SetTexPanOffset, TEX_PANNER_B, TEX_PANNER_MAIN, 0, LVarF) EVT_END_IF EVT_IF_EQ(ArrayVar(1), 2) EVT_ADD(LVarF, -3330) - EVT_CALL(SetTexPanOffset, 11, 0, 0, LVarF) + EVT_CALL(SetTexPanOffset, TEX_PANNER_B, TEX_PANNER_MAIN, 0, LVarF) EVT_END_IF EVT_IF_EQ(ArrayVar(1), 2) EVT_GOTO(1) diff --git a/src/battle/common/actor/white_magikoopa.inc.c b/src/battle/common/actor/white_magikoopa.inc.c index 05f4818169..7e170bbc20 100644 --- a/src/battle/common/actor/white_magikoopa.inc.c +++ b/src/battle/common/actor/white_magikoopa.inc.c @@ -213,7 +213,7 @@ s32 N(idleAnimations_80223E08)[] = { #include "common/StartRumbleWithParams.inc.c" -#include "world/common/UnkFunc52.inc.c" +#include "world/common/todo/UnkFunc52.inc.c" #include "common/GetBootsHammerLevel.inc.c" diff --git a/src/battle/common/actor/yellow_magikoopa.inc.c b/src/battle/common/actor/yellow_magikoopa.inc.c index 6e9c442140..5bbfc30b5b 100644 --- a/src/battle/common/actor/yellow_magikoopa.inc.c +++ b/src/battle/common/actor/yellow_magikoopa.inc.c @@ -218,7 +218,7 @@ EvtScript N(idle) = { #include "common/GetSelectedMoveID.inc.c" #include "common/UnkBattleFunc1.inc.c" #include "common/StartRumbleWithParams.inc.c" -#include "world/common/UnkFunc52.inc.c" +#include "world/common/todo/UnkFunc52.inc.c" EvtScript N(handleEvent) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) diff --git a/src/battle/move/auto_jump/auto_jump.c b/src/battle/move/auto_jump/auto_jump.c index 7c93340a2d..99d4eb30a4 100644 --- a/src/battle/move/auto_jump/auto_jump.c +++ b/src/battle/move/auto_jump/auto_jump.c @@ -13,7 +13,7 @@ s32 N(D_802A10F0)[] = { 7, 3, 6, 2, 5, 2, 4, 2, }; -#include "world/common/UnkMoveFunc1.inc.c" +#include "world/common/todo/UnkMoveFunc1.inc.c" EvtScript N(CheckForAPress) = { EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_BeforeJump) diff --git a/src/battle/move/auto_multibounce/auto_multibounce.c b/src/battle/move/auto_multibounce/auto_multibounce.c index 86434d792d..d07620e4f7 100644 --- a/src/battle/move/auto_multibounce/auto_multibounce.c +++ b/src/battle/move/auto_multibounce/auto_multibounce.c @@ -13,7 +13,7 @@ s32 N(D_802A10F0)[] = { 7, 3, 6, 2, 5, 2, 4, 2, }; -#include "world/common/UnkMoveFunc1.inc.c" +#include "world/common/todo/UnkMoveFunc1.inc.c" EvtScript N(CheckForAPress) = { EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_BeforeJump) diff --git a/src/battle/move/auto_smash/763540.c b/src/battle/move/auto_smash/763540.c index 2a9da3388a..90d8be734a 100644 --- a/src/battle/move/auto_smash/763540.c +++ b/src/battle/move/auto_smash/763540.c @@ -2,6 +2,6 @@ #define NAMESPACE battle_move_auto_smash -#include "world/common/IsBerserkerEquipped.inc.c" +#include "world/common/todo/IsBerserkerEquipped.inc.c" -#include "world/common/IsRightOnEquipped.inc.c" +#include "world/common/todo/IsRightOnEquipped.inc.c" diff --git a/src/battle/move/d_down_jump/781920.c b/src/battle/move/d_down_jump/781920.c index 18fc4b4eb9..0bb65f67d0 100644 --- a/src/battle/move/d_down_jump/781920.c +++ b/src/battle/move/d_down_jump/781920.c @@ -3,7 +3,7 @@ #define NAMESPACE battle_move_d_down_jump -#include "world/common/UnkMoveFunc1.inc.c" +#include "world/common/todo/UnkMoveFunc1.inc.c" ApiStatus func_802A10E4_781A04(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; diff --git a/src/battle/move/d_down_pound/74AD90.c b/src/battle/move/d_down_pound/74AD90.c index 72ffc78fde..2ca44f1e88 100644 --- a/src/battle/move/d_down_pound/74AD90.c +++ b/src/battle/move/d_down_pound/74AD90.c @@ -3,9 +3,9 @@ #define NAMESPACE battle_move_d_down_pound -#include "world/common/IsBerserkerEquipped.inc.c" +#include "world/common/todo/IsBerserkerEquipped.inc.c" -#include "world/common/IsRightOnEquipped.inc.c" +#include "world/common/todo/IsRightOnEquipped.inc.c" ApiStatus func_802A10A4_74AE34(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; diff --git a/src/battle/move/dizzy_stomp/748DD0.c b/src/battle/move/dizzy_stomp/748DD0.c index 9c75b6898a..9734b0f2c2 100644 --- a/src/battle/move/dizzy_stomp/748DD0.c +++ b/src/battle/move/dizzy_stomp/748DD0.c @@ -2,4 +2,4 @@ #define NAMESPACE battle_move_dizzy_stomp -#include "world/common/UnkMoveFunc1.inc.c" +#include "world/common/todo/UnkMoveFunc1.inc.c" diff --git a/src/battle/move/earthquake_jump/785B20.c b/src/battle/move/earthquake_jump/785B20.c index d4bbc8d371..35219f3904 100644 --- a/src/battle/move/earthquake_jump/785B20.c +++ b/src/battle/move/earthquake_jump/785B20.c @@ -2,7 +2,7 @@ #define NAMESPACE battle_move_earthquake_jump -#include "world/common/UnkMoveFunc1.inc.c" +#include "world/common/todo/UnkMoveFunc1.inc.c" ApiStatus func_802A10E4_785C04(Evt* script, s32 isInitialCall) { script->varTable[0] = 3; diff --git a/src/battle/move/hammer/hammer.c b/src/battle/move/hammer/hammer.c index fc44156897..1f0d1637f4 100644 --- a/src/battle/move/hammer/hammer.c +++ b/src/battle/move/hammer/hammer.c @@ -8,9 +8,9 @@ extern EvtScript D_802A3168_00736708; extern EvtScript D_802A3C4C_007371EC; -#include "world/common/IsBerserkerEquipped.inc.c" +#include "world/common/todo/IsBerserkerEquipped.inc.c" -#include "world/common/IsRightOnEquipped.inc.c" +#include "world/common/todo/IsRightOnEquipped.inc.c" EvtScript D_802A10B0_734650 = { EVT_CALL(InitTargetIterator) diff --git a/src/battle/move/hammer_charge_0/74F130.c b/src/battle/move/hammer_charge_0/74F130.c index 2c9c79a09b..a31ea223ea 100644 --- a/src/battle/move/hammer_charge_0/74F130.c +++ b/src/battle/move/hammer_charge_0/74F130.c @@ -3,11 +3,11 @@ #define NAMESPACE battle_move_hammer_charge_0 -#include "world/common/IsBerserkerEquipped.inc.c" +#include "world/common/todo/IsBerserkerEquipped.inc.c" -#include "world/common/IsRightOnEquipped.inc.c" +#include "world/common/todo/IsRightOnEquipped.inc.c" -#include "world/common/IsHammerMaxCharged.inc.c" +#include "world/common/todo/IsHammerMaxCharged.inc.c" ApiStatus func_802A10C8_74F1F8(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; diff --git a/src/battle/move/hammer_charge_1/7595B0.c b/src/battle/move/hammer_charge_1/7595B0.c index c92c441845..a25008e5a8 100644 --- a/src/battle/move/hammer_charge_1/7595B0.c +++ b/src/battle/move/hammer_charge_1/7595B0.c @@ -5,11 +5,11 @@ extern s32 D_802A43D0; #define NAMESPACE battle_move_hammer_charge_1 -#include "world/common/IsBerserkerEquipped.inc.c" +#include "world/common/todo/IsBerserkerEquipped.inc.c" -#include "world/common/IsRightOnEquipped.inc.c" +#include "world/common/todo/IsRightOnEquipped.inc.c" -#include "world/common/IsHammerMaxCharged.inc.c" +#include "world/common/todo/IsHammerMaxCharged.inc.c" ApiStatus func_802A10C8_759678(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; @@ -39,7 +39,7 @@ ApiStatus func_802A10C8_759678(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -#include "world/common/UnkMoveFunc2.inc.c" +#include "world/common/todo/UnkMoveFunc2.inc.c" ApiStatus func_802A12FC_7598AC(Evt* script, s32 isInitialCall) { if (D_802A43D0 == 0) { diff --git a/src/battle/move/hammer_charge_2/75E5D0.c b/src/battle/move/hammer_charge_2/75E5D0.c index 5f5c1ee304..4b450ea640 100644 --- a/src/battle/move/hammer_charge_2/75E5D0.c +++ b/src/battle/move/hammer_charge_2/75E5D0.c @@ -5,11 +5,11 @@ extern s32 D_802A4350; #define NAMESPACE battle_move_hammer_charge_2 -#include "world/common/IsBerserkerEquipped.inc.c" +#include "world/common/todo/IsBerserkerEquipped.inc.c" -#include "world/common/IsRightOnEquipped.inc.c" +#include "world/common/todo/IsRightOnEquipped.inc.c" -#include "world/common/IsHammerMaxCharged.inc.c" +#include "world/common/todo/IsHammerMaxCharged.inc.c" ApiStatus func_802A10C8_75E698(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; @@ -39,7 +39,7 @@ ApiStatus func_802A10C8_75E698(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -#include "world/common/UnkMoveFunc3.inc.c" +#include "world/common/todo/UnkMoveFunc3.inc.c" ApiStatus func_802A12FC_75E8CC(Evt* script, s32 isInitialCall) { if (D_802A4350 == 0) { diff --git a/src/battle/move/hammer_throw/752450.c b/src/battle/move/hammer_throw/752450.c index dc036c52a8..9492c2746d 100644 --- a/src/battle/move/hammer_throw/752450.c +++ b/src/battle/move/hammer_throw/752450.c @@ -2,6 +2,6 @@ #define NAMESPACE battle_move_hammer_throw -#include "world/common/IsBerserkerEquipped.inc.c" +#include "world/common/todo/IsBerserkerEquipped.inc.c" -#include "world/common/IsRightOnEquipped.inc.c" +#include "world/common/todo/IsRightOnEquipped.inc.c" diff --git a/src/battle/move/jump/jump.c b/src/battle/move/jump/jump.c index 03dafc44e5..a16de6051e 100644 --- a/src/battle/move/jump/jump.c +++ b/src/battle/move/jump/jump.c @@ -22,7 +22,7 @@ s32 D_802A1140_73D9A0[] = { 5, 2, 4, 2, }; -#include "world/common/UnkMoveFunc1.inc.c" +#include "world/common/todo/UnkMoveFunc1.inc.c" EvtScript N(CheckForAPress) = { EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_BeforeJump) diff --git a/src/battle/move/jump_charge_0/74D570.c b/src/battle/move/jump_charge_0/74D570.c index c075ffdd29..c668fc6509 100644 --- a/src/battle/move/jump_charge_0/74D570.c +++ b/src/battle/move/jump_charge_0/74D570.c @@ -3,9 +3,9 @@ #define NAMESPACE battle_move_jump_charge_0 -#include "world/common/UnkMoveFunc1.inc.c" +#include "world/common/todo/UnkMoveFunc1.inc.c" -#include "world/common/IsJumpMaxCharged.inc.c" +#include "world/common/todo/IsJumpMaxCharged.inc.c" ApiStatus func_802A1108_74D678(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; diff --git a/src/battle/move/jump_charge_1/75C980.c b/src/battle/move/jump_charge_1/75C980.c index 41f18311cd..12638c21e9 100644 --- a/src/battle/move/jump_charge_1/75C980.c +++ b/src/battle/move/jump_charge_1/75C980.c @@ -5,9 +5,9 @@ extern s32 D_802A2C50; #define NAMESPACE battle_move_jump_charge_1 -#include "world/common/UnkMoveFunc1.inc.c" +#include "world/common/todo/UnkMoveFunc1.inc.c" -#include "world/common/IsJumpMaxCharged.inc.c" +#include "world/common/todo/IsJumpMaxCharged.inc.c" ApiStatus func_802A1108_75CA88(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; @@ -37,7 +37,7 @@ ApiStatus func_802A1108_75CA88(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -#include "world/common/UnkMoveFunc2.inc.c" +#include "world/common/todo/UnkMoveFunc2.inc.c" ApiStatus func_802A133C_75CCBC(Evt* script, s32 isInitialCall) { if (D_802A2C50 == 0) { diff --git a/src/battle/move/jump_charge_2/761920.c b/src/battle/move/jump_charge_2/761920.c index 7b03b465e6..2c4e75b489 100644 --- a/src/battle/move/jump_charge_2/761920.c +++ b/src/battle/move/jump_charge_2/761920.c @@ -5,9 +5,9 @@ extern s32 D_802A2C20; #define NAMESPACE battle_move_jump_charge_2 -#include "world/common/UnkMoveFunc1.inc.c" +#include "world/common/todo/UnkMoveFunc1.inc.c" -#include "world/common/IsJumpMaxCharged.inc.c" +#include "world/common/todo/IsJumpMaxCharged.inc.c" ApiStatus func_802A1108_761A28(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; @@ -37,7 +37,7 @@ ApiStatus func_802A1108_761A28(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -#include "world/common/UnkMoveFunc3.inc.c" +#include "world/common/todo/UnkMoveFunc3.inc.c" ApiStatus func_802A133C_761C5C(Evt* script, s32 isInitialCall) { if (D_802A2C20 == 0) { diff --git a/src/battle/move/mega_jump/770F30.c b/src/battle/move/mega_jump/770F30.c index b8f1097a18..9400d2e2ba 100644 --- a/src/battle/move/mega_jump/770F30.c +++ b/src/battle/move/mega_jump/770F30.c @@ -2,4 +2,4 @@ #define NAMESPACE battle_move_mega_jump -#include "world/common/UnkMoveFunc1.inc.c" +#include "world/common/todo/UnkMoveFunc1.inc.c" diff --git a/src/battle/move/mega_quake/756780.c b/src/battle/move/mega_quake/756780.c index 5fd9dc5a97..d29100e02d 100644 --- a/src/battle/move/mega_quake/756780.c +++ b/src/battle/move/mega_quake/756780.c @@ -2,9 +2,9 @@ #define NAMESPACE battle_move_mega_quake -#include "world/common/IsBerserkerEquipped.inc.c" +#include "world/common/todo/IsBerserkerEquipped.inc.c" -#include "world/common/IsRightOnEquipped.inc.c" +#include "world/common/todo/IsRightOnEquipped.inc.c" ApiStatus func_802A10A4_756824(Evt* script, s32 isInitialCall) { if (isInitialCall) { diff --git a/src/battle/move/mega_smash/777690.c b/src/battle/move/mega_smash/777690.c index 0fc2f22a5b..5671fbfcd3 100644 --- a/src/battle/move/mega_smash/777690.c +++ b/src/battle/move/mega_smash/777690.c @@ -2,6 +2,6 @@ #define NAMESPACE battle_move_mega_smash -#include "world/common/IsBerserkerEquipped.inc.c" +#include "world/common/todo/IsBerserkerEquipped.inc.c" -#include "world/common/IsRightOnEquipped.inc.c" +#include "world/common/todo/IsRightOnEquipped.inc.c" diff --git a/src/battle/move/multibounce/740CC0.c b/src/battle/move/multibounce/740CC0.c index b68169be56..4e944a6434 100644 --- a/src/battle/move/multibounce/740CC0.c +++ b/src/battle/move/multibounce/740CC0.c @@ -2,4 +2,4 @@ #define NAMESPACE battle_move_multibounce -#include "world/common/UnkMoveFunc1.inc.c" +#include "world/common/todo/UnkMoveFunc1.inc.c" diff --git a/src/battle/move/power_bounce/743DF0.c b/src/battle/move/power_bounce/743DF0.c index 47172f200f..0fe0265124 100644 --- a/src/battle/move/power_bounce/743DF0.c +++ b/src/battle/move/power_bounce/743DF0.c @@ -6,7 +6,7 @@ extern s32 D_802A2730_745520; extern s32 D_802A4020; -#include "world/common/UnkMoveFunc1.inc.c" +#include "world/common/todo/UnkMoveFunc1.inc.c" ApiStatus func_802A10E4_743ED4(Evt* script, s32 isInitialCall) { Actor* targetActor = get_actor(get_actor(script->owner1.actorID)->targetActorID); diff --git a/src/battle/move/power_jump/76D760.c b/src/battle/move/power_jump/76D760.c index 465eec91ff..976f233239 100644 --- a/src/battle/move/power_jump/76D760.c +++ b/src/battle/move/power_jump/76D760.c @@ -2,4 +2,4 @@ #define NAMESPACE battle_move_power_jump -#include "world/common/UnkMoveFunc1.inc.c" +#include "world/common/todo/UnkMoveFunc1.inc.c" diff --git a/src/battle/move/power_quake/767C90.c b/src/battle/move/power_quake/767C90.c index 8ef84976ab..fa067494fe 100644 --- a/src/battle/move/power_quake/767C90.c +++ b/src/battle/move/power_quake/767C90.c @@ -2,6 +2,6 @@ #define NAMESPACE battle_move_power_quake -#include "world/common/IsBerserkerEquipped.inc.c" +#include "world/common/todo/IsBerserkerEquipped.inc.c" -#include "world/common/IsRightOnEquipped.inc.c" +#include "world/common/todo/IsRightOnEquipped.inc.c" diff --git a/src/battle/move/power_smash/772BA0.c b/src/battle/move/power_smash/772BA0.c index 141fd51c12..6bde68f4ea 100644 --- a/src/battle/move/power_smash/772BA0.c +++ b/src/battle/move/power_smash/772BA0.c @@ -2,6 +2,6 @@ #define NAMESPACE battle_move_power_smash -#include "world/common/IsBerserkerEquipped.inc.c" +#include "world/common/todo/IsBerserkerEquipped.inc.c" -#include "world/common/IsRightOnEquipped.inc.c" +#include "world/common/todo/IsRightOnEquipped.inc.c" diff --git a/src/battle/move/quake_hammer/quake_hammer.c b/src/battle/move/quake_hammer/quake_hammer.c index 5aaf2fd21d..529c38b13b 100644 --- a/src/battle/move/quake_hammer/quake_hammer.c +++ b/src/battle/move/quake_hammer/quake_hammer.c @@ -7,9 +7,9 @@ extern EvtScript D_802A3168_0073D038; -#include "world/common/IsBerserkerEquipped.inc.c" +#include "world/common/todo/IsBerserkerEquipped.inc.c" -#include "world/common/IsRightOnEquipped.inc.c" +#include "world/common/todo/IsRightOnEquipped.inc.c" EvtScript D_802A10B0_73AF80 = { EVT_CALL(InitTargetIterator) diff --git a/src/battle/move/shell_crack/77F240.c b/src/battle/move/shell_crack/77F240.c index 0aad0c4e01..2c7cc71761 100644 --- a/src/battle/move/shell_crack/77F240.c +++ b/src/battle/move/shell_crack/77F240.c @@ -5,9 +5,9 @@ #define NAMESPACE battle_move_shell_crack -#include "world/common/IsBerserkerEquipped.inc.c" +#include "world/common/todo/IsBerserkerEquipped.inc.c" -#include "world/common/IsRightOnEquipped.inc.c" +#include "world/common/todo/IsRightOnEquipped.inc.c" ApiStatus func_802A10A4_77F2E4(Evt* script, s32 isInitialCall) { ActorState* playerActorState = &gBattleStatus.playerActor->state; diff --git a/src/battle/move/shrink_smash/77CB80.c b/src/battle/move/shrink_smash/77CB80.c index 645a127a78..36951a6866 100644 --- a/src/battle/move/shrink_smash/77CB80.c +++ b/src/battle/move/shrink_smash/77CB80.c @@ -2,6 +2,6 @@ #define NAMESPACE battle_move_shrink_smash -#include "world/common/IsBerserkerEquipped.inc.c" +#include "world/common/todo/IsBerserkerEquipped.inc.c" -#include "world/common/IsRightOnEquipped.inc.c" +#include "world/common/todo/IsRightOnEquipped.inc.c" diff --git a/src/battle/move/shrink_stomp/783BA0.c b/src/battle/move/shrink_stomp/783BA0.c index 0955282433..eb6a251c58 100644 --- a/src/battle/move/shrink_stomp/783BA0.c +++ b/src/battle/move/shrink_stomp/783BA0.c @@ -2,4 +2,4 @@ #define NAMESPACE battle_move_shrink_stomp -#include "world/common/UnkMoveFunc1.inc.c" +#include "world/common/todo/UnkMoveFunc1.inc.c" diff --git a/src/battle/move/sleep_stomp/746E10.c b/src/battle/move/sleep_stomp/746E10.c index 3a15c8f9b4..208d77deb1 100644 --- a/src/battle/move/sleep_stomp/746E10.c +++ b/src/battle/move/sleep_stomp/746E10.c @@ -2,4 +2,4 @@ #define NAMESPACE battle_move_sleep_stomp -#include "world/common/UnkMoveFunc1.inc.c" +#include "world/common/todo/UnkMoveFunc1.inc.c" diff --git a/src/battle/move/spin_smash/spin_smash.c b/src/battle/move/spin_smash/spin_smash.c index 9c1f8b92c6..42ad72e0ff 100644 --- a/src/battle/move/spin_smash/spin_smash.c +++ b/src/battle/move/spin_smash/spin_smash.c @@ -33,9 +33,9 @@ ApiStatus func_802A1074_737904(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -#include "world/common/IsBerserkerEquipped.inc.c" +#include "world/common/todo/IsBerserkerEquipped.inc.c" -#include "world/common/IsRightOnEquipped.inc.c" +#include "world/common/todo/IsRightOnEquipped.inc.c" EvtScript D_802A1190_737A20 = { EVT_CALL(InitTargetIterator) diff --git a/src/battle/move/super_jump/76F330.c b/src/battle/move/super_jump/76F330.c index 274422a9b5..b6f0484c8b 100644 --- a/src/battle/move/super_jump/76F330.c +++ b/src/battle/move/super_jump/76F330.c @@ -2,4 +2,4 @@ #define NAMESPACE battle_move_super_jump -#include "world/common/UnkMoveFunc1.inc.c" +#include "world/common/todo/UnkMoveFunc1.inc.c" diff --git a/src/battle/move/super_smash/775100.c b/src/battle/move/super_smash/775100.c index 3ed3cd7b9c..fb33196005 100644 --- a/src/battle/move/super_smash/775100.c +++ b/src/battle/move/super_smash/775100.c @@ -2,6 +2,6 @@ #define NAMESPACE battle_move_super_smash -#include "world/common/IsBerserkerEquipped.inc.c" +#include "world/common/todo/IsBerserkerEquipped.inc.c" -#include "world/common/IsRightOnEquipped.inc.c" +#include "world/common/todo/IsRightOnEquipped.inc.c" diff --git a/src/battle/move/unknown_move/779C90.c b/src/battle/move/unknown_move/779C90.c index 5adfab4aca..b47b1b6876 100644 --- a/src/battle/move/unknown_move/779C90.c +++ b/src/battle/move/unknown_move/779C90.c @@ -4,7 +4,7 @@ #define NAMESPACE battle_move_unknown_move -#include "world/common/UnkMoveFunc1.inc.c" +#include "world/common/todo/UnkMoveFunc1.inc.c" extern s32 D_802A26D0_77B360; diff --git a/src/world/area_arn/arn_05/arn_05_2_npc.c b/src/world/area_arn/arn_05/arn_05_2_npc.c index eb110a3dfc..255f006ef8 100644 --- a/src/world/area_arn/arn_05/arn_05_2_npc.c +++ b/src/world/area_arn/arn_05/arn_05_2_npc.c @@ -26,7 +26,7 @@ API_CALLABLE(N(AwaitCDownPress)) { } } -#include "world/common/SwitchToPartner.inc.c" +#include "world/common/todo/SwitchToPartner.inc.c" EvtScript N(EVS_NpcInteract_Boo_01) = { EVT_SWITCH(GB_StoryProgress) diff --git a/src/world/area_arn/arn_07/arn_07_1_main.c b/src/world/area_arn/arn_07/arn_07_1_main.c index daa3bebcee..78546ada1e 100644 --- a/src/world/area_arn/arn_07/arn_07_1_main.c +++ b/src/world/area_arn/arn_07/arn_07_1_main.c @@ -8,7 +8,7 @@ extern NpcGroupList N(DefaultNPCs); extern NpcGroupList N(BossNPCs); extern NpcGroupList N(SpiritNPCs); -#include "world/common/StarSpiritEffectFunc.inc.c" +#include "world/common/todo/StarSpiritEffectFunc.inc.c" s32 N(KeyList)[] = { ITEM_MYSTICAL_KEY, diff --git a/src/world/area_arn/arn_07/arn_07_3_entity.c b/src/world/area_arn/arn_07/arn_07_3_entity.c index fe008e9b33..8d650a19d0 100644 --- a/src/world/area_arn/arn_07/arn_07_3_entity.c +++ b/src/world/area_arn/arn_07/arn_07_3_entity.c @@ -5,8 +5,8 @@ extern EvtScript(N(EVS_ExitDoor_arn_08_0)); MAP_RODATA_PAD(1,entity); -#include "world/common/RemovePadlock.inc.c" -#include "world/common/GetEntityPosition.inc.c" +#include "world/common/todo/RemovePadlock.inc.c" +#include "world/common/todo/GetEntityPosition.inc.c" EvtScript N(EVS_UnlockDoor) = { EVT_SET_GROUP(EVT_GROUP_00) diff --git a/src/world/area_dgb/dgb_00/BFA100.c b/src/world/area_dgb/dgb_00/BFA100.c index 2ab96d560c..b1df7afaec 100644 --- a/src/world/area_dgb/dgb_00/BFA100.c +++ b/src/world/area_dgb/dgb_00/BFA100.c @@ -34,7 +34,7 @@ NpcSettings N(npcSettings_8024066C) = { EvtScript N(80240698) = { EVT_SET(LVar3, 0) EVT_SUB(LVar3, LVar2) - EVT_CALL(ModifyColliderFlags, 0, 18, 0x7FFFFE00) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, 18, 0x7FFFFE00) EVT_CALL(PlaySoundAtCollider, 18, 455, 0) EVT_CALL(MakeLerp, 0, 80, 30, 0) EVT_LABEL(10) diff --git a/src/world/area_dgb/dgb_01/BFD8C0.c b/src/world/area_dgb/dgb_01/BFD8C0.c index 6535160fb2..9ef3acb5da 100644 --- a/src/world/area_dgb/dgb_01/BFD8C0.c +++ b/src/world/area_dgb/dgb_01/BFD8C0.c @@ -1,7 +1,7 @@ #include "dgb_01.h" -#include "world/common/RemovePadlock.inc.c" +#include "world/common/todo/RemovePadlock.inc.c" -#include "world/common/GetEntityPosition.inc.c" +#include "world/common/todo/GetEntityPosition.inc.c" diff --git a/src/world/area_dgb/dgb_01/BFD9A0.c b/src/world/area_dgb/dgb_01/BFD9A0.c index d452d73734..3f4f2cf032 100644 --- a/src/world/area_dgb/dgb_01/BFD9A0.c +++ b/src/world/area_dgb/dgb_01/BFD9A0.c @@ -418,17 +418,17 @@ EvtScript N(802449C4) = { EVT_SWITCH(GB_StoryProgress) EVT_CASE_LT(-29) EVT_CALL(SetGroupEnabled, 210, 0) - EVT_CALL(ModifyColliderFlags, 0, 50, 0x7FFFFE00) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, 50, 0x7FFFFE00) EVT_CASE_EQ(-29) EVT_CALL(SetGroupEnabled, 210, 0) - EVT_CALL(ModifyColliderFlags, 0, 50, 0x7FFFFE00) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, 50, 0x7FFFFE00) EVT_EXEC(N(80243EF0)) EVT_CASE_LT(-16) EVT_CALL(SetGroupEnabled, 112, 0) - EVT_CALL(ModifyColliderFlags, 0, 40, 0x7FFFFE00) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, 40, 0x7FFFFE00) EVT_CASE_DEFAULT EVT_CALL(SetGroupEnabled, 210, 0) - EVT_CALL(ModifyColliderFlags, 0, 50, 0x7FFFFE00) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, 50, 0x7FFFFE00) EVT_END_SWITCH EVT_RETURN EVT_END @@ -506,7 +506,7 @@ MobileAISettings N(npcAISettings_80244D24) = { #define AI_SENTINEL_FIRST_NPC 0 #define AI_SENTINEL_LAST_NPC 4 -#include "world/common/enemy/SentinelAI.inc.c" +#include "world/common/enemy/ai/SentinelAI.inc.c" extern const char N(dgb_00_name_hack)[]; @@ -722,9 +722,9 @@ EvtScript N(init_80245784) = { const char N(dgb_00_name_hack)[] = "dgb_00"; -#include "world/common/enemy/PatrolNoAttackAI.inc.c" +#include "world/common/enemy/ai/PatrolNoAttackAI.inc.c" -#include "world/common/UnkFunc1.inc.c" +#include "world/common/todo/UnkFunc1.inc.c" extern const char N(dgb_08_name_hack)[]; diff --git a/src/world/area_dgb/dgb_02/C2EBA0.c b/src/world/area_dgb/dgb_02/C2EBA0.c index a92eda25e0..7defca8648 100644 --- a/src/world/area_dgb/dgb_02/C2EBA0.c +++ b/src/world/area_dgb/dgb_02/C2EBA0.c @@ -430,5 +430,5 @@ NpcGroupList N(npcGroupList_802425C8) = { {}, }; -#include "world/common/enemy/WanderMeleeAI.inc.c" -#include "world/common/enemy/ClubbaNappingAI.inc.c" +#include "world/common/enemy/ai/WanderMeleeAI.inc.c" +#include "world/common/enemy/ai/ClubbaNappingAI.inc.c" diff --git a/src/world/area_dgb/dgb_03/C314E0.c b/src/world/area_dgb/dgb_03/C314E0.c index 3d0f581cca..fa07d59ca3 100644 --- a/src/world/area_dgb/dgb_03/C314E0.c +++ b/src/world/area_dgb/dgb_03/C314E0.c @@ -1,9 +1,9 @@ #include "dgb_03.h" -#include "world/common/UnkFunc11.inc.c" +#include "world/common/todo/UnkFunc11.inc.c" -#include "world/common/UnkFunc12.inc.c" +#include "world/common/todo/UnkFunc12.inc.c" -#include "world/common/RemovePadlock.inc.c" +#include "world/common/todo/RemovePadlock.inc.c" -#include "world/common/GetEntityPosition.inc.c" +#include "world/common/todo/GetEntityPosition.inc.c" diff --git a/src/world/area_dgb/dgb_03/C31730.c b/src/world/area_dgb/dgb_03/C31730.c index 406c2205d9..4948babf6f 100644 --- a/src/world/area_dgb/dgb_03/C31730.c +++ b/src/world/area_dgb/dgb_03/C31730.c @@ -776,10 +776,10 @@ NpcGroupList N(npcGroupList_80244988) = { {}, }; -#include "world/common/enemy/WanderMeleeAI.inc.c" +#include "world/common/enemy/ai/WanderMeleeAI.inc.c" -#include "world/common/enemy/PatrolNoAttackAI.inc.c" +#include "world/common/enemy/ai/PatrolNoAttackAI.inc.c" -#include "world/common/enemy/ClubbaPatrolAI.inc.c" +#include "world/common/enemy/ai/ClubbaPatrolAI.inc.c" -#include "world/common/enemy/ClubbaNappingAI.inc.c" +#include "world/common/enemy/ai/ClubbaNappingAI.inc.c" diff --git a/src/world/area_dgb/dgb_04/C36530.c b/src/world/area_dgb/dgb_04/C36530.c index 17ffe99646..6337abe7e7 100644 --- a/src/world/area_dgb/dgb_04/C36530.c +++ b/src/world/area_dgb/dgb_04/C36530.c @@ -274,7 +274,7 @@ NpcGroupList N(npcGroupList_80243D18) = { #define SUPER_BLOCK_MAPVAR MapVar(0) #define SUPER_BLOCK_GAMEFLAG GF_DGB04_SuperBlock -#include "world/common/atomic/SuperBlock.data.inc.c" +#include "world/common/entity/SuperBlock.data.inc.c" EvtScript N(makeEntities) = { EVT_MAKE_SUPER_BLOCK(500, -360, 110, 0) @@ -284,8 +284,8 @@ EvtScript N(makeEntities) = { #define AI_SENTINEL_FIRST_NPC 0 #define AI_SENTINEL_LAST_NPC 0 -#include "world/common/enemy/SentinelAI.inc.c" +#include "world/common/enemy/ai/SentinelAI.inc.c" -#include "world/common/atomic/SuperBlock.inc.c" +#include "world/common/entity/SuperBlock.inc.c" const char N(dgb_00_name_hack)[] = "dgb_00"; diff --git a/src/world/area_dgb/dgb_05/C3AA10.c b/src/world/area_dgb/dgb_05/C3AA10.c index 4e65292ff4..0810a93f2a 100644 --- a/src/world/area_dgb/dgb_05/C3AA10.c +++ b/src/world/area_dgb/dgb_05/C3AA10.c @@ -79,7 +79,7 @@ EvtScript N(main) = { EVT_END_IF EVT_EXEC_WAIT(N(makeEntities)) EVT_EXEC(N(802417F0)) - EVT_CALL(ModifyColliderFlags, 0, 18, 0x7FFFFE00) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, 18, 0x7FFFFE00) EVT_CALL(EnableModel, 20, 0) EVT_BIND_TRIGGER(N(exitSingleDoor_80241580), TRIGGER_WALL_PRESS_A, 16, 1, 0) EVT_EXEC(N(802414E0)) @@ -365,5 +365,5 @@ ApiStatus N(func_80240030_C3AA40)(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -#include "world/common/enemy/ClubbaNappingAI.inc.c" -#include "world/common/enemy/WanderMeleeAI.inc.c" +#include "world/common/enemy/ai/ClubbaNappingAI.inc.c" +#include "world/common/enemy/ai/WanderMeleeAI.inc.c" diff --git a/src/world/area_dgb/dgb_07/C3DBF0.c b/src/world/area_dgb/dgb_07/C3DBF0.c index 0bc4daf48b..1e50d90a75 100644 --- a/src/world/area_dgb/dgb_07/C3DBF0.c +++ b/src/world/area_dgb/dgb_07/C3DBF0.c @@ -268,6 +268,6 @@ static const s32 N(pad_1E74)[] = { 0x00000000, 0x00000000 }; -#include "world/common/enemy/ClubbaNappingAI.inc.c" +#include "world/common/enemy/ai/ClubbaNappingAI.inc.c" -#include "world/common/enemy/WanderMeleeAI.inc.c" +#include "world/common/enemy/ai/WanderMeleeAI.inc.c" diff --git a/src/world/area_dgb/dgb_08/C3FDB0.c b/src/world/area_dgb/dgb_08/C3FDB0.c index 84b06768d5..eed90cf59e 100644 --- a/src/world/area_dgb/dgb_08/C3FDB0.c +++ b/src/world/area_dgb/dgb_08/C3FDB0.c @@ -1010,15 +1010,15 @@ EvtScript N(802469E0) = { EVT_END }; -#include "world/common/enemy/PatrolNoAttackAI.inc.c" +#include "world/common/enemy/ai/PatrolNoAttackAI.inc.c" -#include "world/common/enemy/WanderMeleeAI.inc.c" +#include "world/common/enemy/ai/WanderMeleeAI.inc.c" #define AI_SENTINEL_FIRST_NPC 7 #define AI_SENTINEL_LAST_NPC 9 -#include "world/common/enemy/SentinelAI.inc.c" +#include "world/common/enemy/ai/SentinelAI.inc.c" -#include "world/common/UnkFunc1.inc.c" +#include "world/common/todo/UnkFunc1.inc.c" ApiStatus N(func_80243B98_C43948)(Evt* script, s32 isInitialCall) { if (get_enemy_safe(9) != 0) { diff --git a/src/world/area_dgb/dgb_09/C46BE0.c b/src/world/area_dgb/dgb_09/C46BE0.c index 056df894c0..2d642f13c8 100644 --- a/src/world/area_dgb/dgb_09/C46BE0.c +++ b/src/world/area_dgb/dgb_09/C46BE0.c @@ -166,7 +166,7 @@ EvtScript N(80243E60) = { EVT_CALL(EnableModel, 25, 0) EVT_WAIT(1) EVT_END_LOOP - EVT_CALL(ModifyColliderFlags, 0, 13, 0x7FFFFE00) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, 13, 0x7FFFFE00) EVT_SET(GF_DGB09_BombedWall, 1) EVT_UNBIND EVT_RETURN @@ -179,7 +179,7 @@ EvtScript N(80243F6C) = { EVT_CALL(EnableModel, 29, 0) EVT_ELSE EVT_CALL(EnableModel, 25, 0) - EVT_CALL(ModifyColliderFlags, 0, 13, 0x7FFFFE00) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, 13, 0x7FFFFE00) EVT_END_IF EVT_RETURN EVT_END @@ -632,12 +632,12 @@ NpcGroupList N(npcGroupList_8024533C) = { {}, }; -#include "world/common/enemy/WanderMeleeAI.inc.c" +#include "world/common/enemy/ai/WanderMeleeAI.inc.c" -#include "world/common/enemy/ClubbaNappingAI.inc.c" +#include "world/common/enemy/ai/ClubbaNappingAI.inc.c" #define AI_SENTINEL_FIRST_NPC 0 #define AI_SENTINEL_LAST_NPC 0 -#include "world/common/enemy/SentinelAI.inc.c" +#include "world/common/enemy/ai/SentinelAI.inc.c" const char N(dgb_00_name_hack)[] = "dgb_00"; diff --git a/src/world/area_dgb/dgb_10/C4C390.c b/src/world/area_dgb/dgb_10/C4C390.c index 0875bee157..410c30d4f3 100644 --- a/src/world/area_dgb/dgb_10/C4C390.c +++ b/src/world/area_dgb/dgb_10/C4C390.c @@ -77,13 +77,13 @@ EvtScript N(main) = { EVT_EXEC_WAIT(N(makeEntities)) EVT_EXEC(N(80240E68)) EVT_EXEC(N(80240250)) - EVT_CALL(ModifyColliderFlags, 0, 9, 0x7FFFFE00) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, 9, 0x7FFFFE00) EVT_CALL(EnableModel, 6, 0) EVT_CALL(EnableModel, 12, 0) EVT_CALL(EnableModel, 18, 0) - EVT_CALL(ModifyColliderFlags, 0, 12, 0x7FFFFE00) - EVT_CALL(ModifyColliderFlags, 0, 13, 0x7FFFFE00) - EVT_CALL(ModifyColliderFlags, 0, 14, 0x7FFFFE00) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, 12, 0x7FFFFE00) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, 13, 0x7FFFFE00) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, 14, 0x7FFFFE00) EVT_EXEC(N(enterWalk_80240378)) EVT_RETURN EVT_END @@ -124,7 +124,7 @@ EvtScript N(80240770) = { EVT_CALL(ModifyColliderFlags, 1, ArrayVar(0), 0x7FFFFE00) EVT_CALL(EnableModel, ArrayVar(1), 1) EVT_WAIT(1) - EVT_CALL(ModifyColliderFlags, 0, ArrayVar(0), 0x7FFFFE00) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, ArrayVar(0), 0x7FFFFE00) EVT_CALL(EnableModel, ArrayVar(1), 0) EVT_WAIT(1) EVT_END_LOOP @@ -314,7 +314,7 @@ ApiStatus N(func_80240000_C4C390)(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -#include "world/common/UnkDistFunc2.inc.c" +#include "world/common/todo/UnkDistFunc2.inc.c" ApiStatus N(func_8024013C_C4C4CC)(Evt* script, s32 isInitialCall) { PlayerStatus* playerStatus = &gPlayerStatus; diff --git a/src/world/area_dgb/dgb_12/C4DEF0.c b/src/world/area_dgb/dgb_12/C4DEF0.c index 12ec5a2104..9109131d5b 100644 --- a/src/world/area_dgb/dgb_12/C4DEF0.c +++ b/src/world/area_dgb/dgb_12/C4DEF0.c @@ -94,7 +94,7 @@ EvtScript N(802405E0) = { EVT_LOOP(0) EVT_THREAD EVT_WAIT(2) - EVT_CALL(ModifyColliderFlags, 0, 0, 0x7FFFFE00) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, 0, 0x7FFFFE00) EVT_END_THREAD EVT_CALL(MakeLerp, 0, -35, 15, 0) EVT_LOOP(0) diff --git a/src/world/area_dgb/dgb_13/C4E960.c b/src/world/area_dgb/dgb_13/C4E960.c index 391c1b82b3..13b81fe196 100644 --- a/src/world/area_dgb/dgb_13/C4E960.c +++ b/src/world/area_dgb/dgb_13/C4E960.c @@ -45,7 +45,7 @@ EvtScript N(main) = { EVT_CALL(SetCamLeadPlayer, 0, 0) EVT_CALL(SetCamEnabled, 0, 1) EVT_EXEC_WAIT(N(80240270)) - EVT_CALL(ModifyColliderFlags, 0, 6, 0x7FFFFE00) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, 6, 0x7FFFFE00) EVT_EXEC_WAIT(N(80240680)) EVT_EXEC(N(80240050)) EVT_SET(LVar0, EVT_PTR(N(8024014C))) diff --git a/src/world/area_dgb/dgb_15/C4F510.c b/src/world/area_dgb/dgb_15/C4F510.c index 53a6267a0f..64835b7c5d 100644 --- a/src/world/area_dgb/dgb_15/C4F510.c +++ b/src/world/area_dgb/dgb_15/C4F510.c @@ -467,10 +467,10 @@ EvtScript N(makeEntities) = { EVT_END }; -#include "world/common/enemy/WanderMeleeAI.inc.c" +#include "world/common/enemy/ai/WanderMeleeAI.inc.c" -#include "world/common/enemy/PatrolNoAttackAI.inc.c" +#include "world/common/enemy/ai/PatrolNoAttackAI.inc.c" -#include "world/common/UnkFunc1.inc.c" +#include "world/common/todo/UnkFunc1.inc.c" const char N(dgb_14_name_hack)[] = "dgb_14"; diff --git a/src/world/area_dgb/dgb_15/C50CA0.c b/src/world/area_dgb/dgb_15/C50CA0.c index b8d22cdde1..892eb3bd12 100644 --- a/src/world/area_dgb/dgb_15/C50CA0.c +++ b/src/world/area_dgb/dgb_15/C50CA0.c @@ -1,5 +1,5 @@ #include "dgb_15.h" -#include "world/common/GetEntityPosition.inc.c" +#include "world/common/todo/GetEntityPosition.inc.c" -#include "world/common/RemovePadlock.inc.c" +#include "world/common/todo/RemovePadlock.inc.c" diff --git a/src/world/area_dgb/dgb_16/C52540.c b/src/world/area_dgb/dgb_16/C52540.c index eeb38c98f9..e9268af62e 100644 --- a/src/world/area_dgb/dgb_16/C52540.c +++ b/src/world/area_dgb/dgb_16/C52540.c @@ -644,6 +644,6 @@ NpcGroupList N(npcGroupList_8024318C) = { {}, }; -#include "world/common/enemy/ClubbaNappingAI.inc.c" +#include "world/common/enemy/ai/ClubbaNappingAI.inc.c" -#include "world/common/enemy/WanderMeleeAI.inc.c" +#include "world/common/enemy/ai/WanderMeleeAI.inc.c" diff --git a/src/world/area_dgb/dgb_18/C55F40.c b/src/world/area_dgb/dgb_18/C55F40.c index 69613f32b0..c99fb5bdf7 100644 --- a/src/world/area_dgb/dgb_18/C55F40.c +++ b/src/world/area_dgb/dgb_18/C55F40.c @@ -705,9 +705,9 @@ EvtScript N(makeEntities) = { EVT_END }; -#include "world/common/enemy/PatrolNoAttackAI.inc.c" +#include "world/common/enemy/ai/PatrolNoAttackAI.inc.c" -#include "world/common/UnkFunc1.inc.c" +#include "world/common/todo/UnkFunc1.inc.c" ApiStatus N(func_80240EBC_C56DFC)(Evt* script, s32 isInitialCall) { PlayerStatus* playerStatus = &gPlayerStatus; diff --git a/src/world/area_dgb/dgb_18/C56EF0.c b/src/world/area_dgb/dgb_18/C56EF0.c index ccda9078d3..c27d15b3ef 100644 --- a/src/world/area_dgb/dgb_18/C56EF0.c +++ b/src/world/area_dgb/dgb_18/C56EF0.c @@ -4,10 +4,10 @@ // #include "world/common/atomic/Chest.old.inc.c" // after data is done -#include "world/common/StashVars.inc.c" +#include "world/common/todo/StashVars.inc.c" -#include "world/common/GetItemName.inc.c" +#include "world/common/todo/GetItemName.inc.c" -#include "world/common/SomeItemEntityFunc.inc.c" +#include "world/common/todo/SomeItemEntityFunc.inc.c" -#include "world/common/IsItemBadge.inc.c" +#include "world/common/todo/IsItemBadge.inc.c" diff --git a/src/world/area_dro/dro_01/95B200.c b/src/world/area_dro/dro_01/95B200.c index 6eae21822b..1fc7339874 100644 --- a/src/world/area_dro/dro_01/95B200.c +++ b/src/world/area_dro/dro_01/95B200.c @@ -1,6 +1,6 @@ #include "dro_01.h" -#include "world/common/atomic/Pipe.inc.c" +#include "world/common/entity/Pipe.inc.c" #include "world/common/atomic/UnkFunc27.inc.c" diff --git a/src/world/area_dro/dro_01/95B7E0.c b/src/world/area_dro/dro_01/95B7E0.c index 4bfde5317d..9b39357957 100644 --- a/src/world/area_dro/dro_01/95B7E0.c +++ b/src/world/area_dro/dro_01/95B7E0.c @@ -109,7 +109,7 @@ EvtScript N(80243BB0) = { EVT_END }; -#include "world/common/atomic/PipeData.inc.c" +#include "world/common/entity/PipeData.inc.c" EvtScript N(exitWalk_80244960) = { EVT_SET_GROUP(EVT_GROUP_1B) @@ -1824,7 +1824,7 @@ EvtScript N(8024C8D4) = { EVT_CALL(DisablePlayerInput, TRUE) EVT_CALL(DisablePlayerPhysics, TRUE) EVT_CALL(HidePlayerShadow, TRUE) - EVT_CALL(ModifyColliderFlags, 0, LVarB, 0x7FFFFE00) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, LVarB, 0x7FFFFE00) EVT_CALL(GetEntryID, LVar0) EVT_CALL(N(dup_Pipe_GetEntryPos)) EVT_SET(LVar5, LVar1) @@ -1963,7 +1963,7 @@ EvtScript N(8024CF7C) = { EVT_SET_GROUP(EVT_GROUP_1B) EVT_CALL(N(dup_Pipe_SetAnimFlag)) EVT_CALL(DisablePlayerPhysics, TRUE) - EVT_CALL(ModifyColliderFlags, 0, LVarB, 0x7FFFFE00) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, LVarB, 0x7FFFFE00) EVT_SET(LVar0, LVarA) EVT_CALL(N(dup_Pipe_GetEntryPos)) EVT_SET(LVar5, LVar1) @@ -2026,13 +2026,13 @@ EvtScript N(makeEntities) = { EVT_END }; -#include "world/common/enemy/PatrolNoAttackAI.inc.c" +#include "world/common/enemy/ai/PatrolNoAttackAI.inc.c" #include "world/common/atomic/Quizmo.inc.c" -#include "world/common/GetNpcCollisionHeight.inc.c" +#include "world/common/todo/GetNpcCollisionHeight.inc.c" -#include "world/common/AddPlayerHandsOffset.inc.c" +#include "world/common/todo/AddPlayerHandsOffset.inc.c" ApiStatus N(func_80242730_95D930)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; @@ -2185,7 +2185,7 @@ ApiStatus N(func_80242858_95DA58)(Evt* script, s32 isInitialCall) { return ApiStatus_BLOCK; } -#include "world/common/LetterDelivery.inc.c" +#include "world/common/todo/LetterDelivery.inc.c" ApiStatus N(func_80243084_95E284)(Evt* script, s32 isInitialCall) { PlayerData* playerData = &gPlayerData; @@ -2194,7 +2194,7 @@ ApiStatus N(func_80243084_95E284)(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -#include "world/common/GetFloorCollider.inc.c" +#include "world/common/todo/GetFloorCollider.inc.c" void N(func_802430C8_95E2C8)(Unk_Struct_1* ptr, s32 arg1) { PlayerStatus* playerStatus = &gPlayerStatus; diff --git a/src/world/area_dro/dro_01/95E660.c b/src/world/area_dro/dro_01/95E660.c index b5ab65f901..7f50ea0477 100644 --- a/src/world/area_dro/dro_01/95E660.c +++ b/src/world/area_dro/dro_01/95E660.c @@ -1,11 +1,11 @@ #include "dro_01.h" #define NAMESPACE dro_01_dup -#include "world/common/StashVars.inc.c" +#include "world/common/todo/StashVars.inc.c" #define NAMESPACE dro_01 #define NAMESPACE dro_01_dup -#include "world/common/GetItemName.inc.c" +#include "world/common/todo/GetItemName.inc.c" #define NAMESPACE dro_01 ApiStatus N(func_80243578_95E778)(Evt* script, s32 isInitialCall) { diff --git a/src/world/area_dro/dro_01/95E7A0.c b/src/world/area_dro/dro_01/95E7A0.c index f531f6268e..5633e64284 100644 --- a/src/world/area_dro/dro_01/95E7A0.c +++ b/src/world/area_dro/dro_01/95E7A0.c @@ -1,7 +1,7 @@ #include "dro_01.h" #define NAMESPACE dro_01_dup -#include "world/common/atomic/Pipe.inc.c" +#include "world/common/entity/Pipe.inc.c" #define NAMESPACE dro_01 #include "common/foliage.inc.c" diff --git a/src/world/area_dro/dro_02/9694C0.c b/src/world/area_dro/dro_02/9694C0.c index e11257a27a..cfff2290d4 100644 --- a/src/world/area_dro/dro_02/9694C0.c +++ b/src/world/area_dro/dro_02/9694C0.c @@ -197,14 +197,14 @@ EvtScript N(main) = { EVT_END_SWITCH EVT_WAIT(1) EVT_THREAD - EVT_CALL(SetTexPanner, 162, 1) + EVT_CALL(SetTexPanner, 162, TEX_PANNER_1) EVT_SET(LVar0, 0) EVT_LABEL(123) EVT_ADD(LVar0, 420) EVT_IF_GT(LVar0, 65536) EVT_ADD(LVar0, -65536) EVT_END_IF - EVT_CALL(SetTexPanOffset, 1, 0, 0, LVar0) + EVT_CALL(SetTexPanOffset, TEX_PANNER_1, TEX_PANNER_MAIN, 0, LVar0) EVT_WAIT(1) EVT_GOTO(123) EVT_END_THREAD @@ -363,7 +363,7 @@ EvtScript N(8024486C) = { EVT_CALL(DisablePlayerInput, TRUE) EVT_CALL(func_802D2C14, 1) EVT_CALL(PlayerMoveTo, 230, 10, 20) - EVT_CALL(ModifyColliderFlags, 0, 8, 0x7FFFFE00) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, 8, 0x7FFFFE00) EVT_CALL(PlaySoundAtCollider, 8, 449, 0) EVT_CALL(MakeLerp, 18, 80, 10, 0) EVT_LOOP(0) @@ -397,7 +397,7 @@ EvtScript N(80244A68) = { EVT_CALL(DisablePlayerInput, TRUE) EVT_CALL(func_802D2C14, 1) EVT_CALL(PlayerMoveTo, 230, -70, 20) - EVT_CALL(ModifyColliderFlags, 0, 10, 0x7FFFFE00) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, 10, 0x7FFFFE00) EVT_CALL(PlaySoundAtCollider, 10, 449, 0) EVT_CALL(MakeLerp, 18, 80, 10, 0) EVT_LOOP(0) @@ -2921,4 +2921,4 @@ ApiStatus N(func_80243068_96C228)(Evt* script, s32 isInitialCall) { #include "world/common/atomic/ToadHouse.inc.c" -#include "world/common/LetterDelivery.inc.c" +#include "world/common/todo/LetterDelivery.inc.c" diff --git a/src/world/area_flo/flo_00/C9DF60.c b/src/world/area_flo/flo_00/C9DF60.c index eaf0211f2c..34a5f524eb 100644 --- a/src/world/area_flo/flo_00/C9DF60.c +++ b/src/world/area_flo/flo_00/C9DF60.c @@ -127,7 +127,7 @@ EvtScript N(802416C0) = { EvtScript N(8024196C) = { EVT_CALL(DisablePlayerInput, TRUE) - EVT_CALL(ModifyColliderFlags, 0, 2, 0x7FFFFE00) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, 2, 0x7FFFFE00) EVT_CALL(PlayerMoveTo, 30, -170, 10) EVT_CALL(InterpPlayerYaw, 0, 0) EVT_CALL(PlaySoundAtCollider, 2, 463, 0) @@ -164,7 +164,7 @@ EvtScript N(8024196C) = { EvtScript N(80241B90) = { EVT_CALL(DisablePlayerInput, TRUE) - EVT_CALL(ModifyColliderFlags, 0, 2, 0x7FFFFE00) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, 2, 0x7FFFFE00) EVT_CALL(InterpPlayerYaw, 180, 0) EVT_CALL(PlaySoundAtCollider, 2, 463, 0) EVT_CALL(MakeLerp, 0, -100, 30, 1) @@ -273,7 +273,7 @@ EvtScript N(main) = { EVT_CALL(SetCamEnabled, 0, 1) EVT_SET(GF_MAP_FlowerFields, 1) EVT_IF_LT(GB_StoryProgress, 55) - EVT_CALL(ModifyColliderFlags, 0, 48, 0x7FFFFE00) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, 48, 0x7FFFFE00) EVT_END_IF EVT_SET(GF_MAC01_RowfBadgesChosen, 0) EVT_CALL(GetEntryID, LVar0) @@ -312,10 +312,10 @@ EvtScript N(main) = { EVT_SET(LVar3, 160) EVT_SET(LVar4, 0) EVT_EXEC(N(802416C0)) - EVT_CALL(ModifyColliderFlags, 0, 26, 0x7FFFFE00) - EVT_CALL(ModifyColliderFlags, 0, 18, 0x7FFFFE00) - EVT_CALL(ModifyColliderFlags, 0, 14, 0x7FFFFE00) - EVT_CALL(ModifyColliderFlags, 0, 6, 0x7FFFFE00) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, 26, 0x7FFFFE00) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, 18, 0x7FFFFE00) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, 14, 0x7FFFFE00) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, 6, 0x7FFFFE00) EVT_EXEC(N(enterWalk_8024205C)) EVT_CALL(GetLoadType, LVar1) EVT_IF_NE(LVar1, 1) @@ -338,19 +338,19 @@ EvtScript N(main) = { EVT_ADD(LVar2, 1) EVT_WAIT(LVar1) EVT_LOOP(LVar2) - EVT_CALL(SetTexPanOffset, 12, 0, -32768, 0) + EVT_CALL(SetTexPanOffset, TEX_PANNER_C, TEX_PANNER_MAIN, -0x8000, 0) EVT_WAIT(2) - EVT_CALL(SetTexPanOffset, 12, 0, -65536, 0) + EVT_CALL(SetTexPanOffset, TEX_PANNER_C, TEX_PANNER_MAIN, -0x10000, 0) EVT_WAIT(2) - EVT_CALL(SetTexPanOffset, 12, 0, -98304, 0) + EVT_CALL(SetTexPanOffset, TEX_PANNER_C, TEX_PANNER_MAIN, -0x18000, 0) EVT_CALL(RandInt, 5, LVar3) EVT_ADD(LVar3, 2) EVT_WAIT(LVar3) - EVT_CALL(SetTexPanOffset, 12, 0, -65536, 0) + EVT_CALL(SetTexPanOffset, TEX_PANNER_C, TEX_PANNER_MAIN, -0x10000, 0) EVT_WAIT(2) - EVT_CALL(SetTexPanOffset, 12, 0, -32768, 0) + EVT_CALL(SetTexPanOffset, TEX_PANNER_C, TEX_PANNER_MAIN, -0x8000, 0) EVT_WAIT(2) - EVT_CALL(SetTexPanOffset, 12, 0, 0, 0) + EVT_CALL(SetTexPanOffset, TEX_PANNER_C, TEX_PANNER_MAIN, 0, 0) EVT_CALL(RandInt, 5, LVar3) EVT_ADD(LVar3, 2) EVT_WAIT(LVar3) @@ -1667,8 +1667,8 @@ EvtScript N(802477EC) = { EVT_WAIT(15) EVT_CALL(DisablePartnerAI, 0) EVT_SET(AreaFlag(44), 1) - EVT_CALL(ModifyColliderFlags, 0, 47, 0x7FFFFE00) - EVT_CALL(ModifyColliderFlags, 0, 48, 0x7FFFFE00) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, 47, 0x7FFFFE00) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, 48, 0x7FFFFE00) EVT_SET(LVar9, EVT_FLOAT(-59.0)) EVT_SET(LVarA, EVT_FLOAT(22.0)) EVT_SET(LVarB, EVT_FLOAT(125.0)) @@ -1728,8 +1728,8 @@ EvtScript N(802477EC) = { EvtScript N(80247BCC) = { EVT_CALL(DisablePlayerInput, TRUE) EVT_CALL(SetPlayerActionState, 10) - EVT_CALL(ModifyColliderFlags, 0, 47, 0x7FFFFE00) - EVT_CALL(ModifyColliderFlags, 0, 48, 0x7FFFFE00) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, 47, 0x7FFFFE00) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, 48, 0x7FFFFE00) EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) EVT_CALL(UseSettingsFrom, 0, LVar0, LVar1, LVar2) EVT_CALL(SetPanTarget, 0, LVar0, LVar1, LVar2) @@ -1989,7 +1989,7 @@ EvtScript N(802485A8) = { EVT_WAIT(30) EVT_CALL(RemoveItemEntity, MapVar(11)) EVT_WAIT(30) - EVT_CALL(ModifyColliderFlags, 0, 47, 0x7FFFFE00) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, 47, 0x7FFFFE00) EVT_CALL(PlayerMoveTo, -60, 30, 20) EVT_CALL(ModifyColliderFlags, 1, 47, 0x7FFFFE00) EVT_CALL(ModifyColliderFlags, 1, 48, 0x7FFFFE00) @@ -2072,8 +2072,8 @@ EvtScript N(80248F48) = { EVT_EXEC(N(80247588)) EVT_SET(LVar0, 0) EVT_EXEC(N(802476F4)) - EVT_CALL(ModifyColliderFlags, 0, 46, 0x7FFFFE00) - EVT_CALL(ModifyColliderFlags, 0, 47, 0x7FFFFE00) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, 46, 0x7FFFFE00) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, 47, 0x7FFFFE00) EVT_CASE_GE(55) EVT_SET(LVar0, 1) EVT_EXEC(N(80247588)) @@ -2087,8 +2087,8 @@ EvtScript N(80248F48) = { EVT_EXEC(N(80247588)) EVT_SET(LVar0, 0) EVT_EXEC(N(802476F4)) - EVT_CALL(ModifyColliderFlags, 0, 46, 0x7FFFFE00) - EVT_CALL(ModifyColliderFlags, 0, 47, 0x7FFFFE00) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, 46, 0x7FFFFE00) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, 47, 0x7FFFFE00) EVT_END_SWITCH EVT_RETURN EVT_END @@ -2106,7 +2106,7 @@ EvtScript N(makeEntities) = { EVT_END }; -#include "world/common/enemy/PatrolNoAttackAI.inc.c" +#include "world/common/enemy/ai/PatrolNoAttackAI.inc.c" ApiStatus N(PostChapter6StatUpdate)(Evt* script, s32 isInitialCall) { PlayerData* playerData = &gPlayerData; diff --git a/src/world/area_flo/flo_00/C9EE30.c b/src/world/area_flo/flo_00/C9EE30.c index bfe747df35..3ffe7f4ab9 100644 --- a/src/world/area_flo/flo_00/C9EE30.c +++ b/src/world/area_flo/flo_00/C9EE30.c @@ -42,7 +42,7 @@ ApiStatus N(func_802410B4_C9EFD4)(Evt* script, s32 isInitialCall) { #include "common/CosInterpMinMax.inc.c" -#include "world/common/SyncStatusMenu.inc.c" +#include "world/common/todo/SyncStatusMenu.inc.c" ApiStatus N(func_8024139C_C9F2BC)(Evt* script, s32 isInitialCall) { increment_status_menu_disabled(); diff --git a/src/world/area_flo/flo_03/CA72E0.c b/src/world/area_flo/flo_03/CA72E0.c index 00bd037ab7..76c8ba62aa 100644 --- a/src/world/area_flo/flo_03/CA72E0.c +++ b/src/world/area_flo/flo_03/CA72E0.c @@ -156,7 +156,7 @@ EvtScript N(main) = { EVT_IF_EQ(LVar0, 2) EVT_EXEC(N(80240FFC)) EVT_ELSE - EVT_CALL(ModifyColliderFlags, 0, 1, 0x7FFFFE00) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, 1, 0x7FFFFE00) EVT_SET(LVar0, EVT_PTR(N(80240BE4))) EVT_EXEC(EnterWalk) EVT_END_IF @@ -1104,9 +1104,9 @@ NpcGroupList N(npcGroupList_8024442C) = { {}, }; -#include "world/common/StashVars.inc.c" +#include "world/common/todo/StashVars.inc.c" -#include "world/common/GetItemName.inc.c" +#include "world/common/todo/GetItemName.inc.c" ApiStatus N(func_80240158_CA73F8)(Evt* script, s32 isInitialCall) { Enemy* enemy = script->owner1.enemy; diff --git a/src/world/area_flo/flo_07/CAC1F0.c b/src/world/area_flo/flo_07/CAC1F0.c index f4308a373c..a1207f8a36 100644 --- a/src/world/area_flo/flo_07/CAC1F0.c +++ b/src/world/area_flo/flo_07/CAC1F0.c @@ -3,7 +3,7 @@ #include "world/common/atomic/TexturePan.inc.c" -#include "world/common/SpawnSunEffect.inc.c" +#include "world/common/todo/SpawnSunEffect.inc.c" ApiStatus N(func_80240344_CAC534)(Evt* script, s32 isInitialCall) { EffectInstance* effect = fx_misc_particles(3, -272.0f, 80.0f, 20.0f, 200.0f, 120.0f, 4.0f, 8, 0); diff --git a/src/world/area_flo/flo_07/CAC5D0.c b/src/world/area_flo/flo_07/CAC5D0.c index 538dfe97d3..1d6c7270cf 100644 --- a/src/world/area_flo/flo_07/CAC5D0.c +++ b/src/world/area_flo/flo_07/CAC5D0.c @@ -200,7 +200,7 @@ EvtScript N(main) = { EVT_IF_EQ(LVar0, 1) EVT_EXEC(N(80241C14)) EVT_ELSE - EVT_CALL(ModifyColliderFlags, 0, 1, 0x7FFFFE00) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, 1, 0x7FFFFE00) EVT_SET(LVar0, EVT_PTR(N(80240C74))) EVT_EXEC(EnterWalk) EVT_EXEC(N(802424F4)) @@ -514,8 +514,8 @@ NpcGroupList N(npcGroupList_80242B0C) = { {}, }; -#include "world/common/StashVars.inc.c" +#include "world/common/todo/StashVars.inc.c" -#include "world/common/GetItemName.inc.c" +#include "world/common/todo/GetItemName.inc.c" const char N(flo_25_name_hack)[] = "flo_25"; diff --git a/src/world/area_flo/flo_08/CAED40.c b/src/world/area_flo/flo_08/CAED40.c index ee41e2cda6..6940defdc0 100644 --- a/src/world/area_flo/flo_08/CAED40.c +++ b/src/world/area_flo/flo_08/CAED40.c @@ -1,3 +1,3 @@ #include "flo_08.h" -#include "world/common/atomic/SuperBlock.inc.c" +#include "world/common/entity/SuperBlock.inc.c" diff --git a/src/world/area_flo/flo_08/CAFAC0.c b/src/world/area_flo/flo_08/CAFAC0.c index 7cf4356c72..c6f85b856d 100644 --- a/src/world/area_flo/flo_08/CAFAC0.c +++ b/src/world/area_flo/flo_08/CAFAC0.c @@ -48,7 +48,7 @@ EvtScript N(80241F40) = { #define SUPER_BLOCK_MAPVAR MapVar(0) #define SUPER_BLOCK_GAMEFLAG GF_FLO08_SuperBlock -#include "world/common/atomic/SuperBlock.data.inc.c" +#include "world/common/entity/SuperBlock.data.inc.c" EvtScript N(makeEntities) = { EVT_MAKE_SUPER_BLOCK(-780, 120, -110, 0) @@ -148,12 +148,12 @@ EvtScript N(main) = { EVT_IF_GT(LVar0, 65536) EVT_ADD(LVar0, -65536) EVT_END_IF - EVT_CALL(SetTexPanOffset, 1, 0, LVar0, 0) + EVT_CALL(SetTexPanOffset, TEX_PANNER_1, TEX_PANNER_MAIN, LVar0, 0) EVT_ADD(LVar1, -200) EVT_IF_LT(LVar1, 0) EVT_ADD(LVar1, 65536) EVT_END_IF - EVT_CALL(SetTexPanOffset, 2, 0, LVar1, 0) + EVT_CALL(SetTexPanOffset, TEX_PANNER_2, TEX_PANNER_MAIN, LVar1, 0) EVT_WAIT(1) EVT_GOTO(0) EVT_END_THREAD @@ -171,8 +171,8 @@ EvtScript N(main) = { EVT_SET(LVar4, 0) EVT_EXEC(N(80242680)) EVT_EXEC(N(80245914)) - EVT_CALL(ModifyColliderFlags, 0, 1, 0x7FFFFE00) - EVT_CALL(ModifyColliderFlags, 0, 5, 0x7FFFFE00) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, 1, 0x7FFFFE00) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, 5, 0x7FFFFE00) EVT_SET(LVar0, EVT_PTR(N(802429E4))) EVT_EXEC(EnterWalk) EVT_EXEC_WAIT(N(80241F40)) @@ -341,7 +341,7 @@ EvtScript N(interact_80243214) = { EVT_CALL(EndSpeech, -1, ANIM_GateFlower_Yellow_HappyTalk, ANIM_GateFlower_Yellow_HappyIdle, 0) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_GateFlower_Yellow_OpenGate) EVT_CALL(PlaySoundAtCollider, 17, 457, 0) - EVT_CALL(ModifyColliderFlags, 0, 17, 0x7FFFFE00) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, 17, 0x7FFFFE00) EVT_CALL(MakeLerp, 0, 100, 30, 1) EVT_LOOP(0) EVT_CALL(UpdateLerp) @@ -442,7 +442,7 @@ EvtScript N(init_80243B20) = { EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(interact_80243214))) EVT_IF_EQ(GF_FLO08_GaveYellowBerry, 1) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_GateFlower_Yellow_HappyDance) - EVT_CALL(ModifyColliderFlags, 0, 17, 0x7FFFFE00) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, 17, 0x7FFFFE00) EVT_CALL(RotateModel, 103, 50, 0, 1, 0) EVT_CALL(RotateModel, 104, 50, 0, 1, 0) EVT_CALL(RotateModel, 105, 50, 0, 1, 0) @@ -840,7 +840,7 @@ static s32 N(pad_4F3C) = { 0x00000000, }; -#include "world/common/enemy/UnkFloAI.inc.c" +#include "world/common/enemy/ai/UnkFloAI.inc.c" #include "world/common/atomic/ItemChoice_PartA.inc.c" diff --git a/src/world/area_flo/flo_08/CB0B80.c b/src/world/area_flo/flo_08/CB0B80.c index a9acf5c8e9..578e9049a2 100644 --- a/src/world/area_flo/flo_08/CB0B80.c +++ b/src/world/area_flo/flo_08/CB0B80.c @@ -1,3 +1,3 @@ #include "flo_08.h" -#include "world/common/UnkFunc43.inc.c" +#include "world/common/todo/UnkFunc43.inc.c" diff --git a/src/world/area_flo/flo_09/CB5040.c b/src/world/area_flo/flo_09/CB5040.c index 950348ce05..9a8d3bbad3 100644 --- a/src/world/area_flo/flo_09/CB5040.c +++ b/src/world/area_flo/flo_09/CB5040.c @@ -1,3 +1,3 @@ #include "flo_09.h" -#include "world/common/UnkFunc43.inc.c" +#include "world/common/todo/UnkFunc43.inc.c" diff --git a/src/world/area_flo/flo_09/CB50E0.c b/src/world/area_flo/flo_09/CB50E0.c index dd004fc3c2..89e8a99fbc 100644 --- a/src/world/area_flo/flo_09/CB50E0.c +++ b/src/world/area_flo/flo_09/CB50E0.c @@ -132,8 +132,8 @@ EvtScript N(main) = { EVT_SET(LVar3, -91) EVT_SET(LVar4, 60) EVT_EXEC(N(802418F0)) - EVT_CALL(ModifyColliderFlags, 0, 1, 0x7FFFFE00) - EVT_CALL(ModifyColliderFlags, 0, 5, 0x7FFFFE00) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, 1, 0x7FFFFE00) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, 5, 0x7FFFFE00) EVT_SET(LVar0, EVT_PTR(N(80241C54))) EVT_EXEC(EnterWalk) EVT_EXEC_WAIT(N(80241880)) diff --git a/src/world/area_flo/flo_09/CB5320.c b/src/world/area_flo/flo_09/CB5320.c index 9ed2af2314..5a12f0ff1c 100644 --- a/src/world/area_flo/flo_09/CB5320.c +++ b/src/world/area_flo/flo_09/CB5320.c @@ -1,3 +1,3 @@ #include "flo_09.h" -#include "world/common/enemy/FlyingAI.inc.c" +#include "world/common/enemy/ai/FlyingAI.inc.c" diff --git a/src/world/area_flo/flo_10/CB9280.c b/src/world/area_flo/flo_10/CB9280.c index f0f37cbb81..7d96999cb9 100644 --- a/src/world/area_flo/flo_10/CB9280.c +++ b/src/world/area_flo/flo_10/CB9280.c @@ -160,7 +160,7 @@ EvtScript N(main) = { EVT_EXEC(flo_10_802427EC) EVT_EXEC(N(80241988)) EVT_CASE_DEFAULT - EVT_CALL(ModifyColliderFlags, 0, 1, 0x7FFFFE00) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, 1, 0x7FFFFE00) EVT_SET(LVar0, EVT_PTR(N(80241988))) EVT_EXEC(EnterWalk) EVT_END_SWITCH @@ -466,15 +466,15 @@ EvtScript N(80242AE8) = { EVT_IF_LT(GB_StoryProgress, 49) EVT_CALL(EnableGroup, 52, 0) EVT_CALL(EnableGroup, 61, 0) - EVT_CALL(ModifyColliderFlags, 0, 21, 0x7FFFFE00) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, 21, 0x7FFFFE00) EVT_ELSE EVT_CALL(EnableGroup, 19, 0) EVT_CALL(EnableGroup, 61, 0) EVT_CALL(EnableGroup, 60, 0) - EVT_CALL(ModifyColliderFlags, 0, 14, 0x7FFFFE00) - EVT_CALL(ModifyColliderFlags, 0, 15, 0x7FFFFE00) - EVT_CALL(ModifyColliderFlags, 0, 16, 0x7FFFFE00) - EVT_CALL(ModifyColliderFlags, 0, 17, 0x7FFFFE00) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, 14, 0x7FFFFE00) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, 15, 0x7FFFFE00) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, 16, 0x7FFFFE00) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, 17, 0x7FFFFE00) EVT_END_IF EVT_CALL(EnableTexPanning, 54, 1) EVT_CALL(EnableTexPanning, 48, 1) @@ -848,9 +848,9 @@ static s32 N(pad_4084)[] = { 0x00000000, 0x00000000, 0x00000000, }; -#include "world/common/StashVars.inc.c" +#include "world/common/todo/StashVars.inc.c" -#include "world/common/GetItemName.inc.c" +#include "world/common/todo/GetItemName.inc.c" #include "world/common/atomic/TexturePan.inc.c" diff --git a/src/world/area_flo/flo_11/CBDCD0.c b/src/world/area_flo/flo_11/CBDCD0.c index 074eab6dfa..5e1222d322 100644 --- a/src/world/area_flo/flo_11/CBDCD0.c +++ b/src/world/area_flo/flo_11/CBDCD0.c @@ -79,7 +79,7 @@ EvtScript N(80240450) = { EVT_END }; -#include "world/common/atomic/PipeData.inc.c" +#include "world/common/entity/PipeData.inc.c" EvtScript N(exitWalk_8024142C) = EVT_EXIT_WALK(60, 0, "flo_23", 1); @@ -183,8 +183,8 @@ EvtScript N(main) = { EVT_CALL(func_80044238, 5) EVT_CALL(MakeNpcs, 0, EVT_PTR(N(npcGroupList_802430D4))) EVT_EXEC_WAIT(N(makeEntities)) - EVT_CALL(ModifyColliderFlags, 0, 1, 0x7FFFFE00) - EVT_CALL(ModifyColliderFlags, 0, 5, 0x7FFFFE00) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, 1, 0x7FFFFE00) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, 5, 0x7FFFFE00) EVT_CALL(GetEntryID, LVar0) EVT_IF_LE(LVar0, 1) EVT_SET(LVar0, EVT_PTR(N(80241698))) @@ -655,7 +655,7 @@ EvtScript N(makeEntities) = { EVT_END }; -#include "world/common/atomic/Pipe.inc.c" +#include "world/common/entity/Pipe.inc.c" void fx_sun_undeclared(s32, s32, s32, s32, s32, s32); diff --git a/src/world/area_flo/flo_12/CC0E70.c b/src/world/area_flo/flo_12/CC0E70.c index c1fb5fb696..91eed60097 100644 --- a/src/world/area_flo/flo_12/CC0E70.c +++ b/src/world/area_flo/flo_12/CC0E70.c @@ -137,7 +137,7 @@ EvtScript N(main) = { EVT_IF_EQ(LVar0, 1) EVT_EXEC(N(802419F4)) EVT_ELSE - EVT_CALL(ModifyColliderFlags, 0, 1, 0x7FFFFE00) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, 1, 0x7FFFFE00) EVT_SET(LVar0, EVT_PTR(N(80240B78))) EVT_EXEC(EnterWalk) EVT_END_IF @@ -478,13 +478,13 @@ NpcGroupList N(npcGroupList_802429B8) = { {}, }; -#include "world/common/StashVars.inc.c" +#include "world/common/todo/StashVars.inc.c" -#include "world/common/GetItemName.inc.c" +#include "world/common/todo/GetItemName.inc.c" -#include "world/common/GetNpcCollisionHeight.inc.c" +#include "world/common/todo/GetNpcCollisionHeight.inc.c" -#include "world/common/AddPlayerHandsOffset.inc.c" +#include "world/common/todo/AddPlayerHandsOffset.inc.c" ApiStatus N(func_802405C0_CC13F0)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; diff --git a/src/world/area_flo/flo_13/CC3850.c b/src/world/area_flo/flo_13/CC3850.c index 39bb87b02b..48b951ec25 100644 --- a/src/world/area_flo/flo_13/CC3850.c +++ b/src/world/area_flo/flo_13/CC3850.c @@ -96,7 +96,7 @@ static s32 N(pad_3944)[] = { }; EvtScript N(80243950) = { - EVT_CALL(ModifyColliderFlags, 0, 14, 0x7FFFFE00) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, 14, 0x7FFFFE00) EVT_RETURN EVT_END }; @@ -108,7 +108,7 @@ EvtScript N(makeEntities) = { EVT_CALL(MakeEntity, EVT_PTR(Entity_BombableRock), -160, 160, -90, 0, MAKE_ENTITY_END) EVT_CALL(AssignScript, EVT_PTR(N(80243950))) EVT_ELSE - EVT_CALL(ModifyColliderFlags, 0, 14, 0x7FFFFE00) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, 14, 0x7FFFFE00) EVT_END_IF EVT_RETURN EVT_END @@ -210,8 +210,8 @@ EvtScript N(main) = { EVT_SET(LVar3, -50) EVT_SET(LVar4, 160) EVT_EXEC(N(80243A40)) - EVT_CALL(ModifyColliderFlags, 0, 1, 0x7FFFFE00) - EVT_CALL(ModifyColliderFlags, 0, 5, 0x7FFFFE00) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, 1, 0x7FFFFE00) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, 5, 0x7FFFFE00) EVT_SET(LVar0, EVT_PTR(N(80243DA4))) EVT_EXEC(EnterWalk) EVT_EXEC_WAIT(N(802438B0)) @@ -1246,10 +1246,10 @@ NpcGroupList N(npcGroupList_80247984) = { #define AI_LAKITU_FIRST_SPINY_ID 50 #define AI_LAKITU_LAST_SPINY_ID 55 -#include "world/common/enemy/LakituAI.inc.c" -#include "world/common/enemy/SpinyAI.inc.c" +#include "world/common/enemy/ai/LakituAI.inc.c" +#include "world/common/enemy/ai/SpinyAI.inc.c" -#include "world/common/UnkFunc42.inc.c" +#include "world/common/todo/UnkFunc42.inc.c" ApiStatus N(func_802433C0_CC6BD0)(Evt* script, s32 isInitialCall) { Npc* npc = get_npc_unsafe(1); diff --git a/src/world/area_flo/flo_13/CC6DE0.c b/src/world/area_flo/flo_13/CC6DE0.c index 2a11a7a436..170584015d 100644 --- a/src/world/area_flo/flo_13/CC6DE0.c +++ b/src/world/area_flo/flo_13/CC6DE0.c @@ -1,4 +1,4 @@ #include "flo_13.h" #define PARTY_IMAGE "party_pokopi" -#include "world/common/LoadPartyImage.inc.c" +#include "world/common/todo/LoadPartyImage.inc.c" diff --git a/src/world/area_flo/flo_14/CCB310.c b/src/world/area_flo/flo_14/CCB310.c index 4886d506fe..5b7cd4ffb9 100644 --- a/src/world/area_flo/flo_14/CCB310.c +++ b/src/world/area_flo/flo_14/CCB310.c @@ -133,8 +133,8 @@ EvtScript N(main) = { EVT_END_THREAD EVT_EXEC(N(80243E78)) EVT_EXEC(N(80245224)) - EVT_CALL(ModifyColliderFlags, 0, 1, 0x7FFFFE00) - EVT_CALL(ModifyColliderFlags, 0, 5, 0x7FFFFE00) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, 1, 0x7FFFFE00) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, 5, 0x7FFFFE00) EVT_SET(LVar0, EVT_PTR(N(802425B4))) EVT_EXEC(EnterWalk) EVT_EXEC_WAIT(N(802423F0)) @@ -530,7 +530,7 @@ EvtScript N(80243E78) = { EVT_SET(LVar6, 93) EVT_SET(LVarA, 0) EVT_EXEC(N(80242EAC)) - EVT_CALL(ModifyColliderFlags, 0, 15, 0x7FFFFE00) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, 15, 0x7FFFFE00) EVT_CALL(CloneModel, 124, 10001) EVT_CALL(CloneModel, 124, 10002) EVT_CALL(CloneModel, 124, 10003) @@ -577,7 +577,7 @@ ApiStatus N(func_8024030C_CCB61C)(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -#include "world/common/UnkFunc43.inc.c" +#include "world/common/todo/UnkFunc43.inc.c" ApiStatus N(func_802403D4_CCB6E4)(Evt* script, s32 isInitialCall) { if (gPlayerData.currentPartner == PARTNER_NONE) { diff --git a/src/world/area_flo/flo_14/CCBE20.c b/src/world/area_flo/flo_14/CCBE20.c index b55c384a66..25c1626a9e 100644 --- a/src/world/area_flo/flo_14/CCBE20.c +++ b/src/world/area_flo/flo_14/CCBE20.c @@ -274,7 +274,7 @@ EvtScript N(80244F70) = { EVT_IF_EQ(LVar7, 0) EVT_WAIT(5) EVT_SET(LVar8, 6) - EVT_CALL(ModifyColliderFlags, 0, LVar9, 0x7FFFFE00) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, LVar9, 0x7FFFFE00) EVT_END_IF EVT_ADD(LVar8, 1) EVT_ADD(LVar7, LVar8) @@ -327,7 +327,7 @@ EvtScript N(80245224) = { EVT_END }; -#include "world/common/enemy/FlyingAI.inc.c" +#include "world/common/enemy/ai/FlyingAI.inc.c" #include "world/common/atomic/ItemChoice_PartA.inc.c" diff --git a/src/world/area_flo/flo_15/CD06C0.c b/src/world/area_flo/flo_15/CD06C0.c index 8ded357e8b..0540a76b59 100644 --- a/src/world/area_flo/flo_15/CD06C0.c +++ b/src/world/area_flo/flo_15/CD06C0.c @@ -62,11 +62,11 @@ EvtScript N(main) = { EVT_IF_EQ(LVar0, 1) EVT_EXEC(N(802404D8)) EVT_ELSE - EVT_CALL(ModifyColliderFlags, 0, 1, 0x7FFFFE00) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, 1, 0x7FFFFE00) EVT_SET(LVar0, EVT_PTR(N(8024017C))) EVT_EXEC(EnterWalk) EVT_END_IF - EVT_CALL(ModifyColliderFlags, 0, 14, 0x7FFFFE00) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, 14, 0x7FFFFE00) EVT_EXEC(N(802413B0)) EVT_EXEC_WAIT(N(80240060)) EVT_RETURN @@ -422,13 +422,13 @@ EvtScript N(802413B0) = { EVT_BREAK_LOOP EVT_END_IF EVT_END_LOOP - EVT_CALL(ModifyColliderFlags, 0, 12, 0x7FFFFE00) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, 12, 0x7FFFFE00) EVT_CALL(ModifyColliderFlags, 1, 14, 0x7FFFFE00) EVT_WAIT(15) EVT_CALL(ResetCam, 0, EVT_FLOAT(90.0)) EVT_CALL(DisablePlayerInput, FALSE) EVT_ELSE - EVT_CALL(ModifyColliderFlags, 0, 12, 0x7FFFFE00) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, 12, 0x7FFFFE00) EVT_CALL(ModifyColliderFlags, 1, 14, 0x7FFFFE00) EVT_CALL(TranslateGroup, 16, 0, -50, 0) EVT_END_IF diff --git a/src/world/area_flo/flo_16/CD1E70.c b/src/world/area_flo/flo_16/CD1E70.c index 99a4c33b51..f489fe7825 100644 --- a/src/world/area_flo/flo_16/CD1E70.c +++ b/src/world/area_flo/flo_16/CD1E70.c @@ -1,3 +1,3 @@ #include "flo_16.h" -#include "world/common/UnkFunc43.inc.c" +#include "world/common/todo/UnkFunc43.inc.c" diff --git a/src/world/area_flo/flo_16/CD1F10.c b/src/world/area_flo/flo_16/CD1F10.c index 373c1317ee..19e7130b6e 100644 --- a/src/world/area_flo/flo_16/CD1F10.c +++ b/src/world/area_flo/flo_16/CD1F10.c @@ -73,18 +73,18 @@ EvtScript N(main) = { EVT_IF_GT(LVar0, 65536) EVT_ADD(LVar0, -65536) EVT_END_IF - EVT_CALL(SetTexPanOffset, 1, 0, LVar0, 0) + EVT_CALL(SetTexPanOffset, TEX_PANNER_1, TEX_PANNER_MAIN, LVar0, 0) EVT_ADD(LVar1, -200) EVT_IF_LT(LVar1, 0) EVT_ADD(LVar1, 65536) EVT_END_IF - EVT_CALL(SetTexPanOffset, 2, 0, LVar1, 0) + EVT_CALL(SetTexPanOffset, TEX_PANNER_2, TEX_PANNER_MAIN, LVar1, 0) EVT_WAIT(1) EVT_GOTO(0) EVT_END_THREAD EVT_EXEC(N(802451C4)) - EVT_CALL(ModifyColliderFlags, 0, 1, 0x7FFFFE00) - EVT_CALL(ModifyColliderFlags, 0, 5, 0x7FFFFE00) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, 1, 0x7FFFFE00) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, 5, 0x7FFFFE00) EVT_SET(LVar0, EVT_PTR(N(80242AF8))) EVT_EXEC(EnterWalk) EVT_EXEC_WAIT(N(802429D0)) @@ -240,7 +240,7 @@ static s32 N(pad_36FC) = { #define SUPER_BLOCK_MAPVAR MapVar(0) #define SUPER_BLOCK_GAMEFLAG GF_FLO16_SuperBlock -#include "world/common/atomic/SuperBlock.data.inc.c" +#include "world/common/entity/SuperBlock.data.inc.c" EvtScript N(80243D48) = { EVT_LABEL(0) @@ -295,6 +295,6 @@ EvtScript N(makeEntities) = { EVT_END }; -#include "world/common/atomic/SuperBlock.inc.c" +#include "world/common/entity/SuperBlock.inc.c" -#include "world/common/UnkFunc44.inc.c" +#include "world/common/todo/UnkFunc44.inc.c" diff --git a/src/world/area_flo/flo_16/CD2C80.c b/src/world/area_flo/flo_16/CD2C80.c index b519f7f882..cabe65cc2b 100644 --- a/src/world/area_flo/flo_16/CD2C80.c +++ b/src/world/area_flo/flo_16/CD2C80.c @@ -357,6 +357,6 @@ EvtScript N(802451C4) = { EVT_END }; -#include "world/common/enemy/FlyingAI.inc.c" +#include "world/common/enemy/ai/FlyingAI.inc.c" -#include "world/common/enemy/FlyingNoAttackAI.inc.c" +#include "world/common/enemy/ai/FlyingNoAttackAI.inc.c" diff --git a/src/world/area_flo/flo_17/CD7350.c b/src/world/area_flo/flo_17/CD7350.c index 7c4f82034a..75dec0b417 100644 --- a/src/world/area_flo/flo_17/CD7350.c +++ b/src/world/area_flo/flo_17/CD7350.c @@ -201,17 +201,17 @@ EvtScript N(main) = { EVT_IF_GT(LVar0, 65536) EVT_ADD(LVar0, -65536) EVT_END_IF - EVT_CALL(SetTexPanOffset, 1, 0, LVar0, 0) + EVT_CALL(SetTexPanOffset, TEX_PANNER_1, TEX_PANNER_MAIN, LVar0, 0) EVT_ADD(LVar1, -200) EVT_IF_LT(LVar1, 0) EVT_ADD(LVar1, 65536) EVT_END_IF - EVT_CALL(SetTexPanOffset, 2, 0, LVar1, 0) + EVT_CALL(SetTexPanOffset, TEX_PANNER_2, TEX_PANNER_MAIN, LVar1, 0) EVT_WAIT(1) EVT_GOTO(0) EVT_END_THREAD - EVT_CALL(ModifyColliderFlags, 0, 1, 0x7FFFFE00) - EVT_CALL(ModifyColliderFlags, 0, 5, 0x7FFFFE00) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, 1, 0x7FFFFE00) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, 5, 0x7FFFFE00) EVT_SET(LVar0, EVT_PTR(N(80243654))) EVT_EXEC(EnterWalk) EVT_EXEC_WAIT(N(80243280)) @@ -242,7 +242,7 @@ EvtScript N(80243FD0) = { EVT_IF_EQ(LVar7, 0) EVT_WAIT(5) EVT_SET(LVar8, 6) - EVT_CALL(ModifyColliderFlags, 0, LVar9, 0x7FFFFE00) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, LVar9, 0x7FFFFE00) EVT_END_IF EVT_ADD(LVar8, 1) EVT_ADD(LVar7, LVar8) @@ -640,5 +640,5 @@ EvtScript N(makeEntities) = { #define AI_LAKITU_FIRST_SPINY_ID 50 #define AI_LAKITU_LAST_SPINY_ID 53 -#include "world/common/enemy/LakituAI.inc.c" -#include "world/common/enemy/SpinyAI.inc.c" +#include "world/common/enemy/ai/LakituAI.inc.c" +#include "world/common/enemy/ai/SpinyAI.inc.c" diff --git a/src/world/area_flo/flo_18/CDC6A0.c b/src/world/area_flo/flo_18/CDC6A0.c index 03183b473f..4702aa6d6e 100644 --- a/src/world/area_flo/flo_18/CDC6A0.c +++ b/src/world/area_flo/flo_18/CDC6A0.c @@ -133,7 +133,7 @@ EvtScript N(main) = { EVT_END_THREAD EVT_CALL(GetEntryID, LVar0) EVT_IF_EQ(LVar0, 0) - EVT_CALL(ModifyColliderFlags, 0, 1, 0x7FFFFE00) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, 1, 0x7FFFFE00) EVT_SET(LVar0, EVT_PTR(N(802409B8))) EVT_EXEC(EnterWalk) EVT_ELSE @@ -412,7 +412,7 @@ EvtScript N(80241ED4) = { EVT_END_LOOP EVT_LABEL(0) EVT_WAIT(30) -EVT_CALL(ModifyColliderFlags, 0, 19, 0x7FFFFE00) +EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, 19, 0x7FFFFE00) EVT_RETURN EVT_END }; @@ -659,7 +659,7 @@ EVT_CMD(EVT_OP_END) #endif EvtScript N(80242B18) = { - EVT_CALL(ModifyColliderFlags, 0, 18, 0x7FFFFE00) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, 18, 0x7FFFFE00) EVT_SETF(LVar0, 0) EVT_SETF(LVar1, 0) EVT_SETF(LVar2, 0) @@ -839,7 +839,7 @@ Vec4f N(triggerCoord_802436AC) = { 105.0f, 0.0f, -10.0, 0.0f }; EvtScript N(802436BC) = { EVT_IF_GE(GB_StoryProgress, 53) EVT_CALL(EnableModel, 49, 0) - EVT_CALL(ModifyColliderFlags, 0, 19, 0x7FFFFE00) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, 19, 0x7FFFFE00) EVT_CALL(EnableModel, 31, 0) EVT_CALL(EnableModel, 32, 0) EVT_CALL(EnableModel, 19, 0) @@ -853,13 +853,13 @@ EvtScript N(802436BC) = { EVT_CALL(EnableModel, 29, 0) EVT_CALL(EnableModel, 41, 0) EVT_CALL(EnableModel, 33, 0) - EVT_CALL(ModifyColliderFlags, 0, 18, 0x7FFFFE00) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, 18, 0x7FFFFE00) EVT_RETURN EVT_END_IF EVT_EXEC(N(80240E90)) EVT_CALL(EnableModel, 49, 0) EVT_IF_GE(GB_FLO18_MachineDamage_Left, 1) - EVT_CALL(ModifyColliderFlags, 0, 19, 0x7FFFFE00) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, 19, 0x7FFFFE00) EVT_CALL(EnableModel, 31, 0) EVT_CALL(EnableModel, 32, 0) EVT_END_IF @@ -881,7 +881,7 @@ EvtScript N(802436BC) = { EVT_CALL(EnableModel, 29, 0) EVT_CALL(EnableModel, 41, 0) EVT_CALL(EnableModel, 33, 0) - EVT_CALL(ModifyColliderFlags, 0, 18, 0x7FFFFE00) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, 18, 0x7FFFFE00) EVT_RETURN EVT_END_IF EVT_SET(LVar0, 0) @@ -945,13 +945,13 @@ EvtScript N(802436BC) = { EVT_DIV(LVar5, 8) EVT_MOD(LVar5, 2) EVT_MUL(LVar5, 16384) - EVT_CALL(SetTexPanOffset, 12, 0, LVar0, 0) - EVT_CALL(SetTexPanOffset, 13, 0, LVar1, 0) - EVT_CALL(SetTexPanOffset, 14, 0, LVar2, 0) - EVT_CALL(SetTexPanOffset, 15, 0, LVar3, 0) - EVT_CALL(SetTexPanOffset, 11, 0, LVar4, 0) - EVT_CALL(SetTexPanOffset, 10, 0, LVar5, 0) - EVT_CALL(SetTexPanOffset, 9, 0, LVar5, 0) + EVT_CALL(SetTexPanOffset, TEX_PANNER_C, TEX_PANNER_MAIN, LVar0, 0) + EVT_CALL(SetTexPanOffset, TEX_PANNER_D, TEX_PANNER_MAIN, LVar1, 0) + EVT_CALL(SetTexPanOffset, TEX_PANNER_E, TEX_PANNER_MAIN, LVar2, 0) + EVT_CALL(SetTexPanOffset, TEX_PANNER_F, TEX_PANNER_MAIN, LVar3, 0) + EVT_CALL(SetTexPanOffset, TEX_PANNER_B, TEX_PANNER_MAIN, LVar4, 0) + EVT_CALL(SetTexPanOffset, TEX_PANNER_A, TEX_PANNER_MAIN, LVar5, 0) + EVT_CALL(SetTexPanOffset, TEX_PANNER_9, TEX_PANNER_MAIN, LVar5, 0) EVT_WAIT(1) EVT_GOTO(0) EVT_END_THREAD diff --git a/src/world/area_flo/flo_18/CDCBD0.c b/src/world/area_flo/flo_18/CDCBD0.c index d8cf1d4275..d6c7de4a5c 100644 --- a/src/world/area_flo/flo_18/CDCBD0.c +++ b/src/world/area_flo/flo_18/CDCBD0.c @@ -1,3 +1,3 @@ #include "flo_18.h" -#include "world/common/UnkFunc42.inc.c" +#include "world/common/todo/UnkFunc42.inc.c" diff --git a/src/world/area_flo/flo_19/CE36F0.c b/src/world/area_flo/flo_19/CE36F0.c index 20b60a9af9..940fa8f638 100644 --- a/src/world/area_flo/flo_19/CE36F0.c +++ b/src/world/area_flo/flo_19/CE36F0.c @@ -158,7 +158,7 @@ EvtScript N(main) = { EVT_CASE_EQ(0) EVT_EXEC(N(80240BF8)) EVT_CASE_EQ(1) - EVT_CALL(ModifyColliderFlags, 0, 1, 0x7FFFFE00) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, 1, 0x7FFFFE00) EVT_SET(LVar0, EVT_PTR(N(80240BF8))) EVT_EXEC(EnterWalk) EVT_CASE_EQ(2) @@ -407,8 +407,8 @@ EvtScript N(80241CC4) = { EVT_CALL(SetPlayerActionState, 10) EVT_CALL(DisablePartnerAI, 0) EVT_CALL(SetNpcFlagBits, NPC_PARTNER, ((NPC_FLAG_100)), TRUE) - EVT_CALL(ModifyColliderFlags, 0, 13, 0x7FFFFE00) - EVT_CALL(ModifyColliderFlags, 0, 5, 0x7FFFFE00) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, 13, 0x7FFFFE00) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, 5, 0x7FFFFE00) EVT_CALL(SetCamType, 0, 1, 0) EVT_CALL(UseSettingsFrom, 0, 0, 0, 0) EVT_CALL(SetPanTarget, 0, 0, 0, 0) @@ -516,8 +516,8 @@ EvtScript N(802423F8) = { EVT_WAIT(15) EVT_CALL(DisablePartnerAI, 0) EVT_SET(AreaFlag(44), 1) - EVT_CALL(ModifyColliderFlags, 0, 13, 0x7FFFFE00) - EVT_CALL(ModifyColliderFlags, 0, 5, 0x7FFFFE00) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, 13, 0x7FFFFE00) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, 5, 0x7FFFFE00) EVT_SET(LVar9, EVT_FLOAT(45.0)) EVT_SET(LVarA, EVT_FLOAT(28.0)) EVT_SET(LVarB, EVT_FLOAT(5.0)) diff --git a/src/world/area_flo/flo_21/CE6700.c b/src/world/area_flo/flo_21/CE6700.c index 83ec34d314..de228bf2ba 100644 --- a/src/world/area_flo/flo_21/CE6700.c +++ b/src/world/area_flo/flo_21/CE6700.c @@ -46,7 +46,7 @@ EvtScript N(80240D40) = { EVT_END }; -#include "world/common/StarSpiritEffectFunc.inc.c" +#include "world/common/todo/StarSpiritEffectFunc.inc.c" EvtScript N(80240DA0) = { EVT_SET_GROUP(EVT_GROUP_00) @@ -166,7 +166,7 @@ EvtScript N(main) = { EVT_CALL(ModifyColliderFlags, 3, 5, 0x00000007) EVT_CALL(ModifyColliderFlags, 3, 7, 0x00000007) EVT_CALL(GetEntryID, LVar0) - EVT_CALL(ModifyColliderFlags, 0, 1, 0x7FFFFE00) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, 1, 0x7FFFFE00) EVT_SET(LVar0, EVT_PTR(N(80241350))) EVT_EXEC(EnterWalk) EVT_EXEC_WAIT(N(80240D40)) diff --git a/src/world/area_flo/flo_21/CE7240.c b/src/world/area_flo/flo_21/CE7240.c index db6e1fdc74..b9720fddbe 100644 --- a/src/world/area_flo/flo_21/CE7240.c +++ b/src/world/area_flo/flo_21/CE7240.c @@ -2,4 +2,4 @@ #include "common/CosInterpMinMax.inc.c" -#include "world/common/UnsetCamera0MoveFlag1.inc.c" +#include "world/common/todo/UnsetCamera0MoveFlag1.inc.c" diff --git a/src/world/area_flo/flo_22/CEC240.c b/src/world/area_flo/flo_22/CEC240.c index 814b8d2e13..ef113ae8dc 100644 --- a/src/world/area_flo/flo_22/CEC240.c +++ b/src/world/area_flo/flo_22/CEC240.c @@ -50,7 +50,7 @@ EvtScript N(main) = { EVT_EXEC(N(80241F6C)) EVT_EXEC(N(80241528)) EVT_CALL(GetEntryID, LVar0) - EVT_CALL(ModifyColliderFlags, 0, 1, 0x7FFFFE00) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, 1, 0x7FFFFE00) EVT_SET(LVar0, EVT_PTR(N(802403AC))) EVT_EXEC(EnterWalk) EVT_EXEC(N(80240E24)) diff --git a/src/world/area_flo/flo_23/CEE2A0.c b/src/world/area_flo/flo_23/CEE2A0.c index 7ef3764cc4..51b0672001 100644 --- a/src/world/area_flo/flo_23/CEE2A0.c +++ b/src/world/area_flo/flo_23/CEE2A0.c @@ -106,8 +106,8 @@ EvtScript N(main) = { EVT_SET(LVar3, -90) EVT_SET(LVar4, 0) EVT_EXEC(N(80240DA0)) - EVT_CALL(ModifyColliderFlags, 0, 1, 0x7FFFFE00) - EVT_CALL(ModifyColliderFlags, 0, 5, 0x7FFFFE00) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, 1, 0x7FFFFE00) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, 5, 0x7FFFFE00) EVT_SET(LVar0, EVT_PTR(N(80241104))) EVT_EXEC(EnterWalk) EVT_EXEC_WAIT(N(80240D30)) @@ -237,7 +237,7 @@ EvtScript N(interact_80241564) = { EVT_CALL(EndSpeech, -1, ANIM_GateFlower_Blue_HappyTalk, ANIM_GateFlower_Blue_HappyIdle, 0) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_GateFlower_Blue_OpenGate) EVT_CALL(PlaySoundAtCollider, 13, 457, 0) - EVT_CALL(ModifyColliderFlags, 0, 13, 0x7FFFFE00) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, 13, 0x7FFFFE00) EVT_CALL(MakeLerp, 0, 100, 30, 1) EVT_LOOP(0) EVT_CALL(UpdateLerp) @@ -338,7 +338,7 @@ EvtScript N(init_80241E70) = { EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(interact_80241564))) EVT_IF_EQ(GF_FLO23_GaveBlueBerry, 1) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_GateFlower_Blue_HappyDance) - EVT_CALL(ModifyColliderFlags, 0, 13, 0x7FFFFE00) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, 13, 0x7FFFFE00) EVT_CALL(RotateModel, 59, 50, 0, -1, 0) EVT_CALL(RotateModel, 60, 50, 0, -1, 0) EVT_CALL(RotateModel, 61, 50, 0, -1, 0) @@ -475,6 +475,6 @@ EvtScript N(makeEntities) = { #include "world/common/atomic/MakeConsumableChoice.inc.c" -#include "world/common/enemy/TackleAI.inc.c" +#include "world/common/enemy/ai/TackleAI.inc.c" #include "world/common/atomic/ItemChoice_FlowerGuard.inc.c" diff --git a/src/world/area_flo/flo_24/CF0980.c b/src/world/area_flo/flo_24/CF0980.c index b386a69ebb..b9f954a436 100644 --- a/src/world/area_flo/flo_24/CF0980.c +++ b/src/world/area_flo/flo_24/CF0980.c @@ -96,9 +96,9 @@ EvtScript N(main) = { EVT_CALL(ModifyColliderFlags, 3, 29, 0x00000004) EVT_CALL(ModifyColliderFlags, 3, 27, 0x00000004) EVT_CALL(ModifyColliderFlags, 3, 28, 0x00000004) - EVT_CALL(ModifyColliderFlags, 0, 29, 0x00080000) - EVT_CALL(ModifyColliderFlags, 0, 27, 0x00080000) - EVT_CALL(ModifyColliderFlags, 0, 28, 0x00080000) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, 29, 0x00080000) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, 27, 0x00080000) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, 28, 0x00080000) EVT_CALL(ModifyColliderFlags, 3, 23, 0x00000001) EVT_SET(LVar0, -480) EVT_SET(LVar1, -350) @@ -112,8 +112,8 @@ EvtScript N(main) = { EVT_SET(LVar3, -260) EVT_SET(LVar4, 0) EVT_EXEC(N(80240690)) - EVT_CALL(ModifyColliderFlags, 0, 1, 0x7FFFFE00) - EVT_CALL(ModifyColliderFlags, 0, 5, 0x7FFFFE00) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, 1, 0x7FFFFE00) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, 5, 0x7FFFFE00) EVT_CALL(GetEntryID, LVar0) EVT_IF_EQ(LVar0, 2) EVT_EXEC(N(8024183C)) @@ -287,7 +287,7 @@ EvtScript N(8024183C) = { EvtScript N(80241ABC) = { EVT_IF_LT(GB_StoryProgress, 49) EVT_CALL(EnableGroup, 94, 0) - EVT_CALL(ModifyColliderFlags, 0, 30, 0x7FFFFE00) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, 30, 0x7FFFFE00) EVT_ELSE EVT_CALL(EnableGroup, 65, 0) EVT_END_IF diff --git a/src/world/area_flo/flo_25/CF2C10.c b/src/world/area_flo/flo_25/CF2C10.c index fe168f17e8..1d38ebc24e 100644 --- a/src/world/area_flo/flo_25/CF2C10.c +++ b/src/world/area_flo/flo_25/CF2C10.c @@ -108,8 +108,8 @@ EvtScript N(main) = { EVT_SET(LVar3, -60) EVT_SET(LVar4, 60) EVT_EXEC(N(802423A0)) - EVT_CALL(ModifyColliderFlags, 0, 1, 0x7FFFFE00) - EVT_CALL(ModifyColliderFlags, 0, 5, 0x7FFFFE00) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, 1, 0x7FFFFE00) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, 5, 0x7FFFFE00) EVT_SET(LVar0, EVT_PTR(N(80242704))) EVT_EXEC(EnterWalk) EVT_EXEC_WAIT(N(80242330)) @@ -274,7 +274,7 @@ EvtScript N(interact_80242C58) = { EVT_CALL(EndSpeech, -1, ANIM_GateFlower_Red_HappyTalk, ANIM_GateFlower_Red_HappyIdle, 0) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_GateFlower_Red_OpenGate) EVT_CALL(PlaySoundAtCollider, 14, 457, 0) - EVT_CALL(ModifyColliderFlags, 0, 14, 0x7FFFFE00) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, 14, 0x7FFFFE00) EVT_CALL(MakeLerp, 0, 100, 30, 1) EVT_LOOP(0) EVT_CALL(UpdateLerp) @@ -375,7 +375,7 @@ EvtScript N(init_80243564) = { EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(interact_80242C58))) EVT_IF_EQ(GF_FLO25_GaveRedBerry, 1) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_GateFlower_Red_HappyDance) - EVT_CALL(ModifyColliderFlags, 0, 14, 0x7FFFFE00) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, 14, 0x7FFFFE00) EVT_CALL(RotateModel, 86, 50, 0, -1, 0) EVT_CALL(RotateModel, 87, 50, 0, -1, 0) EVT_CALL(RotateModel, 88, 50, 0, -1, 0) @@ -520,9 +520,9 @@ static s32 N(pad_3CD8)[] = { 0x00000000, 0x00000000, }; -#include "world/common/enemy/FlyingAI.inc.c" +#include "world/common/enemy/ai/FlyingAI.inc.c" -#include "world/common/enemy/FlyingNoAttackAI.inc.c" +#include "world/common/enemy/ai/FlyingNoAttackAI.inc.c" #include "world/common/atomic/ItemChoice_PartA.inc.c" diff --git a/src/world/area_flo/flo_25/CF4E00.c b/src/world/area_flo/flo_25/CF4E00.c index 611eff792e..7f93ba5ba3 100644 --- a/src/world/area_flo/flo_25/CF4E00.c +++ b/src/world/area_flo/flo_25/CF4E00.c @@ -1,3 +1,3 @@ #include "flo_25.h" -#include "world/common/UnkFunc43.inc.c" +#include "world/common/todo/UnkFunc43.inc.c" diff --git a/src/world/area_gv/gv_01/gv_01.c b/src/world/area_gv/gv_01/gv_01.c index 5be266a7c9..4a8fed8bcc 100644 --- a/src/world/area_gv/gv_01/gv_01.c +++ b/src/world/area_gv/gv_01/gv_01.c @@ -15,8 +15,8 @@ MapSettings N(settings) = { .entryCount = ENTRY_COUNT(N(Entrances)), }; -#include "world/common/atomic/Pipe.inc.c" -#include "world/common/atomic/Pipe.data.inc.c" +#include "world/common/entity/Pipe.inc.c" +#include "world/common/entity/Pipe.data.inc.c" #include "world/common/atomic/TexturePan.inc.c" #include "world/common/atomic/TexturePan.data.inc.c" diff --git a/src/world/area_hos/hos_00/A0C4E0.c b/src/world/area_hos/hos_00/A0C4E0.c index ab69fa2b97..bc15adcde4 100644 --- a/src/world/area_hos/hos_00/A0C4E0.c +++ b/src/world/area_hos/hos_00/A0C4E0.c @@ -3,9 +3,9 @@ extern f32 D_80242B9C_A0E88C; extern f32 D_80242BA0_A0E890; -#include "world/common/StashVars.inc.c" +#include "world/common/todo/StashVars.inc.c" -#include "world/common/GetItemName.inc.c" +#include "world/common/todo/GetItemName.inc.c" ApiStatus N(EnableActionCommands)(Evt* script, s32 isInitialCall) { PlayerData* playerData = &gPlayerData; @@ -51,7 +51,7 @@ ApiStatus func_80240A54_A0C744(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -#include "world/common/SetCamera0Flag1000.inc.c" +#include "world/common/todo/SetCamera0Flag1000.inc.c" ApiStatus func_80240B3C_A0C82C(Evt* script, s32 isInitialCall) { s32 temp_s1 = script->varTable[0]; diff --git a/src/world/area_hos/hos_01/A10880.c b/src/world/area_hos/hos_01/A10880.c index 98f185270f..f6bac058db 100644 --- a/src/world/area_hos/hos_01/A10880.c +++ b/src/world/area_hos/hos_01/A10880.c @@ -2,7 +2,7 @@ #include "common/UnkEffect0FFuncs.inc.c" -#include "world/common/GetFloorCollider.inc.c" +#include "world/common/todo/GetFloorCollider.inc.c" static char* N(exit_str_0) = "kmr_24"; static char* N(exit_str_1) = "hos_00"; diff --git a/src/world/area_hos/hos_01/A11020.c b/src/world/area_hos/hos_01/A11020.c index 054adaa1e6..5d173f291e 100644 --- a/src/world/area_hos/hos_01/A11020.c +++ b/src/world/area_hos/hos_01/A11020.c @@ -60,7 +60,7 @@ ApiStatus func_80240C84_A11504(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -#include "world/common/SwitchToPartner.inc.c" +#include "world/common/todo/SwitchToPartner.inc.c" ApiStatus func_80240CDC_A1155C(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; diff --git a/src/world/area_hos/hos_01/A11650.c b/src/world/area_hos/hos_01/A11650.c index d7cd8791c8..e1e95bf3b9 100644 --- a/src/world/area_hos/hos_01/A11650.c +++ b/src/world/area_hos/hos_01/A11650.c @@ -1,7 +1,7 @@ #include "hos_01.h" -#include "world/common/UnsetCamera0MoveFlag1.inc.c" +#include "world/common/todo/UnsetCamera0MoveFlag1.inc.c" #define NAMESPACE hos_01_dup -#include "world/common/GetFloorCollider.inc.c" +#include "world/common/todo/GetFloorCollider.inc.c" #define NAMESPACE hos_01 diff --git a/src/world/area_hos/hos_02/A17210.c b/src/world/area_hos/hos_02/A17210.c index 8acb693a77..ad24070f8b 100644 --- a/src/world/area_hos/hos_02/A17210.c +++ b/src/world/area_hos/hos_02/A17210.c @@ -1,5 +1,5 @@ #include "hos_02.h" -#include "world/common/enemy/FlyingAI.inc.c" +#include "world/common/enemy/ai/FlyingAI.inc.c" -#include "world/common/enemy/FlyingNoAttackAI.inc.c" +#include "world/common/enemy/ai/FlyingNoAttackAI.inc.c" diff --git a/src/world/area_hos/hos_03/A1B100.c b/src/world/area_hos/hos_03/A1B100.c index d2c43c2a31..9cc8d043ec 100644 --- a/src/world/area_hos/hos_03/A1B100.c +++ b/src/world/area_hos/hos_03/A1B100.c @@ -3,4 +3,4 @@ static char* N(exit_str_0) = "hos_02"; static char* N(exit_str_1) = "hos_04"; -#include "world/common/GetFloorCollider.inc.c" +#include "world/common/todo/GetFloorCollider.inc.c" diff --git a/src/world/area_hos/hos_03/A1BDB0.c b/src/world/area_hos/hos_03/A1BDB0.c index bb8e3b5eaf..1490890e05 100644 --- a/src/world/area_hos/hos_03/A1BDB0.c +++ b/src/world/area_hos/hos_03/A1BDB0.c @@ -2,7 +2,7 @@ #define CHUCK_QUIZMO_NPC_ID 7 -#include "world/common/enemy/FlyingAI.inc.c" +#include "world/common/enemy/ai/FlyingAI.inc.c" #include "world/common/atomic/ToadHouse.inc.c" diff --git a/src/world/area_hos/hos_06/A397F0.c b/src/world/area_hos/hos_06/A397F0.c index 835fe021c5..80beb6989c 100644 --- a/src/world/area_hos/hos_06/A397F0.c +++ b/src/world/area_hos/hos_06/A397F0.c @@ -4,16 +4,16 @@ extern ShopItemData D_802435EC_A3CACC[]; extern IconHudScriptPair gItemHudScripts[]; -#include "world/common/StashVars.inc.c" +#include "world/common/todo/StashVars.inc.c" #define NAMESPACE dup2_hos_06 -#include "world/common/GetItemName.inc.c" +#include "world/common/todo/GetItemName.inc.c" #define NAMESPACE hos_06 #define NAMESPACE dup_hos_06 -#include "world/common/GetNpcCollisionHeight.inc.c" +#include "world/common/todo/GetNpcCollisionHeight.inc.c" -#include "world/common/AddPlayerHandsOffset.inc.c" +#include "world/common/todo/AddPlayerHandsOffset.inc.c" #define NAMESPACE hos_06 INCLUDE_ASM(s32, "world/area_hos/hos_06/A397F0", func_80240654_A39B34); @@ -42,7 +42,7 @@ ApiStatus func_802406E0_A39BC0(Evt* script, s32 isInitialCall) { } extern s32 N(LetterDelivery_SavedNpcAnim); -#include "world/common/LetterDelivery.inc.c" +#include "world/common/todo/LetterDelivery.inc.c" ApiStatus Merlow_GetPlayerStarPieces(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; diff --git a/src/world/area_hos/hos_06/A3A230.c b/src/world/area_hos/hos_06/A3A230.c index 3aa8f1f686..b43a2d459b 100644 --- a/src/world/area_hos/hos_06/A3A230.c +++ b/src/world/area_hos/hos_06/A3A230.c @@ -1,8 +1,8 @@ #include "hos_06.h" -#include "world/common/GetNpcCollisionHeight.inc.c" +#include "world/common/todo/GetNpcCollisionHeight.inc.c" -#include "world/common/AddPlayerHandsOffset.inc.c" +#include "world/common/todo/AddPlayerHandsOffset.inc.c" INCLUDE_ASM(s32, "world/area_hos/hos_06/A3A230", func_80240F7C_A3A45C); @@ -30,10 +30,10 @@ ApiStatus func_80241008_A3A4E8(Evt* script, s32 isInitialCall) { } #define NAMESPACE dup_hos_06 -#include "world/common/StashVars.inc.c" +#include "world/common/todo/StashVars.inc.c" #define NAMESPACE hos_06 -#include "world/common/GetItemName.inc.c" +#include "world/common/todo/GetItemName.inc.c" s32 func_802411BC_A3A69C(s32 badgeID) { s32 i; diff --git a/src/world/area_hos/hos_06/A3B4B0.c b/src/world/area_hos/hos_06/A3B4B0.c index 214ee826c2..a54530c6f3 100644 --- a/src/world/area_hos/hos_06/A3B4B0.c +++ b/src/world/area_hos/hos_06/A3B4B0.c @@ -1,19 +1,19 @@ #include "hos_06.h" #define NAMESPACE dup2_hos_06 -#include "world/common/StashVars.inc.c" +#include "world/common/todo/StashVars.inc.c" #define NAMESPACE hos_06 #define NAMESPACE dup_hos_06 -#include "world/common/GetItemName.inc.c" +#include "world/common/todo/GetItemName.inc.c" #define NAMESPACE hos_06 -#include "world/common/SomeItemEntityFunc.inc.c" +#include "world/common/todo/SomeItemEntityFunc.inc.c" -#include "world/common/IsItemBadge.inc.c" +#include "world/common/todo/IsItemBadge.inc.c" INCLUDE_ASM(s32, "world/area_hos/hos_06/A3B4B0", func_8024228C_A3B76C); INCLUDE_ASM(s32, "world/area_hos/hos_06/A3B4B0", func_802424CC_A3B9AC); -#include "world/common/GetItemEmptyCount.inc.c" +#include "world/common/todo/GetItemEmptyCount.inc.c" diff --git a/src/world/area_hos/hos_10/A3F740.c b/src/world/area_hos/hos_10/A3F740.c index de2644050c..36502cf439 100644 --- a/src/world/area_hos/hos_10/A3F740.c +++ b/src/world/area_hos/hos_10/A3F740.c @@ -4,4 +4,4 @@ static char* N(exit_str_0) = "kmr_21"; static char* N(exit_str_1) = "osr_02"; static char* N(exit_str_2) = "kmr_20"; -#include "world/common/SetPlayerSpriteSet2.inc.c" +#include "world/common/todo/SetPlayerSpriteSet2.inc.c" diff --git a/src/world/area_isk/isk_02/978710.c b/src/world/area_isk/isk_02/978710.c index 5e24f70980..46e27d63dc 100644 --- a/src/world/area_isk/isk_02/978710.c +++ b/src/world/area_isk/isk_02/978710.c @@ -3,4 +3,4 @@ static char* N(exit_str_0) = "isk_01"; static char* N(exit_str_1) = "isk_03"; -#include "world/common/RemovePadlock.inc.c" +#include "world/common/todo/RemovePadlock.inc.c" diff --git a/src/world/area_isk/isk_02/978800.c b/src/world/area_isk/isk_02/978800.c index 60a30d1ce9..4363864fd2 100644 --- a/src/world/area_isk/isk_02/978800.c +++ b/src/world/area_isk/isk_02/978800.c @@ -1,2 +1,2 @@ #include "isk_02.h" -#include "world/common/SetNpcB5_3.inc.c" +#include "world/common/todo/SetNpcB5_3.inc.c" diff --git a/src/world/area_isk/isk_04/97B630.c b/src/world/area_isk/isk_04/97B630.c index ecb023c8bb..65ef79cc1c 100644 --- a/src/world/area_isk/isk_04/97B630.c +++ b/src/world/area_isk/isk_04/97B630.c @@ -5,4 +5,4 @@ static char* N(exit_str_1) = "isk_07"; static char* N(exit_str_2) = "isk_06"; static char* N(exit_str_3) = "isk_05"; -#include "world/common/RemovePadlock.inc.c" +#include "world/common/todo/RemovePadlock.inc.c" diff --git a/src/world/area_isk/isk_04/97B670.c b/src/world/area_isk/isk_04/97B670.c index 5bdbd17bff..df1ea99b3c 100644 --- a/src/world/area_isk/isk_04/97B670.c +++ b/src/world/area_isk/isk_04/97B670.c @@ -1,8 +1,8 @@ #include "isk_04.h" -#include "world/common/enemy/TackleAI.inc.c" +#include "world/common/enemy/ai/TackleAI.inc.c" -#include "world/common/AwaitPlayerNearNpc.inc.c" +#include "world/common/todo/AwaitPlayerNearNpc.inc.c" static const f32 padding = 0.0f; diff --git a/src/world/area_isk/isk_04/97BF60.c b/src/world/area_isk/isk_04/97BF60.c index 4dca5427dd..61cde7674a 100644 --- a/src/world/area_isk/isk_04/97BF60.c +++ b/src/world/area_isk/isk_04/97BF60.c @@ -1,6 +1,6 @@ #include "isk_04.h" -#include "world/common/SwitchToPartner.inc.c" +#include "world/common/todo/SwitchToPartner.inc.c" #include "world/partners.h" extern s32 D_80242288_97D8B8; diff --git a/src/world/area_isk/isk_05/97DAD0.c b/src/world/area_isk/isk_05/97DAD0.c index 07e1848eee..0f7ea5ce92 100644 --- a/src/world/area_isk/isk_05/97DAD0.c +++ b/src/world/area_isk/isk_05/97DAD0.c @@ -5,7 +5,7 @@ static char* N(exit_str_0) = "isk_04"; static char* N(exit_str_1) = ""; -#include "world/common/enemy/StoneChompAI.inc.c" +#include "world/common/enemy/ai/StoneChompAI.inc.c" #include "world/area_isk/StoneChompFX.inc.c" diff --git a/src/world/area_isk/isk_07/982440.c b/src/world/area_isk/isk_07/982440.c index 78974023fb..83b27a561b 100644 --- a/src/world/area_isk/isk_07/982440.c +++ b/src/world/area_isk/isk_07/982440.c @@ -3,7 +3,7 @@ static char* N(exit_str_0) = "isk_08"; static char* N(exit_str_1) = "isk_04"; -#include "world/common/SetNpcB5_3.inc.c" +#include "world/common/todo/SetNpcB5_3.inc.c" ApiStatus func_80240014_982454(Evt* script, s32 isInitialCall) { EncounterStatus* encounterStatus = &gCurrentEncounter; diff --git a/src/world/area_isk/isk_07/9824F0.c b/src/world/area_isk/isk_07/9824F0.c index 5a2fe77b09..01e0fc3eaa 100644 --- a/src/world/area_isk/isk_07/9824F0.c +++ b/src/world/area_isk/isk_07/9824F0.c @@ -1,3 +1,3 @@ #include "isk_07.h" -#include "world/common/RemovePadlock.inc.c" +#include "world/common/todo/RemovePadlock.inc.c" diff --git a/src/world/area_isk/isk_08/984E30.c b/src/world/area_isk/isk_08/984E30.c index 83062af973..b2e561aa59 100644 --- a/src/world/area_isk/isk_08/984E30.c +++ b/src/world/area_isk/isk_08/984E30.c @@ -5,6 +5,6 @@ static char* N(exit_str_1) = "isk_10"; static char* N(exit_str_2) = "isk_07"; static char* N(exit_str_3) = "isk_11"; -#include "world/common/enemy/TackleAI.inc.c" +#include "world/common/enemy/ai/TackleAI.inc.c" -#include "world/common/AwaitPlayerNearNpc.inc.c" +#include "world/common/todo/AwaitPlayerNearNpc.inc.c" diff --git a/src/world/area_isk/isk_09/9864E0.c b/src/world/area_isk/isk_09/9864E0.c index 5a6bc60c31..0e1cce100a 100644 --- a/src/world/area_isk/isk_09/9864E0.c +++ b/src/world/area_isk/isk_09/9864E0.c @@ -4,13 +4,13 @@ static char* N(exit_str_0) = "isk_08"; static char* N(exit_str_1) = ""; -#include "world/common/StashVars.inc.c" +#include "world/common/todo/StashVars.inc.c" -#include "world/common/GetItemName.inc.c" +#include "world/common/todo/GetItemName.inc.c" -#include "world/common/SomeItemEntityFunc.inc.c" +#include "world/common/todo/SomeItemEntityFunc.inc.c" -#include "world/common/IsItemBadge.inc.c" +#include "world/common/todo/IsItemBadge.inc.c" ApiStatus func_802402BC_98679C(Evt* script, s32 isInitialCall) { Entity* bigChest = get_entity_by_index(script->varTable[0]); diff --git a/src/world/area_isk/isk_10/988B60.c b/src/world/area_isk/isk_10/988B60.c index a9c9556d6b..ad4829f271 100644 --- a/src/world/area_isk/isk_10/988B60.c +++ b/src/world/area_isk/isk_10/988B60.c @@ -5,7 +5,7 @@ static char* N(exit_str_1) = "isk_14"; static char* N(exit_str_2) = "isk_18"; static char* N(exit_str_3) = ""; -#include "world/common/atomic/SuperBlock.inc.c" +#include "world/common/entity/SuperBlock.inc.c" ApiStatus func_80240D38_989898(Evt* script, s32 isInitialCall) { s32 status = -1; diff --git a/src/world/area_isk/isk_11/98AB30.c b/src/world/area_isk/isk_11/98AB30.c index b017174c07..365b71c300 100644 --- a/src/world/area_isk/isk_11/98AB30.c +++ b/src/world/area_isk/isk_11/98AB30.c @@ -1,3 +1,3 @@ #include "isk_11.h" -#include "world/common/RemovePadlock.inc.c" +#include "world/common/todo/RemovePadlock.inc.c" diff --git a/src/world/area_isk/isk_13/98F7E0.c b/src/world/area_isk/isk_13/98F7E0.c index 878811e05b..384ac7d73d 100644 --- a/src/world/area_isk/isk_13/98F7E0.c +++ b/src/world/area_isk/isk_13/98F7E0.c @@ -5,7 +5,7 @@ static char* N(exit_str_0) = "isk_12"; static char* N(exit_str_1) = ""; -#include "world/common/enemy/StoneChompAI.inc.c" +#include "world/common/enemy/ai/StoneChompAI.inc.c" #include "world/area_isk/StoneChompFX.inc.c" diff --git a/src/world/area_isk/isk_14/992730.c b/src/world/area_isk/isk_14/992730.c index f43921a115..412e76aa04 100644 --- a/src/world/area_isk/isk_14/992730.c +++ b/src/world/area_isk/isk_14/992730.c @@ -5,7 +5,7 @@ static char* N(exit_str_0) = "isk_10"; static char* N(exit_str_1) = ""; -#include "world/common/enemy/StoneChompAI.inc.c" +#include "world/common/enemy/ai/StoneChompAI.inc.c" #include "world/area_isk/StoneChompFX.inc.c" diff --git a/src/world/area_isk/isk_16/9951F0.c b/src/world/area_isk/isk_16/9951F0.c index 5229ed12b0..cad9c4ff06 100644 --- a/src/world/area_isk/isk_16/9951F0.c +++ b/src/world/area_isk/isk_16/9951F0.c @@ -1,6 +1,6 @@ #include "isk_16.h" -#include "world/common/StarSpiritEffectFunc.inc.c" +#include "world/common/todo/StarSpiritEffectFunc.inc.c" static char* N(exit_str_0) = "kmr_23"; static char* N(exit_str_1) = "isk_19"; diff --git a/src/world/area_isk/isk_18/997F70.c b/src/world/area_isk/isk_18/997F70.c index cddf74169c..09c00a7f71 100644 --- a/src/world/area_isk/isk_18/997F70.c +++ b/src/world/area_isk/isk_18/997F70.c @@ -3,6 +3,6 @@ static char* N(exit_str_0) = "isk_10"; static char* N(exit_str_1) = "isk_12"; -#include "world/common/enemy/TackleAI.inc.c" +#include "world/common/enemy/ai/TackleAI.inc.c" -#include "world/common/AwaitPlayerNearNpc.inc.c" +#include "world/common/todo/AwaitPlayerNearNpc.inc.c" diff --git a/src/world/area_iwa/iwa_10/iwa_10_1_main.c b/src/world/area_iwa/iwa_10/iwa_10_1_main.c index ae7d19a868..fb70b7657c 100644 --- a/src/world/area_iwa/iwa_10/iwa_10_1_main.c +++ b/src/world/area_iwa/iwa_10/iwa_10_1_main.c @@ -69,14 +69,14 @@ EvtScript N(EVS_Main) = { EVT_GOTO(10) EVT_END_THREAD EVT_THREAD - EVT_CALL(SetTexPanner, MODEL_o256, 2) - EVT_CALL(SetTexPanner, MODEL_o266, 2) + EVT_CALL(SetTexPanner, MODEL_o256, TEX_PANNER_2) + EVT_CALL(SetTexPanner, MODEL_o266, TEX_PANNER_2) EVT_CALL(EnableTexPanning, MODEL_o256, TRUE) EVT_CALL(EnableTexPanning, MODEL_o266, TRUE) EVT_SET(LVar0, 0) EVT_LABEL(20) EVT_SUB(LVar0, 3000) - EVT_CALL(SetTexPanOffset, 2, 0, 0, LVar0) + EVT_CALL(SetTexPanOffset, TEX_PANNER_2, TEX_PANNER_MAIN, 0, LVar0) EVT_WAIT(1) EVT_GOTO(20) EVT_END_THREAD diff --git a/src/world/area_iwa/iwa_10/iwa_10_4_entity.c b/src/world/area_iwa/iwa_10/iwa_10_4_entity.c index 264b008bec..16a81c7614 100644 --- a/src/world/area_iwa/iwa_10/iwa_10_4_entity.c +++ b/src/world/area_iwa/iwa_10/iwa_10_4_entity.c @@ -3,8 +3,8 @@ #define SUPER_BLOCK_MAPVAR MV_SuperBlock #define SUPER_BLOCK_GAMEFLAG GF_IWA10_SuperBlock -#include "world/common/atomic/SuperBlock.inc.c" -#include "world/common/atomic/SuperBlock.data.inc.c" +#include "world/common/entity/SuperBlock.inc.c" +#include "world/common/entity/SuperBlock.data.inc.c" EvtScript N(EVS_OnSmashBlock) = { EVT_SET(GF_IWA10_Hammer1Block, TRUE) diff --git a/src/world/area_iwa/iwa_10/iwa_10_6_new_party.c b/src/world/area_iwa/iwa_10/iwa_10_6_new_party.c index a514989ca3..67eff49ca4 100644 --- a/src/world/area_iwa/iwa_10/iwa_10_6_new_party.c +++ b/src/world/area_iwa/iwa_10/iwa_10_6_new_party.c @@ -1,4 +1,4 @@ #include "iwa_10.h" #define PARTY_IMAGE "party_pareta" -#include "world/common/LoadPartyImage.inc.c" +#include "world/common/todo/LoadPartyImage.inc.c" 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 b8c80cf6e5..f66132e89d 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 @@ -56,8 +56,8 @@ EvtScript N(EVS_Main) = { EVT_END_THREAD EVT_EXEC(N(EVS_802467AC)) EVT_EXEC(N(EVS_80247A2C)) - EVT_CALL(ModifyColliderFlags, 0, COLLIDER_deilitne, COLLIDER_FLAGS_UPPER_MASK) - EVT_CALL(ModifyColliderFlags, 0, COLLIDER_deilitse, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_deilitne, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_deilitse, COLLIDER_FLAGS_UPPER_MASK) EVT_CALL(GetEntryID, LVar0) EVT_IF_EQ(LVar0, jan_00_ENTRY_0) EVT_EXEC(N(EVS_BindExitTriggers)) 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 f2bdf83779..37890b330e 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 @@ -5,7 +5,7 @@ extern EvtScript N(D_80245860_B25DA0); extern EvtScript N(EVS_NpcInteract_HeartPlant_01); -#include "world/common/HeartPlant_SpawnHeart.inc.c" +#include "world/common/todo/HeartPlant_SpawnHeart.inc.c" NpcSettings N(NpcSettings_Kolorado_01) = { .height = 24, @@ -91,7 +91,7 @@ EvtScript N(EVS_Kolorado_LetterReward) = { EVT_IF_EQ(LVarC, 2) EVT_SET(LVar0, ITEM_STAR_PIECE) EVT_SET(LVar1, 3) - EVT_EXEC_WAIT(N(Delivery_ShowGotStarPiece)) + EVT_EXEC_WAIT(N(GiveKeyReward)) EVT_CALL(AddStarPieces, 1) EVT_END_IF EVT_RETURN diff --git a/src/world/area_jan/jan_01/B28030.c b/src/world/area_jan/jan_01/B28030.c index 57994eafab..160c27f24d 100644 --- a/src/world/area_jan/jan_01/B28030.c +++ b/src/world/area_jan/jan_01/B28030.c @@ -13,8 +13,8 @@ ApiStatus func_8024030C_B2833C(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -#include "world/common/enemy/HoppingAI.inc.c" +#include "world/common/enemy/ai/HoppingAI.inc.c" -#include "world/common/SetCamera0Flag1000.inc.c" +#include "world/common/todo/SetCamera0Flag1000.inc.c" -#include "world/common/UnsetCamera0Flag1000.inc.c" +#include "world/common/todo/UnsetCamera0Flag1000.inc.c" diff --git a/src/world/area_jan/jan_02/B2C8A0.c b/src/world/area_jan/jan_02/B2C8A0.c index 7eb33dca58..26f05bebd0 100644 --- a/src/world/area_jan/jan_02/B2C8A0.c +++ b/src/world/area_jan/jan_02/B2C8A0.c @@ -2,11 +2,11 @@ #define CHUCK_QUIZMO_NPC_ID 5 -#include "world/common/enemy/PatrolNoAttackAI.inc.c" +#include "world/common/enemy/ai/PatrolNoAttackAI.inc.c" -#include "world/common/GetNpcCollisionHeight.inc.c" +#include "world/common/todo/GetNpcCollisionHeight.inc.c" -#include "world/common/AddPlayerHandsOffset.inc.c" +#include "world/common/todo/AddPlayerHandsOffset.inc.c" INCLUDE_ASM(s32, "world/area_jan/jan_02/B2C8A0", func_802414EC_B2D95C); @@ -41,4 +41,4 @@ extern EffectInstance* N(Quizmo_VannaTEffect); #include "world/common/atomic/Quizmo.inc.c" -#include "world/common/SwitchToPartner.inc.c" +#include "world/common/todo/SwitchToPartner.inc.c" diff --git a/src/world/area_jan/jan_03/B34BD0.c b/src/world/area_jan/jan_03/B34BD0.c index e6b3e201b0..8d0ac1a777 100644 --- a/src/world/area_jan/jan_03/B34BD0.c +++ b/src/world/area_jan/jan_03/B34BD0.c @@ -7,21 +7,21 @@ static char* N(exit_str_3) = ""; #define CHUCK_QUIZMO_NPC_ID 17 -#include "world/common/atomic/Pipe.inc.c" +#include "world/common/entity/Pipe.inc.c" #include "world/common/atomic/TexturePan.inc.c" INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_802405EC_B351BC); -#include "world/common/enemy/PatrolNoAttackAI.inc.c" +#include "world/common/enemy/ai/PatrolNoAttackAI.inc.c" static char* N(exit_str_4) = "tik_08"; #include "world/common/atomic/ToadHouse.inc.c" -#include "world/common/GetNpcCollisionHeight.inc.c" +#include "world/common/todo/GetNpcCollisionHeight.inc.c" -#include "world/common/AddPlayerHandsOffset.inc.c" +#include "world/common/todo/AddPlayerHandsOffset.inc.c" INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_802419D8_B365A8); @@ -78,6 +78,6 @@ extern EffectInstance* N(Quizmo_VannaTEffect); #include "world/common/atomic/Quizmo.inc.c" extern s32 N(LetterDelivery_SavedNpcAnim); -#include "world/common/LetterDelivery.inc.c" +#include "world/common/todo/LetterDelivery.inc.c" INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_80242F1C_B37AEC); diff --git a/src/world/area_jan/jan_04/B44AC0.c b/src/world/area_jan/jan_04/B44AC0.c index d37c976389..566e37d143 100644 --- a/src/world/area_jan/jan_04/B44AC0.c +++ b/src/world/area_jan/jan_04/B44AC0.c @@ -1,9 +1,9 @@ #include "jan_04.h" -#include "world/common/StashVars.inc.c" +#include "world/common/todo/StashVars.inc.c" -#include "world/common/GetItemName.inc.c" +#include "world/common/todo/GetItemName.inc.c" -#include "world/common/SomeItemEntityFunc.inc.c" +#include "world/common/todo/SomeItemEntityFunc.inc.c" -#include "world/common/IsItemBadge.inc.c" +#include "world/common/todo/IsItemBadge.inc.c" diff --git a/src/world/area_jan/jan_04/B45150.c b/src/world/area_jan/jan_04/B45150.c index adbca565e3..5d743f692c 100644 --- a/src/world/area_jan/jan_04/B45150.c +++ b/src/world/area_jan/jan_04/B45150.c @@ -2,5 +2,5 @@ // TODO(data) //#define PARTY_IMAGE "party_opuku" -//#include "world/common/LoadPartyImage.inc.c" +//#include "world/common/todo/LoadPartyImage.inc.c" INCLUDE_ASM(s32, "world/area_jan/jan_04/B45150", func_802409E0_B45150); diff --git a/src/world/area_jan/jan_04/B451F0.c b/src/world/area_jan/jan_04/B451F0.c index 47039c538c..a6ff6adc37 100644 --- a/src/world/area_jan/jan_04/B451F0.c +++ b/src/world/area_jan/jan_04/B451F0.c @@ -2,9 +2,9 @@ //static f64 D_802462E0_B4AA50[4] = {990.0, 2.732579860045591e+204, 2.732579860045591e+204, 0.0}; /* const */ -#include "world/common/SetEntityPositionF.inc.c" +#include "world/common/todo/SetEntityPositionF.inc.c" -#include "world/common/GetEntityPosition.inc.c" +#include "world/common/todo/GetEntityPosition.inc.c" // Can't get this to match because the const array above is in "discarded section .data" #ifdef NON_EQUIVALENT diff --git a/src/world/area_jan/jan_05/B4ADC0.c b/src/world/area_jan/jan_05/B4ADC0.c index 0d23063317..ab93a1fd2b 100644 --- a/src/world/area_jan/jan_05/B4ADC0.c +++ b/src/world/area_jan/jan_05/B4ADC0.c @@ -1,3 +1,3 @@ #include "jan_05.h" -#include "world/common/UnkShadowFunc001.inc.c" +#include "world/common/todo/UnkShadowFunc001.inc.c" diff --git a/src/world/area_jan/jan_05/B4B260.c b/src/world/area_jan/jan_05/B4B260.c index 145a49d224..588e203057 100644 --- a/src/world/area_jan/jan_05/B4B260.c +++ b/src/world/area_jan/jan_05/B4B260.c @@ -1,10 +1,10 @@ #include "jan_05.h" -#include "world/common/HeartPlant_SpawnHeart.inc.c" +#include "world/common/todo/HeartPlant_SpawnHeart.inc.c" -#include "world/common/enemy/HoppingAI.inc.c" +#include "world/common/enemy/ai/HoppingAI.inc.c" -#include "world/common/enemy/SpearGuyAI.inc.c" +#include "world/common/enemy/ai/SpearGuyAI.inc.c" #define NAMESPACE dup_jan_05 #include "common/foliage.inc.c" diff --git a/src/world/area_jan/jan_06/B52BE0.c b/src/world/area_jan/jan_06/B52BE0.c index ed0f38afdf..5237660e7a 100644 --- a/src/world/area_jan/jan_06/B52BE0.c +++ b/src/world/area_jan/jan_06/B52BE0.c @@ -1,3 +1,3 @@ #include "jan_06.h" -#include "world/common/UnkShadowFunc001.inc.c" +#include "world/common/todo/UnkShadowFunc001.inc.c" diff --git a/src/world/area_jan/jan_06/B52F70.c b/src/world/area_jan/jan_06/B52F70.c index 1215c0f2ab..0a8596ddb1 100644 --- a/src/world/area_jan/jan_06/B52F70.c +++ b/src/world/area_jan/jan_06/B52F70.c @@ -1,10 +1,10 @@ #include "jan_06.h" -#include "world/common/enemy/HoppingAI.inc.c" +#include "world/common/enemy/ai/HoppingAI.inc.c" -#include "world/common/HeartPlant_SpawnHeart.inc.c" +#include "world/common/todo/HeartPlant_SpawnHeart.inc.c" -#include "world/common/enemy/SpearGuyAI.inc.c" +#include "world/common/enemy/ai/SpearGuyAI.inc.c" #define NAMESPACE dup_jan_06 #include "common/foliage.inc.c" diff --git a/src/world/area_jan/jan_07/B59870.c b/src/world/area_jan/jan_07/B59870.c index b1d91a23fa..05b05da9bc 100644 --- a/src/world/area_jan/jan_07/B59870.c +++ b/src/world/area_jan/jan_07/B59870.c @@ -3,4 +3,4 @@ static char* N(exit_str_0) = "jan_06"; static char* N(exit_str_1) = "\0\0\0\0"; -#include "world/common/enemy/SpearGuyAI.inc.c" +#include "world/common/enemy/ai/SpearGuyAI.inc.c" diff --git a/src/world/area_jan/jan_08/B5E910.c b/src/world/area_jan/jan_08/B5E910.c index 2b3a3e4a0e..5fa9bd3e05 100644 --- a/src/world/area_jan/jan_08/B5E910.c +++ b/src/world/area_jan/jan_08/B5E910.c @@ -1,3 +1,3 @@ #include "jan_08.h" -#include "world/common/atomic/SuperBlock.inc.c" +#include "world/common/entity/SuperBlock.inc.c" diff --git a/src/world/area_jan/jan_08/B5F650.c b/src/world/area_jan/jan_08/B5F650.c index 9fa34d9f7e..208fa0a017 100644 --- a/src/world/area_jan/jan_08/B5F650.c +++ b/src/world/area_jan/jan_08/B5F650.c @@ -1,5 +1,5 @@ #include "jan_08.h" -#include "world/common/HeartPlant_SpawnHeart.inc.c" +#include "world/common/todo/HeartPlant_SpawnHeart.inc.c" -#include "world/common/enemy/SpearGuyAI.inc.c" +#include "world/common/enemy/ai/SpearGuyAI.inc.c" diff --git a/src/world/area_jan/jan_09/B65AB0.c b/src/world/area_jan/jan_09/B65AB0.c index ee0fbebfba..e92fc11f74 100644 --- a/src/world/area_jan/jan_09/B65AB0.c +++ b/src/world/area_jan/jan_09/B65AB0.c @@ -5,7 +5,7 @@ static char* N(exit_str_1) = "jan_08"; static char* N(exit_str_2) = "jan_06"; static char* N(exit_str_3) = "jan_11"; -#include "world/common/atomic/Pipe.inc.c" +#include "world/common/entity/Pipe.inc.c" #include "world/common/atomic/TexturePan.inc.c" diff --git a/src/world/area_jan/jan_09/B663F0.c b/src/world/area_jan/jan_09/B663F0.c index 1865307220..9b28bcc63c 100644 --- a/src/world/area_jan/jan_09/B663F0.c +++ b/src/world/area_jan/jan_09/B663F0.c @@ -1,3 +1,3 @@ #include "jan_09.h" -#include "world/common/enemy/SpearGuyAI.inc.c" +#include "world/common/enemy/ai/SpearGuyAI.inc.c" diff --git a/src/world/area_jan/jan_10/B6C6A0.c b/src/world/area_jan/jan_10/B6C6A0.c index 0a1e0deea4..66860c72ce 100644 --- a/src/world/area_jan/jan_10/B6C6A0.c +++ b/src/world/area_jan/jan_10/B6C6A0.c @@ -1,3 +1,3 @@ #include "jan_10.h" -#include "world/common/enemy/HoppingAI.inc.c" +#include "world/common/enemy/ai/HoppingAI.inc.c" diff --git a/src/world/area_jan/jan_10/B6D4C0.c b/src/world/area_jan/jan_10/B6D4C0.c index 52242824fb..d3771d00a9 100644 --- a/src/world/area_jan/jan_10/B6D4C0.c +++ b/src/world/area_jan/jan_10/B6D4C0.c @@ -1,3 +1,3 @@ #include "jan_10.h" -#include "world/common/UnkShadowFunc001.inc.c" +#include "world/common/todo/UnkShadowFunc001.inc.c" diff --git a/src/world/area_jan/jan_11/B70860.c b/src/world/area_jan/jan_11/B70860.c index 60847ac9b4..fc27d45389 100644 --- a/src/world/area_jan/jan_11/B70860.c +++ b/src/world/area_jan/jan_11/B70860.c @@ -3,8 +3,8 @@ static char* N(exit_str_0) = "jan_09"; static char* N(exit_str_1) = ""; -#include "world/common/atomic/DarkRoom.inc.c" +#include "world/common/atomic/CreateDarkness.inc.c" -#include "world/common/atomic/Pipe.inc.c" +#include "world/common/entity/Pipe.inc.c" -#include "world/common/UnkPosFunc2.inc.c" +#include "world/common/todo/UnkPosFunc2.inc.c" diff --git a/src/world/area_jan/jan_11/B71010.c b/src/world/area_jan/jan_11/B71010.c index 281bc9de68..7f9a453104 100644 --- a/src/world/area_jan/jan_11/B71010.c +++ b/src/world/area_jan/jan_11/B71010.c @@ -1,6 +1,6 @@ #include "jan_11.h" -#include "world/common/GetFloorCollider.inc.c" +#include "world/common/todo/GetFloorCollider.inc.c" ApiStatus N(IsPartnerWatt)(Evt* script, s32 isInitialCall) { if (gPartnerActionStatus.actingPartner == PARTNER_WATT) { diff --git a/src/world/area_jan/jan_12/B730B0.c b/src/world/area_jan/jan_12/B730B0.c index 76e27ba8b6..3aae93508f 100644 --- a/src/world/area_jan/jan_12/B730B0.c +++ b/src/world/area_jan/jan_12/B730B0.c @@ -4,7 +4,7 @@ static char* N(exit_str_0) = "jan_13"; static char* N(exit_str_1) = "jan_06"; -#include "world/common/PullVine.inc.c" +#include "world/common/todo/PullVine.inc.c" #include "common/foliage.inc.c" diff --git a/src/world/area_jan/jan_12/B73570.c b/src/world/area_jan/jan_12/B73570.c index dc33ce646b..af3c32840a 100644 --- a/src/world/area_jan/jan_12/B73570.c +++ b/src/world/area_jan/jan_12/B73570.c @@ -1,3 +1,3 @@ #include "jan_12.h" -#include "world/common/enemy/SpearGuyAI.inc.c" +#include "world/common/enemy/ai/SpearGuyAI.inc.c" diff --git a/src/world/area_jan/jan_14/B7A050.c b/src/world/area_jan/jan_14/B7A050.c index c0e66bf80e..07369e9e66 100644 --- a/src/world/area_jan/jan_14/B7A050.c +++ b/src/world/area_jan/jan_14/B7A050.c @@ -3,6 +3,6 @@ static char* N(exit_str_0) = "jan_15"; static char* N(exit_str_1) = "jan_13"; -#include "world/common/PullVine.inc.c" +#include "world/common/todo/PullVine.inc.c" #include "common/foliage.inc.c" diff --git a/src/world/area_jan/jan_14/B7A510.c b/src/world/area_jan/jan_14/B7A510.c index aea68e9a6a..e3bde47ac9 100644 --- a/src/world/area_jan/jan_14/B7A510.c +++ b/src/world/area_jan/jan_14/B7A510.c @@ -1,3 +1,3 @@ #include "jan_14.h" -#include "world/common/enemy/HoppingAI.inc.c" +#include "world/common/enemy/ai/HoppingAI.inc.c" diff --git a/src/world/area_jan/jan_15/B7D920.c b/src/world/area_jan/jan_15/B7D920.c index 0280f4abed..f6d02c5fb5 100644 --- a/src/world/area_jan/jan_15/B7D920.c +++ b/src/world/area_jan/jan_15/B7D920.c @@ -3,4 +3,4 @@ static char* N(exit_str_0) = "jan_16"; static char* N(exit_str_1) = "jan_14"; -#include "world/common/HeartPlant_SpawnHeart.inc.c" +#include "world/common/todo/HeartPlant_SpawnHeart.inc.c" diff --git a/src/world/area_jan/jan_22/B84180.c b/src/world/area_jan/jan_22/B84180.c index 20c9e1453b..1e0afe91c0 100644 --- a/src/world/area_jan/jan_22/B84180.c +++ b/src/world/area_jan/jan_22/B84180.c @@ -5,15 +5,15 @@ static char* N(exit_str_1) = "jan_16"; static char* N(exit_str_2) = "kzn_01"; static char* N(exit_str_3) = ""; -#include "world/common/enemy/PatrolNoAttackAI.inc.c" +#include "world/common/enemy/ai/PatrolNoAttackAI.inc.c" -#include "world/common/StashVars.inc.c" +#include "world/common/todo/StashVars.inc.c" -#include "world/common/GetItemName.inc.c" +#include "world/common/todo/GetItemName.inc.c" -#include "world/common/SetCamera0Flag1000.inc.c" +#include "world/common/todo/SetCamera0Flag1000.inc.c" -#include "world/common/UnsetCamera0Flag1000.inc.c" +#include "world/common/todo/UnsetCamera0Flag1000.inc.c" ApiStatus PostChapter5StatUpdate(Evt* script, s32 isInitialCall) { PlayerData* playerData = &gPlayerData; diff --git a/src/world/area_kgr/kgr_01/kgr_01_1_main.c b/src/world/area_kgr/kgr_01/kgr_01_1_main.c index 058473869a..946db3566c 100644 --- a/src/world/area_kgr/kgr_01/kgr_01_1_main.c +++ b/src/world/area_kgr/kgr_01/kgr_01_1_main.c @@ -16,8 +16,8 @@ MapSettings N(settings) = { .tattle = { MSG_MapTattle_kgr_01 }, }; -#include "world/common/atomic/DarkRoom.inc.c" -#include "world/common/atomic/DarkRoom.data.inc.c" +#include "world/common/atomic/CreateDarkness.inc.c" +#include "world/common/atomic/CreateDarkness.data.inc.c" EvtScript N(EVS_ExitWalk_kgr_02_0) = EVT_EXIT_WALK(60, kgr_01_ENTRY_1, "kgr_02", kgr_02_ENTRY_0); EvtScript N(EVS_ExitWalk_mac_05_3) = EVT_EXIT_WALK(60, kgr_01_ENTRY_0, "mac_05", mac_05_ENTRY_3); diff --git a/src/world/area_kgr/kgr_02/kgr_02_1_main.c b/src/world/area_kgr/kgr_02/kgr_02_1_main.c index 6c47707ffd..1626bba49f 100644 --- a/src/world/area_kgr/kgr_02/kgr_02_1_main.c +++ b/src/world/area_kgr/kgr_02/kgr_02_1_main.c @@ -17,8 +17,8 @@ MapSettings N(settings) = { .tattle = { MSG_MapTattle_kgr_02 }, }; -#include "world/common/atomic/DarkRoom.inc.c" -#include "world/common/atomic/DarkRoom.data.inc.c" +#include "world/common/atomic/CreateDarkness.inc.c" +#include "world/common/atomic/CreateDarkness.data.inc.c" EvtScript N(EVS_ExitWalk_kgr_01_1) = EVT_EXIT_WALK(60, kgr_02_ENTRY_0, "kgr_01", kgr_01_ENTRY_1); diff --git a/src/world/area_kkj/kkj_00/ABB340.c b/src/world/area_kkj/kkj_00/ABB340.c index 77836d3de2..741037f751 100644 --- a/src/world/area_kkj/kkj_00/ABB340.c +++ b/src/world/area_kkj/kkj_00/ABB340.c @@ -1,6 +1,6 @@ #include "kkj_00.h" -#include "world/common/enemy/PatrolNoAttackAI.inc.c" +#include "world/common/enemy/ai/PatrolNoAttackAI.inc.c" static char* N(exit_str) = "end_00"; diff --git a/src/world/area_kkj/kkj_01/AC5170.c b/src/world/area_kkj/kkj_01/AC5170.c index 10caaec381..6d76d936ad 100644 --- a/src/world/area_kkj/kkj_01/AC5170.c +++ b/src/world/area_kkj/kkj_01/AC5170.c @@ -5,4 +5,4 @@ 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/PatrolNoAttackAI.inc.c" +#include "world/common/enemy/ai/PatrolNoAttackAI.inc.c" diff --git a/src/world/area_kkj/kkj_03/AC9710.c b/src/world/area_kkj/kkj_03/AC9710.c index 122cdfb824..b035e89704 100644 --- a/src/world/area_kkj/kkj_03/AC9710.c +++ b/src/world/area_kkj/kkj_03/AC9710.c @@ -5,4 +5,4 @@ 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/SetPlayerSpriteSet2.inc.c" +#include "world/common/todo/SetPlayerSpriteSet2.inc.c" diff --git a/src/world/area_kkj/kkj_10/ACAB90.c b/src/world/area_kkj/kkj_10/ACAB90.c index 90dd6f9e31..a45d5d8e49 100644 --- a/src/world/area_kkj/kkj_10/ACAB90.c +++ b/src/world/area_kkj/kkj_10/ACAB90.c @@ -1,3 +1,3 @@ #include "kkj_10.h" -#include "world/common/RemovePadlock.inc.c" +#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 index bd96f1c3fe..c1adb4aaeb 100644 --- a/src/world/area_kkj/kkj_10/ACABD0.c +++ b/src/world/area_kkj/kkj_10/ACABD0.c @@ -2,6 +2,6 @@ #include "world/common/atomic/UnkPhysicsFuncs.inc.c" -#include "world/common/UnkGooberFunc.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 index c7f4af087f..6f6442dacc 100644 --- a/src/world/area_kkj/kkj_10/ACB3C0.c +++ b/src/world/area_kkj/kkj_10/ACB3C0.c @@ -3,14 +3,14 @@ #define NAMESPACE dup_kkj_10 #include "world/common/atomic/UnkPhysicsFuncs.inc.c" -#include "world/common/GetPeachDisguise.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/UnkGooberFunc.inc.c" +#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_11/ACE1B0.c b/src/world/area_kkj/kkj_11/ACE1B0.c index a5363e2dca..55f9f6832f 100644 --- a/src/world/area_kkj/kkj_11/ACE1B0.c +++ b/src/world/area_kkj/kkj_11/ACE1B0.c @@ -1,3 +1,3 @@ #include "kkj_11.h" -#include "world/common/RemovePadlock.inc.c" +#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 index 09d2e5ef52..eee937c02f 100644 --- a/src/world/area_kkj/kkj_11/ACE1F0.c +++ b/src/world/area_kkj/kkj_11/ACE1F0.c @@ -2,6 +2,6 @@ #include "world/common/atomic/UnkPhysicsFuncs.inc.c" -#include "world/common/UnkGooberFunc.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 index 1cbfd56aa0..ea8619d5e1 100644 --- a/src/world/area_kkj/kkj_11/ACE9E0.c +++ b/src/world/area_kkj/kkj_11/ACE9E0.c @@ -4,7 +4,7 @@ #include "world/common/atomic/UnkPhysicsFuncs.inc.c" #define NAMESPACE kkj_11 -#include "world/common/GetPeachDisguise.inc.c" +#include "world/common/todo/GetPeachDisguise.inc.c" ApiStatus func_80240F44_ACF084(Evt* script, s32 isInitialCall) { GameStatus* gameStatus = gGameStatusPtr; @@ -14,7 +14,7 @@ ApiStatus func_80240F44_ACF084(Evt* script, s32 isInitialCall) { } #define NAMESPACE dup_kkj_11 -#include "world/common/UnkGooberFunc.inc.c" +#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_12/AD4100.c b/src/world/area_kkj/kkj_12/AD4100.c index ca03a46aeb..241a5f63cb 100644 --- a/src/world/area_kkj/kkj_12/AD4100.c +++ b/src/world/area_kkj/kkj_12/AD4100.c @@ -2,14 +2,14 @@ #include "world/common/atomic/UnkPhysicsFuncs.inc.c" -#include "world/common/GetPeachDisguise.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/UnkGooberFunc.inc.c" +#include "world/common/todo/UnkGooberFunc.inc.c" ApiStatus func_8024089C_AD492C(Evt* script, s32 isInitialCall) { D_80151328->sources[1].flags = 0; diff --git a/src/world/area_kkj/kkj_13/AD5ED0.c b/src/world/area_kkj/kkj_13/AD5ED0.c index a745bf75c0..355c5e1008 100644 --- a/src/world/area_kkj/kkj_13/AD5ED0.c +++ b/src/world/area_kkj/kkj_13/AD5ED0.c @@ -3,4 +3,4 @@ static char* N(exit_str_0) = "kkj_12"; static char* N(exit_str_1) = "kkj_22"; -#include "world/common/SetPlayerSpriteSet2.inc.c" +#include "world/common/todo/SetPlayerSpriteSet2.inc.c" diff --git a/src/world/area_kkj/kkj_14/ADAEF0.c b/src/world/area_kkj/kkj_14/ADAEF0.c index faa4ce9c62..39480b8bc6 100644 --- a/src/world/area_kkj/kkj_14/ADAEF0.c +++ b/src/world/area_kkj/kkj_14/ADAEF0.c @@ -17,7 +17,7 @@ ApiStatus func_80240384_ADB224(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -#include "world/common/GetPeachDisguise.inc.c" +#include "world/common/todo/GetPeachDisguise.inc.c" ApiStatus func_802403CC_ADB26C(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; diff --git a/src/world/area_kkj/kkj_16/AED410.c b/src/world/area_kkj/kkj_16/AED410.c index a83f9c50e4..3a0b148c9f 100644 --- a/src/world/area_kkj/kkj_16/AED410.c +++ b/src/world/area_kkj/kkj_16/AED410.c @@ -18,6 +18,6 @@ ApiStatus func_80240028_AED438(Evt* script, s32 isInitialCall) { #include "world/common/atomic/UnkPhysicsFuncs.inc.c" -#include "world/common/UnkGooberFunc50.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 index 3a3d2d9680..455d24585b 100644 --- a/src/world/area_kkj/kkj_16/AEDC60.c +++ b/src/world/area_kkj/kkj_16/AEDC60.c @@ -4,7 +4,7 @@ #include "world/common/atomic/UnkPhysicsFuncs.inc.c" #define NAMESPACE kkj_16 -#include "world/common/GetPeachDisguise.inc.c" +#include "world/common/todo/GetPeachDisguise.inc.c" ApiStatus func_80240EF4_AEE304(Evt* script, s32 isInitialCall) { gGameStatusPtr->peachFlags |= PEACH_STATUS_FLAG_8; @@ -12,7 +12,7 @@ ApiStatus func_80240EF4_AEE304(Evt* script, s32 isInitialCall) { } #define NAMESPACE dup_kkj_16 -#include "world/common/UnkGooberFunc50.inc.c" +#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_17/AF1C60.c b/src/world/area_kkj/kkj_17/AF1C60.c index 4f67ce05a2..e5383a8356 100644 --- a/src/world/area_kkj/kkj_17/AF1C60.c +++ b/src/world/area_kkj/kkj_17/AF1C60.c @@ -7,13 +7,13 @@ extern IconHudScriptPair gItemHudScripts[]; static char* N(exit_str_0) = "kkj_11"; static char* N(exit_str_1) = ""; -#include "world/common/StashVars.inc.c" +#include "world/common/todo/StashVars.inc.c" -#include "world/common/GetItemName.inc.c" +#include "world/common/todo/GetItemName.inc.c" -#include "world/common/SomeItemEntityFunc.inc.c" +#include "world/common/todo/SomeItemEntityFunc.inc.c" -#include "world/common/IsItemBadge.inc.c" +#include "world/common/todo/IsItemBadge.inc.c" ApiStatus func_802402BC_AF1F1C(Evt* script, s32 isInitialCall) { PopupMenu *menu; @@ -118,4 +118,4 @@ ApiStatus func_80240500_AF2160(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -#include "world/common/GetItemEmptyCount.inc.c" +#include "world/common/todo/GetItemEmptyCount.inc.c" diff --git a/src/world/area_kkj/kkj_18/AF2FE0.c b/src/world/area_kkj/kkj_18/AF2FE0.c index f65cadec03..5fa7333c0e 100644 --- a/src/world/area_kkj/kkj_18/AF2FE0.c +++ b/src/world/area_kkj/kkj_18/AF2FE0.c @@ -5,9 +5,9 @@ extern s32 D_80241F10_AF4BB0; extern s32 D_80241F14_AF4BB4; extern s32 kkj_18_D_80244E78[]; -#include "world/common/GetNpcCollisionHeight.inc.c" +#include "world/common/todo/GetNpcCollisionHeight.inc.c" -#include "world/common/AddPlayerHandsOffset.inc.c" +#include "world/common/todo/AddPlayerHandsOffset.inc.c" // Needs data migration, matching otherwise #ifdef NON_MATCHING diff --git a/src/world/area_kkj/kkj_19/AF7C00.c b/src/world/area_kkj/kkj_19/AF7C00.c index 550b726195..c52d72fdd1 100644 --- a/src/world/area_kkj/kkj_19/AF7C00.c +++ b/src/world/area_kkj/kkj_19/AF7C00.c @@ -22,9 +22,9 @@ extern HudScript HES_BlueMeter; extern HudScript HES_MashAButton; extern s32 dgb_08_npcGroup_80246528; -#include "world/common/GetNpcCollisionHeight.inc.c" +#include "world/common/todo/GetNpcCollisionHeight.inc.c" -#include "world/common/AddPlayerHandsOffset.inc.c" +#include "world/common/todo/AddPlayerHandsOffset.inc.c" // Needs data migration, matching otherwise #ifdef NON_MATCHING @@ -246,7 +246,7 @@ ApiStatus func_80240B8C_AF84DC(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -#include "world/common/GetFloorCollider.inc.c" +#include "world/common/todo/GetFloorCollider.inc.c" ApiStatus func_80240C10_AF8560(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; diff --git a/src/world/area_kkj/kkj_20/AFDB40.c b/src/world/area_kkj/kkj_20/AFDB40.c index 6d305286e0..f7707904f7 100644 --- a/src/world/area_kkj/kkj_20/AFDB40.c +++ b/src/world/area_kkj/kkj_20/AFDB40.c @@ -3,10 +3,10 @@ static char* N(exit_str_0) = "kkj_10"; static char* N(exit_str_1) = ""; -#include "world/common/StashVars.inc.c" +#include "world/common/todo/StashVars.inc.c" -#include "world/common/GetItemName.inc.c" +#include "world/common/todo/GetItemName.inc.c" -#include "world/common/SomeItemEntityFunc.inc.c" +#include "world/common/todo/SomeItemEntityFunc.inc.c" -#include "world/common/IsItemBadge.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 index 98fb8130ff..1600db61bc 100644 --- a/src/world/area_kkj/kkj_20/AFDE00.c +++ b/src/world/area_kkj/kkj_20/AFDE00.c @@ -2,4 +2,4 @@ #include "world/common/atomic/ToadHouse.inc.c" -#include "world/common/GetPeachDisguise.inc.c" +#include "world/common/todo/GetPeachDisguise.inc.c" diff --git a/src/world/area_kkj/kkj_23/B02880.c b/src/world/area_kkj/kkj_23/B02880.c index efca13c002..93f572e13e 100644 --- a/src/world/area_kkj/kkj_23/B02880.c +++ b/src/world/area_kkj/kkj_23/B02880.c @@ -5,4 +5,4 @@ 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/SetPlayerSpriteSet2.inc.c" +#include "world/common/todo/SetPlayerSpriteSet2.inc.c" diff --git a/src/world/area_kkj/kkj_23/B028A0.c b/src/world/area_kkj/kkj_23/B028A0.c index 774eb8851c..c7c5f12ddf 100644 --- a/src/world/area_kkj/kkj_23/B028A0.c +++ b/src/world/area_kkj/kkj_23/B028A0.c @@ -28,13 +28,13 @@ ApiStatus func_80240080_B02900(Evt* script, s32 isInitialCall) { #include "world/common/atomic/UnkPhysicsFuncs.inc.c" -#include "world/common/GetPeachDisguise.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/UnkGooberFunc50.inc.c" +#include "world/common/todo/UnkGooberFunc50.inc.c" const char* kkj_23_str = "kkj_14"; diff --git a/src/world/area_kkj/kkj_25/B06A00.c b/src/world/area_kkj/kkj_25/B06A00.c index bb8105b2cc..8d62e62764 100644 --- a/src/world/area_kkj/kkj_25/B06A00.c +++ b/src/world/area_kkj/kkj_25/B06A00.c @@ -5,4 +5,4 @@ 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/SetPlayerSpriteSet2.inc.c" +#include "world/common/todo/SetPlayerSpriteSet2.inc.c" diff --git a/src/world/area_kkj/kkj_25/B06A50.c b/src/world/area_kkj/kkj_25/B06A50.c index 21206915a5..85dc199974 100644 --- a/src/world/area_kkj/kkj_25/B06A50.c +++ b/src/world/area_kkj/kkj_25/B06A50.c @@ -1,3 +1,3 @@ #include "kkj_25.h" -#include "world/common/UnkFunc1.inc.c" +#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 index 54dbfbfa61..154cb0a0e9 100644 --- a/src/world/area_kkj/kkj_25/B06A80.c +++ b/src/world/area_kkj/kkj_25/B06A80.c @@ -1,13 +1,13 @@ #include "effects.h" #include "kkj_25.h" -#include "world/common/GetFloorCollider.inc.c" +#include "world/common/todo/GetFloorCollider.inc.c" #include "common/UnkLightningFXFunc.inc.c" -#include "world/common/SetEntityPositionF.inc.c" +#include "world/common/todo/SetEntityPositionF.inc.c" -#include "world/common/GetEntityPosition.inc.c" +#include "world/common/todo/GetEntityPosition.inc.c" ApiStatus func_80240264_B06C64(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; diff --git a/src/world/area_kkj/kkj_25/B06D10.c b/src/world/area_kkj/kkj_25/B06D10.c index 5a510b7a17..03ad2d22d7 100644 --- a/src/world/area_kkj/kkj_25/B06D10.c +++ b/src/world/area_kkj/kkj_25/B06D10.c @@ -1,7 +1,7 @@ #include "kkj_25.h" #include "effects.h" -#include "world/common/UnkFoldFunc.inc.c" +#include "world/common/todo/UnkFoldFunc.inc.c" ApiStatus func_802406EC_B070EC(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; diff --git a/src/world/area_kmr/kmr_02/8B0070.c b/src/world/area_kmr/kmr_02/8B0070.c index b1ddb3b996..6e59a019cd 100644 --- a/src/world/area_kmr/kmr_02/8B0070.c +++ b/src/world/area_kmr/kmr_02/8B0070.c @@ -8,7 +8,7 @@ static char* N(exit_str_3) = ""; #define CHUCK_QUIZMO_NPC_ID 8 -#include "world/common/atomic/Pipe.inc.c" +#include "world/common/entity/Pipe.inc.c" INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_802402E0_8B0350); @@ -22,7 +22,7 @@ extern EffectInstance* N(Quizmo_VannaTEffect); #include "world/common/atomic/Quizmo.inc.c" -#include "world/common/enemy/StationaryAI.inc.c" +#include "world/common/enemy/ai/StationaryAI.inc.c" static char* N(exit_str_4) = "nok_02"; static char* N(exit_str_5) = "kmr_03"; @@ -32,9 +32,9 @@ static char* N(exit_str_6) = "\0\0\0\0"; INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_80242014_8B2084); -#include "world/common/GetNpcCollisionHeight.inc.c" +#include "world/common/todo/GetNpcCollisionHeight.inc.c" -#include "world/common/AddPlayerHandsOffset.inc.c" +#include "world/common/todo/AddPlayerHandsOffset.inc.c" INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_8024226C_8B22DC); @@ -64,7 +64,7 @@ ApiStatus func_802422F8_8B2368(Evt* script, s32 isInitialCall) { INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_80242394_8B2404); extern s32 N(LetterDelivery_SavedNpcAnim); -#include "world/common/LetterDelivery.inc.c" +#include "world/common/todo/LetterDelivery.inc.c" INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_80242710_8B2780); @@ -81,9 +81,9 @@ INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_802427EC_8B285C); INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_8024280C_8B287C); #define UNK_NPC_POS_FUNC_NUM 7 -#include "world/common/UnkNpcPosFunc.inc.c" +#include "world/common/todo/UnkNpcPosFunc.inc.c" -#include "world/common/SyncStatusMenu.inc.c" +#include "world/common/todo/SyncStatusMenu.inc.c" INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_8024295C_8B29CC); diff --git a/src/world/area_kmr/kmr_02/8B33E0.c b/src/world/area_kmr/kmr_02/8B33E0.c index 7c18ae0d54..7a2138c06f 100644 --- a/src/world/area_kmr/kmr_02/8B33E0.c +++ b/src/world/area_kmr/kmr_02/8B33E0.c @@ -2,9 +2,9 @@ INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B33E0", func_80243370_8B33E0); -#include "world/common/SetEntityPositionF.inc.c" +#include "world/common/todo/SetEntityPositionF.inc.c" -#include "world/common/GetEntityPosition.inc.c" +#include "world/common/todo/GetEntityPosition.inc.c" static char* N(exit_str_6) = "tik_01"; diff --git a/src/world/area_kmr/kmr_02/8B36B0.c b/src/world/area_kmr/kmr_02/8B36B0.c index aad07f961a..16d2dc6c6a 100644 --- a/src/world/area_kmr/kmr_02/8B36B0.c +++ b/src/world/area_kmr/kmr_02/8B36B0.c @@ -1,6 +1,6 @@ #include "kmr_02.h" -#include "world/common/CheckPartnerFlags1000.inc.c" +#include "world/common/todo/CheckPartnerFlags1000.inc.c" #ifdef NON_MATCHING ApiStatus func_8024366C_8B36DC(Evt* script, s32 isInitialCall) { @@ -23,4 +23,4 @@ ApiStatus func_8024366C_8B36DC(Evt* script, s32 isInitialCall) { INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B36B0", func_8024366C_8B36DC); #endif -#include "world/common/UnkFunc42.inc.c" +#include "world/common/todo/UnkFunc42.inc.c" diff --git a/src/world/area_kmr/kmr_03/8C7F90.c b/src/world/area_kmr/kmr_03/8C7F90.c index 4a21523972..96f2696296 100644 --- a/src/world/area_kmr/kmr_03/8C7F90.c +++ b/src/world/area_kmr/kmr_03/8C7F90.c @@ -4,7 +4,7 @@ #include "world/common/util/ChangeNpcToPartner.inc.c" -#include "world/common/CheckPartnerFlags1000.inc.c" +#include "world/common/todo/CheckPartnerFlags1000.inc.c" EntryList N(entryList) = { { -340.0f, 0.0f, 348.0f, 48.0f }, diff --git a/src/world/area_kmr/kmr_03/8C8140.c b/src/world/area_kmr/kmr_03/8C8140.c index 4a7940804e..2523b79645 100644 --- a/src/world/area_kmr/kmr_03/8C8140.c +++ b/src/world/area_kmr/kmr_03/8C8140.c @@ -13,7 +13,7 @@ ApiStatus N(func_802401B0_8C8140)(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -#include "world/common/UnkPositionFunc.inc.c" +#include "world/common/todo/UnkPositionFunc.inc.c" EvtScript N(exitWalk_802406F0) = EVT_EXIT_WALK(60, 0, "kmr_04", 0); @@ -249,7 +249,7 @@ static s32 N(pad_1468)[] = { }; EvtScript N(80241470) = { - EVT_CALL(ModifyColliderFlags, 0, 9, 0x7FFFFE00) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, 9, 0x7FFFFE00) EVT_SET(GB_StoryProgress, -117) EVT_RETURN EVT_END @@ -276,7 +276,7 @@ EvtScript N(makeEntities) = { EVT_CALL(MakeEntity, EVT_PTR(Entity_Hammer1Block), 45, 0, 70, 15, MAKE_ENTITY_END) EVT_CALL(AssignScript, EVT_PTR(N(80241470))) EVT_ELSE - EVT_CALL(ModifyColliderFlags, 0, 9, 0x7FFFFE00) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, 9, 0x7FFFFE00) EVT_END_IF EVT_IF_EQ(GF_KMR03_Hammer1Block, 0) EVT_CALL(MakeEntity, EVT_PTR(Entity_Hammer2Block), 230, 0, 310, 15, MAKE_ENTITY_END) diff --git a/src/world/area_kmr/kmr_03/8C82B0.c b/src/world/area_kmr/kmr_03/8C82B0.c index 025e772ad5..db2ff7f477 100644 --- a/src/world/area_kmr/kmr_03/8C82B0.c +++ b/src/world/area_kmr/kmr_03/8C82B0.c @@ -1,8 +1,8 @@ #include "kmr_03.h" -#include "world/common/UnsetCamera0MoveFlag1.inc.c" +#include "world/common/todo/UnsetCamera0MoveFlag1.inc.c" -#include "world/common/SetCamera0MoveFlag1.inc.c" +#include "world/common/todo/SetCamera0MoveFlag1.inc.c" ApiStatus func_80240358_8C82E8(Evt* script, s32 isInitialCall) { PlayerStatus* playerStatus = &gPlayerStatus; diff --git a/src/world/area_kmr/kmr_04/8CA900.c b/src/world/area_kmr/kmr_04/8CA900.c index 7319c5c954..3bed8ad476 100644 --- a/src/world/area_kmr/kmr_04/8CA900.c +++ b/src/world/area_kmr/kmr_04/8CA900.c @@ -3,7 +3,7 @@ static char* N(exit_str_0) = "kmr_03"; static char* N(exit_str_1) = ""; -#include "world/common/CheckPartnerFlags1000.inc.c" +#include "world/common/todo/CheckPartnerFlags1000.inc.c" ApiStatus N(func_8024002C_8CA92C)(Evt* script, s32 isInitialCall) { script->varTable[0] = get_player_data()->curHP; diff --git a/src/world/area_kmr/kmr_04/8CA960.c b/src/world/area_kmr/kmr_04/8CA960.c index 56bb23fb37..0bf17beaff 100644 --- a/src/world/area_kmr/kmr_04/8CA960.c +++ b/src/world/area_kmr/kmr_04/8CA960.c @@ -3,12 +3,12 @@ #include "common/foliage.inc.c" #define NAMESPACE dup_kmr_04 -#include "world/common/CheckPartnerFlags1000.inc.c" +#include "world/common/todo/CheckPartnerFlags1000.inc.c" #define NAMESPACE kmr_04 -#include "world/common/StashVars.inc.c" +#include "world/common/todo/StashVars.inc.c" -#include "world/common/GetItemName.inc.c" +#include "world/common/todo/GetItemName.inc.c" INCLUDE_ASM(s32, "world/area_kmr/kmr_04/8CA960", func_802403E0_8CACE0); diff --git a/src/world/area_kmr/kmr_05/8CE070.c b/src/world/area_kmr/kmr_05/8CE070.c index b481372b70..470b4e19e1 100644 --- a/src/world/area_kmr/kmr_05/8CE070.c +++ b/src/world/area_kmr/kmr_05/8CE070.c @@ -3,4 +3,4 @@ static char* N(exit_str_0) = "kmr_03"; static char* N(exit_str_1) = "kmr_02"; -#include "world/common/enemy/FlyingAI.inc.c" +#include "world/common/enemy/ai/FlyingAI.inc.c" diff --git a/src/world/area_kmr/kmr_06/8D1510.c b/src/world/area_kmr/kmr_06/8D1510.c index 11763c1e34..98c64ed89a 100644 --- a/src/world/area_kmr/kmr_06/8D1510.c +++ b/src/world/area_kmr/kmr_06/8D1510.c @@ -3,4 +3,4 @@ static char* N(exit_str_0) = "kmr_09"; static char* N(exit_str_1) = "kmr_07"; -#include "world/common/enemy/FlyingAI.inc.c" +#include "world/common/enemy/ai/FlyingAI.inc.c" diff --git a/src/world/area_kmr/kmr_07/8D3DC0.c b/src/world/area_kmr/kmr_07/8D3DC0.c index 09491c1184..e89e196a6b 100644 --- a/src/world/area_kmr/kmr_07/8D3DC0.c +++ b/src/world/area_kmr/kmr_07/8D3DC0.c @@ -3,7 +3,7 @@ static char* N(exit_str_0) = "kmr_06"; static char* N(exit_str_1) = "kmr_12"; -#include "world/common/enemy/StationaryAI.inc.c" +#include "world/common/enemy/ai/StationaryAI.inc.c" // see func_802402BC_8D878C #ifdef NON_MATCHING diff --git a/src/world/area_kmr/kmr_09/8D5E00.c b/src/world/area_kmr/kmr_09/8D5E00.c index 9b882c3dd6..04fe59cefe 100644 --- a/src/world/area_kmr/kmr_09/8D5E00.c +++ b/src/world/area_kmr/kmr_09/8D5E00.c @@ -3,7 +3,7 @@ static char* N(exit_str_0) = "kmr_02"; static char* N(exit_str_1) = "kmr_06"; -#include "world/common/enemy/FlyingAI.inc.c" +#include "world/common/enemy/ai/FlyingAI.inc.c" ApiStatus func_802414F8_8D72F8(Evt* script, s32 isInitialCall) { script->varTable[0] = get_enemy_safe(2); diff --git a/src/world/area_kmr/kmr_10/8D84D0.c b/src/world/area_kmr/kmr_10/8D84D0.c index 6f40f27204..5c3b9fb077 100644 --- a/src/world/area_kmr/kmr_10/8D84D0.c +++ b/src/world/area_kmr/kmr_10/8D84D0.c @@ -3,13 +3,13 @@ static char* N(exit_str_0) = "kmr_11"; static char* N(exit_str_1) = "mac_00"; -#include "world/common/StashVars.inc.c" +#include "world/common/todo/StashVars.inc.c" -#include "world/common/GetItemName.inc.c" +#include "world/common/todo/GetItemName.inc.c" -#include "world/common/SomeItemEntityFunc.inc.c" +#include "world/common/todo/SomeItemEntityFunc.inc.c" -#include "world/common/IsItemBadge.inc.c" +#include "world/common/todo/IsItemBadge.inc.c" #ifdef NON_EQUIVALENT // 0x1E4 is probably a linker constant. We need to learn more about animations, @@ -29,4 +29,4 @@ ApiStatus func_802402BC_8D878C(Evt* script, s32 isInitialCall) { INCLUDE_ASM(s32, "world/area_kmr/kmr_10/8D84D0", func_802402BC_8D878C); #endif -#include "world/common/SetEntityPosition.inc.c" +#include "world/common/todo/SetEntityPosition.inc.c" diff --git a/src/world/area_kmr/kmr_11/8DA3A0.c b/src/world/area_kmr/kmr_11/8DA3A0.c index 3a8fe50f47..a863eaa931 100644 --- a/src/world/area_kmr/kmr_11/8DA3A0.c +++ b/src/world/area_kmr/kmr_11/8DA3A0.c @@ -4,7 +4,7 @@ INCLUDE_ASM(s32, "world/area_kmr/kmr_11/8DA3A0", func_802402A0_8DA3A0); INCLUDE_ASM(s32, "world/area_kmr/kmr_11/8DA3A0", func_80240344_8DA444); -#include "world/common/enemy/StationaryAI.inc.c" +#include "world/common/enemy/ai/StationaryAI.inc.c" #define UNK_NPC_POS_FUNC_NUM 4 -#include "world/common/UnkNpcPosFunc.inc.c" +#include "world/common/todo/UnkNpcPosFunc.inc.c" diff --git a/src/world/area_kmr/kmr_20/8EBE50.c b/src/world/area_kmr/kmr_20/8EBE50.c index 8417d6adc6..8e6199384a 100644 --- a/src/world/area_kmr/kmr_20/8EBE50.c +++ b/src/world/area_kmr/kmr_20/8EBE50.c @@ -2,7 +2,7 @@ extern s32 D_8025B2A8; -#include "world/common/atomic/Pipe.inc.c" +#include "world/common/entity/Pipe.inc.c" ApiStatus func_80240310_8EC130(Evt* script, s32 isInitialCall) { set_map_transition_effect(4); diff --git a/src/world/area_kmr/kmr_20/8ECBF0.c b/src/world/area_kmr/kmr_20/8ECBF0.c index 59dd9bfe53..0d2d9b5262 100644 --- a/src/world/area_kmr/kmr_20/8ECBF0.c +++ b/src/world/area_kmr/kmr_20/8ECBF0.c @@ -5,4 +5,4 @@ ApiStatus func_80240DD0_8ECBF0(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -#include "world/common/UnsetCamera0MoveFlag1.inc.c" +#include "world/common/todo/UnsetCamera0MoveFlag1.inc.c" diff --git a/src/world/area_kmr/kmr_20/8ED0C0.c b/src/world/area_kmr/kmr_20/8ED0C0.c index 87d64db595..57c371ca1a 100644 --- a/src/world/area_kmr/kmr_20/8ED0C0.c +++ b/src/world/area_kmr/kmr_20/8ED0C0.c @@ -12,4 +12,4 @@ ApiStatus func_802415C4_8ED3E4(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -#include "world/common/WaitForPlayerToLand.inc.c" +#include "world/common/todo/WaitForPlayerToLand.inc.c" diff --git a/src/world/area_kmr/kmr_20/8ED440.c b/src/world/area_kmr/kmr_20/8ED440.c index 696b1d9a57..2eac51d86c 100644 --- a/src/world/area_kmr/kmr_20/8ED440.c +++ b/src/world/area_kmr/kmr_20/8ED440.c @@ -1,7 +1,7 @@ #include "kmr_20.h" -#include "world/common/StashVars.inc.c" +#include "world/common/todo/StashVars.inc.c" -#include "world/common/GetItemName.inc.c" +#include "world/common/todo/GetItemName.inc.c" INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8ED440", func_80241738_8ED558); diff --git a/src/world/area_kmr/kmr_20/8ED5A0.c b/src/world/area_kmr/kmr_20/8ED5A0.c index 0ad4e90faa..772dff7a61 100644 --- a/src/world/area_kmr/kmr_20/8ED5A0.c +++ b/src/world/area_kmr/kmr_20/8ED5A0.c @@ -1,7 +1,7 @@ #include "kmr_20.h" #define NAMESPACE dup_kmr_20 -#include "world/common/atomic/Pipe.inc.c" +#include "world/common/entity/Pipe.inc.c" #define NAMESPACE kmr_20 #define NAMESPACE dup3_kmr_20 diff --git a/src/world/area_kmr/kmr_20/8EDB70.c b/src/world/area_kmr/kmr_20/8EDB70.c index 5dbd799d95..1bbef2d269 100644 --- a/src/world/area_kmr/kmr_20/8EDB70.c +++ b/src/world/area_kmr/kmr_20/8EDB70.c @@ -1,7 +1,7 @@ #include "kmr_20.h" #define NAMESPACE dup2_kmr_20 -#include "world/common/atomic/Pipe.inc.c" +#include "world/common/entity/Pipe.inc.c" #define NAMESPACE kmr_20 ApiStatus func_80242030_8EDE50(Evt* script, s32 isInitialCall) { diff --git a/src/world/area_kpa/kpa_01/A46F60.c b/src/world/area_kpa/kpa_01/A46F60.c index 694389c51e..739f73ecce 100644 --- a/src/world/area_kpa/kpa_01/A46F60.c +++ b/src/world/area_kpa/kpa_01/A46F60.c @@ -3,4 +3,4 @@ static char* N(exit_str_0) = "kpa_14"; static char* N(exit_str_1) = "kpa_03"; -#include "world/common/atomic/DarkRoom.inc.c" +#include "world/common/atomic/CreateDarkness.inc.c" diff --git a/src/world/area_kpa/kpa_01/A470C0.c b/src/world/area_kpa/kpa_01/A470C0.c index ad1944544f..2391aaa6f0 100644 --- a/src/world/area_kpa/kpa_01/A470C0.c +++ b/src/world/area_kpa/kpa_01/A470C0.c @@ -1,5 +1,5 @@ #include "kpa_01.h" -#include "world/common/enemy/TackleAI.inc.c" +#include "world/common/enemy/ai/TackleAI.inc.c" -#include "world/common/AwaitPlayerNearNpc.inc.c" +#include "world/common/todo/AwaitPlayerNearNpc.inc.c" diff --git a/src/world/area_kpa/kpa_03/A485C0.c b/src/world/area_kpa/kpa_03/A485C0.c index 525e71232d..978918d75a 100644 --- a/src/world/area_kpa/kpa_03/A485C0.c +++ b/src/world/area_kpa/kpa_03/A485C0.c @@ -3,4 +3,4 @@ static char* N(exit_str_0) = "kpa_01"; static char* N(exit_str_1) = "kpa_04"; -#include "world/common/atomic/DarkRoom.inc.c" +#include "world/common/atomic/CreateDarkness.inc.c" diff --git a/src/world/area_kpa/kpa_03/A48720.c b/src/world/area_kpa/kpa_03/A48720.c index 5e4fe337bf..453ed60749 100644 --- a/src/world/area_kpa/kpa_03/A48720.c +++ b/src/world/area_kpa/kpa_03/A48720.c @@ -1,7 +1,7 @@ #include "kpa_03.h" -#include "world/common/enemy/TackleAI.inc.c" +#include "world/common/enemy/ai/TackleAI.inc.c" -#include "world/common/AwaitPlayerNearNpc.inc.c" +#include "world/common/todo/AwaitPlayerNearNpc.inc.c" -#include "world/common/enemy/MagikoopaAI.inc.c" +#include "world/common/enemy/ai/MagikoopaAI.inc.c" diff --git a/src/world/area_kpa/kpa_04/A4BF60.c b/src/world/area_kpa/kpa_04/A4BF60.c index 07d41c6011..4f44dc71c7 100644 --- a/src/world/area_kpa/kpa_04/A4BF60.c +++ b/src/world/area_kpa/kpa_04/A4BF60.c @@ -3,7 +3,7 @@ static char* N(exit_str_0) = "kpa_03"; static char* N(exit_str_1) = "kpa_81"; -#include "world/common/UnkFunc11.inc.c" +#include "world/common/todo/UnkFunc11.inc.c" ApiStatus func_802400BC_A4C01C(Evt* script, s32 isInitialCall) { PlayerStatus* playerStatus = &gPlayerStatus; diff --git a/src/world/area_kpa/kpa_08/A4CA20.c b/src/world/area_kpa/kpa_08/A4CA20.c index ded7bb0712..45d94b49f2 100644 --- a/src/world/area_kpa/kpa_08/A4CA20.c +++ b/src/world/area_kpa/kpa_08/A4CA20.c @@ -3,7 +3,7 @@ static char* N(exit_str_0) = "kpa_52"; static char* N(exit_str_1) = "kpa_100"; -#include "world/common/UnsetCamera0MoveFlag1.inc.c" +#include "world/common/todo/UnsetCamera0MoveFlag1.inc.c" ApiStatus func_8024001C_A4CA3C(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; diff --git a/src/world/area_kpa/kpa_08/A4CAC0.c b/src/world/area_kpa/kpa_08/A4CAC0.c index 2bdc6affdc..0d59f4b100 100644 --- a/src/world/area_kpa/kpa_08/A4CAC0.c +++ b/src/world/area_kpa/kpa_08/A4CAC0.c @@ -1,3 +1,3 @@ #include "kpa_08.h" -#include "world/common/enemy/MagikoopaAI.inc.c" +#include "world/common/enemy/ai/MagikoopaAI.inc.c" diff --git a/src/world/area_kpa/kpa_09/A4F000.c b/src/world/area_kpa/kpa_09/A4F000.c index 6a064610c0..f618d7e764 100644 --- a/src/world/area_kpa/kpa_09/A4F000.c +++ b/src/world/area_kpa/kpa_09/A4F000.c @@ -3,7 +3,7 @@ static char* N(exit_str_0) = "kpa_101"; static char* N(exit_str_1) = "kpa_33"; -#include "world/common/UnsetCamera0MoveFlag1.inc.c" +#include "world/common/todo/UnsetCamera0MoveFlag1.inc.c" ApiStatus func_8024001C_A4F01C(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; diff --git a/src/world/area_kpa/kpa_09/A4F0A0.c b/src/world/area_kpa/kpa_09/A4F0A0.c index 9a6f6d06ff..b07d1b50ed 100644 --- a/src/world/area_kpa/kpa_09/A4F0A0.c +++ b/src/world/area_kpa/kpa_09/A4F0A0.c @@ -1,5 +1,5 @@ #include "kpa_09.h" -#include "world/common/enemy/RangedAttackAI.inc.c" +#include "world/common/enemy/ai/RangedAttackAI.inc.c" -#include "world/common/GetEncounterEnemyIsOwner.inc.c" +#include "world/common/todo/GetEncounterEnemyIsOwner.inc.c" diff --git a/src/world/area_kpa/kpa_102/A93A50.c b/src/world/area_kpa/kpa_102/A93A50.c index a30be4e593..2c85ea702c 100644 --- a/src/world/area_kpa/kpa_102/A93A50.c +++ b/src/world/area_kpa/kpa_102/A93A50.c @@ -1,9 +1,9 @@ #include "kpa_102.h" -#include "world/common/enemy/RangedAttackAI.inc.c" +#include "world/common/enemy/ai/RangedAttackAI.inc.c" -#include "world/common/GetEncounterEnemyIsOwner.inc.c" +#include "world/common/todo/GetEncounterEnemyIsOwner.inc.c" -#include "world/common/enemy/TackleAI.inc.c" +#include "world/common/enemy/ai/TackleAI.inc.c" -#include "world/common/enemy/FlyingMagikoopaAI.inc.c" +#include "world/common/enemy/ai/FlyingMagikoopaAI.inc.c" diff --git a/src/world/area_kpa/kpa_11/A52BD0.c b/src/world/area_kpa/kpa_11/A52BD0.c index 47fef12a40..d28a486805 100644 --- a/src/world/area_kpa/kpa_11/A52BD0.c +++ b/src/world/area_kpa/kpa_11/A52BD0.c @@ -1,3 +1,3 @@ #include "kpa_11.h" -#include "world/common/enemy/TackleAI.inc.c" +#include "world/common/enemy/ai/TackleAI.inc.c" diff --git a/src/world/area_kpa/kpa_111/A99590.c b/src/world/area_kpa/kpa_111/A99590.c index d8728cae43..d2ded0f06c 100644 --- a/src/world/area_kpa/kpa_111/A99590.c +++ b/src/world/area_kpa/kpa_111/A99590.c @@ -3,10 +3,10 @@ static char* N(exit_str_0) = "kpa_130"; static char* N(exit_str_1) = "kpa_112"; -#include "world/common/UnkFunc11.inc.c" +#include "world/common/todo/UnkFunc11.inc.c" -#include "world/common/UnkFunc12.inc.c" +#include "world/common/todo/UnkFunc12.inc.c" -#include "world/common/enemy/RangedAttackAI.inc.c" +#include "world/common/enemy/ai/RangedAttackAI.inc.c" -#include "world/common/GetEncounterEnemyIsOwner.inc.c" +#include "world/common/todo/GetEncounterEnemyIsOwner.inc.c" diff --git a/src/world/area_kpa/kpa_113/A9CC30.c b/src/world/area_kpa/kpa_113/A9CC30.c index 59ed9c2999..6c0d7211ff 100644 --- a/src/world/area_kpa/kpa_113/A9CC30.c +++ b/src/world/area_kpa/kpa_113/A9CC30.c @@ -5,4 +5,4 @@ static char* N(exit_str_1) = "kpa_114"; static char* N(exit_str_2) = "kpa_82"; static char* N(exit_str_3) = ""; -#include "world/common/RemovePadlock.inc.c" +#include "world/common/todo/RemovePadlock.inc.c" diff --git a/src/world/area_kpa/kpa_113/A9CC70.c b/src/world/area_kpa/kpa_113/A9CC70.c index 47920f2db9..0bdb1f9e0b 100644 --- a/src/world/area_kpa/kpa_113/A9CC70.c +++ b/src/world/area_kpa/kpa_113/A9CC70.c @@ -1,9 +1,9 @@ #include "kpa_113.h" -#include "world/common/UnkFunc11.inc.c" +#include "world/common/todo/UnkFunc11.inc.c" -#include "world/common/UnkFunc12.inc.c" +#include "world/common/todo/UnkFunc12.inc.c" -#include "world/common/enemy/TackleAI.inc.c" +#include "world/common/enemy/ai/TackleAI.inc.c" -#include "world/common/AwaitPlayerNearNpc.inc.c" +#include "world/common/todo/AwaitPlayerNearNpc.inc.c" diff --git a/src/world/area_kpa/kpa_115/A9ED40.c b/src/world/area_kpa/kpa_115/A9ED40.c index 9915f76481..09a29d1ace 100644 --- a/src/world/area_kpa/kpa_115/A9ED40.c +++ b/src/world/area_kpa/kpa_115/A9ED40.c @@ -5,10 +5,10 @@ static char* N(exit_str_1) = "kpa_116"; static char* N(exit_str_2) = "kpa_118"; static char* N(exit_str_3) = ""; -#include "world/common/UnkFunc11.inc.c" +#include "world/common/todo/UnkFunc11.inc.c" -#include "world/common/UnkFunc12.inc.c" +#include "world/common/todo/UnkFunc12.inc.c" -#include "world/common/enemy/RangedAttackAI.inc.c" +#include "world/common/enemy/ai/RangedAttackAI.inc.c" -#include "world/common/GetEncounterEnemyIsOwner.inc.c" +#include "world/common/todo/GetEncounterEnemyIsOwner.inc.c" diff --git a/src/world/area_kpa/kpa_130/AA2D20.c b/src/world/area_kpa/kpa_130/AA2D20.c index be05854da6..464ad73ae5 100644 --- a/src/world/area_kpa/kpa_130/AA2D20.c +++ b/src/world/area_kpa/kpa_130/AA2D20.c @@ -3,4 +3,4 @@ static char* N(exit_str_0) = "kpa_134"; static char* N(exit_str_1) = "kpa_111"; -#include "world/common/enemy/BulletBillAI.inc.c" +#include "world/common/enemy/ai/BulletBillAI.inc.c" diff --git a/src/world/area_kpa/kpa_134/AA94B0.c b/src/world/area_kpa/kpa_134/AA94B0.c index 074055b88f..c03fb2637f 100644 --- a/src/world/area_kpa/kpa_134/AA94B0.c +++ b/src/world/area_kpa/kpa_134/AA94B0.c @@ -9,8 +9,8 @@ ApiStatus func_80240510_AA94B0(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -#include "world/common/SetEntityPosition.inc.c" +#include "world/common/todo/SetEntityPosition.inc.c" -#include "world/common/RemovePadlock.inc.c" +#include "world/common/todo/RemovePadlock.inc.c" -#include "world/common/GetEntityPosition.inc.c" +#include "world/common/todo/GetEntityPosition.inc.c" diff --git a/src/world/area_kpa/kpa_14/A57830.c b/src/world/area_kpa/kpa_14/A57830.c index 55723b275b..a6215417a3 100644 --- a/src/world/area_kpa/kpa_14/A57830.c +++ b/src/world/area_kpa/kpa_14/A57830.c @@ -1,16 +1,16 @@ #include "kpa_14.h" -#include "world/common/StashVars.inc.c" +#include "world/common/todo/StashVars.inc.c" -#include "world/common/GetItemName.inc.c" +#include "world/common/todo/GetItemName.inc.c" -#include "world/common/SomeItemEntityFunc.inc.c" +#include "world/common/todo/SomeItemEntityFunc.inc.c" -#include "world/common/IsItemBadge.inc.c" +#include "world/common/todo/IsItemBadge.inc.c" -#include "world/common/RemovePadlock.inc.c" +#include "world/common/todo/RemovePadlock.inc.c" -#include "world/common/GetEntityPosition.inc.c" +#include "world/common/todo/GetEntityPosition.inc.c" ApiStatus N(func_80240710_A57BC0)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; diff --git a/src/world/area_kpa/kpa_15/A596A0.c b/src/world/area_kpa/kpa_15/A596A0.c index 1035bbee14..5268e40e9d 100644 --- a/src/world/area_kpa/kpa_15/A596A0.c +++ b/src/world/area_kpa/kpa_15/A596A0.c @@ -1,9 +1,9 @@ #include "kpa_15.h" -#include "world/common/StashVars.inc.c" +#include "world/common/todo/StashVars.inc.c" -#include "world/common/GetItemName.inc.c" +#include "world/common/todo/GetItemName.inc.c" -#include "world/common/SomeItemEntityFunc.inc.c" +#include "world/common/todo/SomeItemEntityFunc.inc.c" -#include "world/common/IsItemBadge.inc.c" +#include "world/common/todo/IsItemBadge.inc.c" diff --git a/src/world/area_kpa/kpa_16/A5A340.c b/src/world/area_kpa/kpa_16/A5A340.c index 94e0902c08..347be49545 100644 --- a/src/world/area_kpa/kpa_16/A5A340.c +++ b/src/world/area_kpa/kpa_16/A5A340.c @@ -13,4 +13,4 @@ ApiStatus func_8024034C_A5A37C(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -#include "world/common/GetFloorCollider.inc.c" +#include "world/common/todo/GetFloorCollider.inc.c" diff --git a/src/world/area_kpa/kpa_50/A609D0.c b/src/world/area_kpa/kpa_50/A609D0.c index 9bf2f2b5af..acb9ab13f6 100644 --- a/src/world/area_kpa/kpa_50/A609D0.c +++ b/src/world/area_kpa/kpa_50/A609D0.c @@ -3,8 +3,8 @@ static char* N(exit_str_0) = "kpa_70"; static char* N(exit_str_1) = "kpa_81"; -#include "world/common/enemy/RangedAttackAI.inc.c" +#include "world/common/enemy/ai/RangedAttackAI.inc.c" -#include "world/common/GetEncounterEnemyIsOwner.inc.c" +#include "world/common/todo/GetEncounterEnemyIsOwner.inc.c" -#include "world/common/enemy/TackleAI.inc.c" +#include "world/common/enemy/ai/TackleAI.inc.c" diff --git a/src/world/area_kpa/kpa_51/A640E0.c b/src/world/area_kpa/kpa_51/A640E0.c index 23ae6f4600..dc9208c78a 100644 --- a/src/world/area_kpa/kpa_51/A640E0.c +++ b/src/world/area_kpa/kpa_51/A640E0.c @@ -1,5 +1,5 @@ #include "kpa_51.h" -#include "world/common/enemy/MagikoopaAI.inc.c" +#include "world/common/enemy/ai/MagikoopaAI.inc.c" -#include "world/common/enemy/TackleAI.inc.c" +#include "world/common/enemy/ai/TackleAI.inc.c" diff --git a/src/world/area_kpa/kpa_52/A67100.c b/src/world/area_kpa/kpa_52/A67100.c index 17d64919f6..3bf9f0810d 100644 --- a/src/world/area_kpa/kpa_52/A67100.c +++ b/src/world/area_kpa/kpa_52/A67100.c @@ -5,6 +5,6 @@ static char* N(exit_str_1) = "kpa_40"; static char* N(exit_str_2) = "kpa_08"; static char* N(exit_str_3) = ""; -#include "world/common/RemovePadlock.inc.c" +#include "world/common/todo/RemovePadlock.inc.c" -#include "world/common/GetEntityPosition.inc.c" +#include "world/common/todo/GetEntityPosition.inc.c" diff --git a/src/world/area_kpa/kpa_52/A671E0.c b/src/world/area_kpa/kpa_52/A671E0.c index 7b59796b76..ebe6bfcb86 100644 --- a/src/world/area_kpa/kpa_52/A671E0.c +++ b/src/world/area_kpa/kpa_52/A671E0.c @@ -1,5 +1,5 @@ #include "kpa_52.h" -#include "world/common/enemy/RangedAttackAI.inc.c" +#include "world/common/enemy/ai/RangedAttackAI.inc.c" -#include "world/common/GetEncounterEnemyIsOwner.inc.c" +#include "world/common/todo/GetEncounterEnemyIsOwner.inc.c" diff --git a/src/world/area_kpa/kpa_60/A6CB00.c b/src/world/area_kpa/kpa_60/A6CB00.c index 095a5054ec..c8df58c0a7 100644 --- a/src/world/area_kpa/kpa_60/A6CB00.c +++ b/src/world/area_kpa/kpa_60/A6CB00.c @@ -9,6 +9,6 @@ static char* N(exit_str_5) = "kmr_22"; static char* N(exit_str_6) = "hos_20"; static char* N(exit_str_7) = ""; -#include "world/common/RemovePadlock.inc.c" +#include "world/common/todo/RemovePadlock.inc.c" -#include "world/common/GetEntityPosition.inc.c" +#include "world/common/todo/GetEntityPosition.inc.c" diff --git a/src/world/area_kpa/kpa_61/A6E6F0.c b/src/world/area_kpa/kpa_61/A6E6F0.c index 7d3acac941..c101c71cd4 100644 --- a/src/world/area_kpa/kpa_61/A6E6F0.c +++ b/src/world/area_kpa/kpa_61/A6E6F0.c @@ -1,5 +1,5 @@ #include "kpa_61.h" -#include "world/common/enemy/TackleAI.inc.c" +#include "world/common/enemy/ai/TackleAI.inc.c" -#include "world/common/enemy/FlyingMagikoopaAI.inc.c" +#include "world/common/enemy/ai/FlyingMagikoopaAI.inc.c" diff --git a/src/world/area_kpa/kpa_62/A72220.c b/src/world/area_kpa/kpa_62/A72220.c index 633e7e31e0..9fad1ecd8c 100644 --- a/src/world/area_kpa/kpa_62/A72220.c +++ b/src/world/area_kpa/kpa_62/A72220.c @@ -5,6 +5,6 @@ static char* N(exit_str_1) = "kpa_10"; static char* N(exit_str_2) = "kpa_11"; static char* N(exit_str_3) = "kpa_63"; -#include "world/common/RemovePadlock.inc.c" +#include "world/common/todo/RemovePadlock.inc.c" -#include "world/common/GetEntityPosition.inc.c" +#include "world/common/todo/GetEntityPosition.inc.c" diff --git a/src/world/area_kpa/kpa_70/A74B80.c b/src/world/area_kpa/kpa_70/A74B80.c index d93972a923..832d06afec 100644 --- a/src/world/area_kpa/kpa_70/A74B80.c +++ b/src/world/area_kpa/kpa_70/A74B80.c @@ -1,3 +1,3 @@ #include "kpa_70.h" -#include "world/common/enemy/TackleAI.inc.c" +#include "world/common/enemy/ai/TackleAI.inc.c" diff --git a/src/world/area_kpa/kpa_81/A78510.c b/src/world/area_kpa/kpa_81/A78510.c index fdec228855..44686bcb71 100644 --- a/src/world/area_kpa/kpa_81/A78510.c +++ b/src/world/area_kpa/kpa_81/A78510.c @@ -1,8 +1,8 @@ #include "kpa_81.h" -#include "world/common/GetNpcCollisionHeight.inc.c" +#include "world/common/todo/GetNpcCollisionHeight.inc.c" -#include "world/common/AddPlayerHandsOffset.inc.c" +#include "world/common/todo/AddPlayerHandsOffset.inc.c" extern s32 D_80240D98_A79258; extern s32 D_80240D9C_A7925C; diff --git a/src/world/area_kpa/kpa_82/A7A550.c b/src/world/area_kpa/kpa_82/A7A550.c index c668ed4f6a..56a37a7fc7 100644 --- a/src/world/area_kpa/kpa_82/A7A550.c +++ b/src/world/area_kpa/kpa_82/A7A550.c @@ -1,8 +1,8 @@ #include "kpa_82.h" -#include "world/common/GetNpcCollisionHeight.inc.c" +#include "world/common/todo/GetNpcCollisionHeight.inc.c" -#include "world/common/AddPlayerHandsOffset.inc.c" +#include "world/common/todo/AddPlayerHandsOffset.inc.c" INCLUDE_ASM(s32, "world/area_kpa/kpa_82/A7A550", func_8024027C_A7A77C); diff --git a/src/world/area_kpa/kpa_91/A86A50.c b/src/world/area_kpa/kpa_91/A86A50.c index fe57dfc06f..57ed38b7be 100644 --- a/src/world/area_kpa/kpa_91/A86A50.c +++ b/src/world/area_kpa/kpa_91/A86A50.c @@ -3,6 +3,6 @@ static char* N(exit_str_0) = "kpa_90"; static char* N(exit_str_1) = ""; -#include "world/common/enemy/KoopaPatrolAI.inc.c" +#include "world/common/enemy/ai/KoopaPatrolAI.inc.c" #include "world/common/atomic/ToadHouse.inc.c" diff --git a/src/world/area_kpa/kpa_91/A88280.c b/src/world/area_kpa/kpa_91/A88280.c index 95957b09fa..a8422011e1 100644 --- a/src/world/area_kpa/kpa_91/A88280.c +++ b/src/world/area_kpa/kpa_91/A88280.c @@ -1,5 +1,5 @@ #include "kpa_91.h" -#include "world/common/RemovePadlock.inc.c" +#include "world/common/todo/RemovePadlock.inc.c" -#include "world/common/GetEntityPosition.inc.c" +#include "world/common/todo/GetEntityPosition.inc.c" diff --git a/src/world/area_kpa/kpa_95/A8CA80.c b/src/world/area_kpa/kpa_95/A8CA80.c index b08b0da941..5453362a57 100644 --- a/src/world/area_kpa/kpa_95/A8CA80.c +++ b/src/world/area_kpa/kpa_95/A8CA80.c @@ -3,6 +3,6 @@ static char* N(exit_str_0) = "kpa_94"; static char* N(exit_str_1) = ""; -#include "world/common/RemovePadlock.inc.c" +#include "world/common/todo/RemovePadlock.inc.c" -#include "world/common/GetEntityPosition.inc.c" +#include "world/common/todo/GetEntityPosition.inc.c" diff --git a/src/world/area_kpa/kpa_95/A8CB60.c b/src/world/area_kpa/kpa_95/A8CB60.c index e4869c6061..ff0d6e7c03 100644 --- a/src/world/area_kpa/kpa_95/A8CB60.c +++ b/src/world/area_kpa/kpa_95/A8CB60.c @@ -1,5 +1,5 @@ #include "kpa_95.h" -#include "world/common/enemy/KoopaPatrolAI.inc.c" +#include "world/common/enemy/ai/KoopaPatrolAI.inc.c" #include "world/common/atomic/ToadHouse.inc.c" 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 f6894eeced..d5064f09a3 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 @@ -3,9 +3,6 @@ extern EvtScript N(EVS_KoloradoSinkingPlatform); -API_CALLABLE(N(AwaitLetterChoiceResult)); -API_CALLABLE(N(SetLetterChoiceResult)); - #include "world/common/enemy/complete/LavaBubble.inc.c" NpcSettings N(NpSettings_Kolorado) = { @@ -36,7 +33,7 @@ EvtScript N(EVS_Kolorado_LetterReward) = { EVT_IF_EQ(LVarC, 2) EVT_SET(LVar0, ITEM_STAR_PIECE) EVT_SET(LVar1, 3) - EVT_EXEC_WAIT(N(Delivery_ShowGotStarPiece)) + EVT_EXEC_WAIT(N(GiveKeyReward)) EVT_CALL(AddStarPieces, 1) EVT_END_IF EVT_RETURN 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 31a6e367c4..32b0ef6987 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 @@ -38,7 +38,7 @@ EvtScript N(EVS_Kolorado_LetterReward) = { EVT_IF_EQ(LVarC, 2) EVT_SET(LVar0, ITEM_STAR_PIECE) EVT_SET(LVar1, 3) - EVT_EXEC_WAIT(N(Delivery_ShowGotStarPiece)) + EVT_EXEC_WAIT(N(GiveKeyReward)) EVT_CALL(AddStarPieces, 1) EVT_END_IF EVT_RETURN diff --git a/src/world/area_kzn/kzn_03/kzn_03_3_entity.c b/src/world/area_kzn/kzn_03/kzn_03_3_entity.c index e109de10af..8b0af03784 100644 --- a/src/world/area_kzn/kzn_03/kzn_03_3_entity.c +++ b/src/world/area_kzn/kzn_03/kzn_03_3_entity.c @@ -1,8 +1,8 @@ #include "kzn_03.h" #include "entity.h" -#include "world/common/UnsetCamera0MoveFlag1.inc.c" -#include "world/common/SetCamera0MoveFlag1.inc.c" +#include "world/common/todo/UnsetCamera0MoveFlag1.inc.c" +#include "world/common/todo/SetCamera0MoveFlag1.inc.c" API_CALLABLE(N(IsPlayerOnFirstCliff)) { s32 result = -1; diff --git a/src/world/area_kzn/kzn_04/kzn_04_2_entity.c b/src/world/area_kzn/kzn_04/kzn_04_2_entity.c index 6ecbd8a13c..8dc8157be2 100644 --- a/src/world/area_kzn/kzn_04/kzn_04_2_entity.c +++ b/src/world/area_kzn/kzn_04/kzn_04_2_entity.c @@ -3,8 +3,8 @@ #define SUPER_BLOCK_MAPVAR MV_SuperBlock #define SUPER_BLOCK_GAMEFLAG GF_KZN04_SuperBlock -#include "world/common/atomic/SuperBlock.inc.c" -#include "world/common/atomic/SuperBlock.data.inc.c" +#include "world/common/entity/SuperBlock.inc.c" +#include "world/common/entity/SuperBlock.data.inc.c" EvtScript N(EVS_MakeEntities) = { EVT_MAKE_SUPER_BLOCK(530, 560, 25, 0) 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 cceec3bdf7..abed10a6cd 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 @@ -1,7 +1,7 @@ #include "kzn_04.h" #include "effects.h" -#include "world/common/enemy/FireBarAI.inc.c" +#include "world/common/enemy/ai/FireBarAI.inc.c" s32 N(FireBar_Sounds)[] = { SOUND_FIRE_BAR_0, SOUND_FIRE_BAR_1, SOUND_FIRE_BAR_2, SOUND_FIRE_BAR_3, diff --git a/src/world/area_kzn/kzn_06/kzn_06_3_extra.c b/src/world/area_kzn/kzn_06/kzn_06_3_extra.c index f628df75ff..aca5dc927e 100644 --- a/src/world/area_kzn/kzn_06/kzn_06_3_extra.c +++ b/src/world/area_kzn/kzn_06/kzn_06_3_extra.c @@ -128,7 +128,7 @@ EvtScript N(EVS_LowerMainLavaLevel) = { EVT_END_IF EVT_WAIT(45) EVT_CALL(ResetCam, CAM_DEFAULT, EVT_FLOAT(90.0)) - EVT_CALL(ModifyColliderFlags, 0, COLLIDER_yougan1, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_yougan1, COLLIDER_FLAGS_UPPER_MASK) EVT_CALL(ModifyColliderFlags, 1, COLLIDER_yougan, COLLIDER_FLAGS_UPPER_MASK) EVT_CALL(EnableGroup, MODEL_i_on, FALSE) EVT_CALL(EnableGroup, MODEL_i_off, TRUE) @@ -172,7 +172,7 @@ EvtScript N(EVS_SetupLavaPuzzle) = { EVT_EXEC(N(EVS_MonitorPushBlockPuzzle)) EVT_SETF(MV_GlowIntensity, EVT_FLOAT(1.0)) EVT_ELSE - EVT_CALL(ModifyColliderFlags, 0, COLLIDER_yougan1, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_yougan1, COLLIDER_FLAGS_UPPER_MASK) EVT_CALL(EnableGroup, MODEL_i_on, FALSE) EVT_CALL(TranslateGroup, MODEL_you, 0, -14, -2) EVT_CALL(TranslateModel, MODEL_yougan, 0, -25, -50) diff --git a/src/world/area_kzn/kzn_08/kzn_08_2_entity.c b/src/world/area_kzn/kzn_08/kzn_08_2_entity.c index f1833d06b3..41588304cd 100644 --- a/src/world/area_kzn/kzn_08/kzn_08_2_entity.c +++ b/src/world/area_kzn/kzn_08/kzn_08_2_entity.c @@ -3,13 +3,13 @@ s32** N(varStash) = NULL; -#include "world/common/StashVars.inc.c" +#include "world/common/todo/StashVars.inc.c" -#include "world/common/GetItemName.inc.c" +#include "world/common/todo/GetItemName.inc.c" -#include "world/common/SomeItemEntityFunc.inc.c" +#include "world/common/todo/SomeItemEntityFunc.inc.c" -#include "world/common/IsItemBadge.inc.c" +#include "world/common/todo/IsItemBadge.inc.c" EvtScript N(D_80244BB4_C76034) = { EVT_SET_GROUP(EVT_GROUP_00) diff --git a/src/world/area_kzn/kzn_09/kzn_09_2_entity.c b/src/world/area_kzn/kzn_09/kzn_09_2_entity.c index e641f3cc20..122dddfdb5 100644 --- a/src/world/area_kzn/kzn_09/kzn_09_2_entity.c +++ b/src/world/area_kzn/kzn_09/kzn_09_2_entity.c @@ -3,8 +3,8 @@ #define SUPER_BLOCK_MAPVAR MV_SuperBlock #define SUPER_BLOCK_GAMEFLAG GF_KZN09_SuperBlock -#include "world/common/atomic/SuperBlock.inc.c" -#include "world/common/atomic/SuperBlock.data.inc.c" +#include "world/common/entity/SuperBlock.inc.c" +#include "world/common/entity/SuperBlock.data.inc.c" EvtScript N(EVS_MakeEntities) = { EVT_MAKE_SUPER_BLOCK(130, 480, -75, 0) 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 208ef2b053..2102331ff4 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 @@ -37,7 +37,7 @@ EvtScript N(D_80245BB4_C7C894) = { EVT_IF_EQ(LVarC, 2) EVT_SET(LVar0, ITEM_STAR_PIECE) EVT_SET(LVar1, 3) - EVT_EXEC_WAIT(N(Delivery_ShowGotStarPiece)) + EVT_EXEC_WAIT(N(GiveKeyReward)) EVT_CALL(AddStarPieces, 1) EVT_END_IF EVT_RETURN diff --git a/src/world/area_kzn/kzn_11/kzn_11_1_main.c b/src/world/area_kzn/kzn_11/kzn_11_1_main.c index 37eaeedd94..a0c45efcbc 100644 --- a/src/world/area_kzn/kzn_11/kzn_11_1_main.c +++ b/src/world/area_kzn/kzn_11/kzn_11_1_main.c @@ -31,7 +31,7 @@ EvtScript N(EVS_BindExitTriggers) = { EvtScript N(EVS_StartTexPanners_Lava) = { EVT_SET_GROUP(EVT_GROUP_00) - EVT_CALL(SetTexPanner, MODEL_yougan1_1, 2) + EVT_CALL(SetTexPanner, MODEL_yougan1_1, TEX_PANNER_2) EVT_CALL(EnableTexPanning, MODEL_toro, TRUE) EVT_CALL(EnableTexPanning, MODEL_poko, TRUE) EVT_THREAD 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 745fe57a3d..10cf41ff7c 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 @@ -2,7 +2,7 @@ #include "world/common/enemy/complete/LavaBubble.inc.c" -#include "world/common/enemy/FireBarAI.inc.c" +#include "world/common/enemy/ai/FireBarAI.inc.c" s32 N(FireBar_Sounds)[] = { SOUND_FIRE_BAR_0, SOUND_FIRE_BAR_1, SOUND_FIRE_BAR_2, SOUND_FIRE_BAR_3, 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 902738fafa..91d2a19ced 100644 --- a/src/world/area_kzn/kzn_17/kzn_17_3_npc.c +++ b/src/world/area_kzn/kzn_17/kzn_17_3_npc.c @@ -42,7 +42,7 @@ EvtScript N(EVS_Kolorado_LetterReward) = { EVT_IF_EQ(LVarC, 2) EVT_SET(LVar0, ITEM_STAR_PIECE) EVT_SET(LVar1, 3) - EVT_EXEC_WAIT(N(Delivery_ShowGotStarPiece)) + EVT_EXEC_WAIT(N(GiveKeyReward)) EVT_CALL(AddStarPieces, 1) EVT_END_IF EVT_RETURN diff --git a/src/world/area_kzn/kzn_17/kzn_17_4_extra.c b/src/world/area_kzn/kzn_17/kzn_17_4_extra.c index 16f029186a..3b5a052aff 100644 --- a/src/world/area_kzn/kzn_17/kzn_17_4_extra.c +++ b/src/world/area_kzn/kzn_17/kzn_17_4_extra.c @@ -54,7 +54,7 @@ EvtScript N(EVS_SetupSpinyTromp) = { EVT_CALL(SetGroupEnabled, MODEL_goron, 0) EVT_CALL(EnableModel, MODEL_me, FALSE) EVT_CALL(EnableModel, MODEL_mae, FALSE) - EVT_CALL(ModifyColliderFlags, 0, COLLIDER_gogo, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_gogo, COLLIDER_FLAGS_UPPER_MASK) EVT_RETURN EVT_END_IF EVT_CALL(EnableModel, MODEL_ato, FALSE) @@ -116,7 +116,7 @@ EvtScript N(EVS_SetupSpinyTromp) = { EVT_IF_EQ(AF_KZN_Tromp2_ShakingDone, FALSE) EVT_IF_GT(LVar0, 630) EVT_KILL_THREAD(MV_ScreenShakeTID) - EVT_CALL(ModifyColliderFlags, 0, COLLIDER_gogo, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_gogo, COLLIDER_FLAGS_UPPER_MASK) EVT_CALL(PlaySoundAtCollider, COLLIDER_gogo, SOUND_1E4, 0) EVT_PLAY_EFFECT(EFFECT_BOMBETTE_BREAKING, 2, 32, 32, 1, 10, 45) EVT_CALL(EnableModel, MODEL_mae, FALSE) diff --git a/src/world/area_kzn/kzn_18/kzn_18_1_main.c b/src/world/area_kzn/kzn_18/kzn_18_1_main.c index 5a04126ac9..426d7c16b0 100644 --- a/src/world/area_kzn/kzn_18/kzn_18_1_main.c +++ b/src/world/area_kzn/kzn_18/kzn_18_1_main.c @@ -83,9 +83,9 @@ EvtScript N(EVS_Main) = { EVT_CALL(EnableModel, MODEL_o506, FALSE) EVT_CALL(EnableModel, MODEL_o509, FALSE) EVT_CALL(EnableModel, MODEL_o511, FALSE) - EVT_CALL(ModifyColliderFlags, 0, COLLIDER_off1, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_off1, COLLIDER_FLAGS_UPPER_MASK) EVT_ELSE - EVT_CALL(ModifyColliderFlags, 0, COLLIDER_off2, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_off2, COLLIDER_FLAGS_UPPER_MASK) EVT_END_IF EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_SURFACE, COLLIDER_off1, SURFACE_TYPE_LAVA) EVT_THREAD diff --git a/src/world/area_kzn/kzn_18/kzn_18_2_extra.c b/src/world/area_kzn/kzn_18/kzn_18_2_extra.c index f4d218e71b..e400be9a7c 100644 --- a/src/world/area_kzn/kzn_18/kzn_18_2_extra.c +++ b/src/world/area_kzn/kzn_18/kzn_18_2_extra.c @@ -1,11 +1,11 @@ #include "kzn_18.h" #include "entity.h" -#include "world/common/SetCamera0Flag1000.inc.c" +#include "world/common/todo/SetCamera0Flag1000.inc.c" -#include "world/common/UnsetCamera0Flag1000.inc.c" +#include "world/common/todo/UnsetCamera0Flag1000.inc.c" -#include "world/common/GetFloorCollider.inc.c" +#include "world/common/todo/GetFloorCollider.inc.c" NpcSettings N(NpcSettings_Kolorado) = { .height = 40, diff --git a/src/world/area_kzn/kzn_19/kzn_19_1_main.c b/src/world/area_kzn/kzn_19/kzn_19_1_main.c index 10aa3263a8..72ff492b48 100644 --- a/src/world/area_kzn/kzn_19/kzn_19_1_main.c +++ b/src/world/area_kzn/kzn_19/kzn_19_1_main.c @@ -9,7 +9,7 @@ extern NpcGroupList N(EscapeNPCs); #include "world/common/atomic/kzn_SmokeTexPanners.inc.c" -#include "world/common/StarSpiritEffectFunc.inc.c" +#include "world/common/todo/StarSpiritEffectFunc.inc.c" EvtScript N(EVS_TryingSpawningStarCard) = { // determine if card should be spawned @@ -111,10 +111,10 @@ EvtScript N(EVS_BindExitTriggers) = { EvtScript N(EVS_StartTexPanners_Lava) = { EVT_SET_GROUP(EVT_GROUP_00) - EVT_CALL(SetTexPanner, MODEL_yougan1_1, 2) + EVT_CALL(SetTexPanner, MODEL_yougan1_1, TEX_PANNER_2) EVT_CALL(EnableTexPanning, MODEL_toro, TRUE) EVT_CALL(EnableTexPanning, MODEL_poko, TRUE) - EVT_CALL(SetTexPanner, MODEL_poko1, 14) + EVT_CALL(SetTexPanner, MODEL_poko1, TEX_PANNER_E) EVT_THREAD TEX_PAN_PARAMS_ID(TEX_PANNER_2) TEX_PAN_PARAMS_STEP( 200, 0, 400, -100) diff --git a/src/world/area_kzn/kzn_19/kzn_19_3_npc.c b/src/world/area_kzn/kzn_19/kzn_19_3_npc.c index 32a632fadc..30096ca52c 100644 --- a/src/world/area_kzn/kzn_19/kzn_19_3_npc.c +++ b/src/world/area_kzn/kzn_19/kzn_19_3_npc.c @@ -363,7 +363,7 @@ EvtScript N(EVS_Kolorado_LetterReward) = { EVT_IF_EQ(LVarC, 2) EVT_SET(LVar0, ITEM_STAR_PIECE) EVT_SET(LVar1, 3) - EVT_EXEC_WAIT(N(Delivery_ShowGotStarPiece)) + EVT_EXEC_WAIT(N(GiveKeyReward)) EVT_CALL(AddStarPieces, 1) EVT_END_IF EVT_RETURN diff --git a/src/world/area_kzn/kzn_20/kzn_20_1_main.c b/src/world/area_kzn/kzn_20/kzn_20_1_main.c index e56bd6c45e..9bf51a0f96 100644 --- a/src/world/area_kzn/kzn_20/kzn_20_1_main.c +++ b/src/world/area_kzn/kzn_20/kzn_20_1_main.c @@ -190,7 +190,7 @@ EvtScript N(EVS_OnBreakWall) = { EVT_PLAY_EFFECT(EFFECT_BOMBETTE_BREAKING, 0, 2, 2, 1, 10, 30) EVT_CALL(EnableGroup, MODEL_bom_mae, FALSE) EVT_CALL(EnableGroup, MODEL_bom_ato, TRUE) - EVT_CALL(ModifyColliderFlags, 0, COLLIDER_tt1, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_tt1, COLLIDER_FLAGS_UPPER_MASK) EVT_SET(GB_StoryProgress, STORY_CH5_OPENED_ESCAPE_ROUTE) EVT_UNBIND EVT_RETURN @@ -211,7 +211,7 @@ EvtScript N(EVS_Main) = { EVT_BIND_TRIGGER(N(EVS_OnBreakWall), TRIGGER_POINT_BOMB, EVT_PTR(N(WeakWallBombTrigger)), 1, 0) EVT_ELSE EVT_CALL(EnableGroup, MODEL_bom_mae, FALSE) - EVT_CALL(ModifyColliderFlags, 0, COLLIDER_tt1, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_tt1, COLLIDER_FLAGS_UPPER_MASK) EVT_END_IF EVT_EXEC(N(EVS_SetupMusic)) EVT_EXEC(N(EVS_UpdateLavaWaves)) diff --git a/src/world/area_kzn/kzn_20/kzn_20_2_npc.c b/src/world/area_kzn/kzn_20/kzn_20_2_npc.c index 038e298820..1d429cdc85 100644 --- a/src/world/area_kzn/kzn_20/kzn_20_2_npc.c +++ b/src/world/area_kzn/kzn_20/kzn_20_2_npc.c @@ -62,7 +62,7 @@ EvtScript N(EVS_Kolorado_LetterReward) = { EVT_IF_EQ(LVarC, 2) EVT_SET(LVar0, ITEM_STAR_PIECE) EVT_SET(LVar1, 3) - EVT_EXEC_WAIT(N(Delivery_ShowGotStarPiece)) + EVT_EXEC_WAIT(N(GiveKeyReward)) EVT_CALL(AddStarPieces, 1) EVT_END_IF EVT_RETURN diff --git a/src/world/area_mac/mac_00/7EAD10.c b/src/world/area_mac/mac_00/7EAD10.c index 6aceeecf70..cb5a1baccd 100644 --- a/src/world/area_mac/mac_00/7EAD10.c +++ b/src/world/area_mac/mac_00/7EAD10.c @@ -7,7 +7,7 @@ static char* N(exit_str_3) = "kmr_20"; static char* N(exit_str_4) = "mac_00"; static char* N(exit_str_5) = "\0\0\0\0"; -#include "world/common/atomic/Pipe.inc.c" +#include "world/common/entity/Pipe.inc.c" #include "world/common/atomic/TexturePan.inc.c" diff --git a/src/world/area_mac/mac_00/7EB340.c b/src/world/area_mac/mac_00/7EB340.c index ad8853594f..b536c8c843 100644 --- a/src/world/area_mac/mac_00/7EB340.c +++ b/src/world/area_mac/mac_00/7EB340.c @@ -11,9 +11,9 @@ extern EffectInstance* N(Quizmo_VannaTEffect); #include "world/common/atomic/Quizmo.inc.c" -#include "world/common/GetNpcCollisionHeight.inc.c" +#include "world/common/todo/GetNpcCollisionHeight.inc.c" -#include "world/common/AddPlayerHandsOffset.inc.c" +#include "world/common/todo/AddPlayerHandsOffset.inc.c" INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_802418F0_7EC600); @@ -62,7 +62,7 @@ ApiStatus func_80241A18_7EC728(Evt* script, s32 isInitialCall) { } extern s32 N(LetterDelivery_SavedNpcAnim); -#include "world/common/LetterDelivery.inc.c" +#include "world/common/todo/LetterDelivery.inc.c" INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_80241DA0_7ECAB0); @@ -72,7 +72,7 @@ INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_80241E80_7ECB90); INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_80241FF0_7ECD00); -#include "world/common/UnkPositionFunc.inc.c" +#include "world/common/todo/UnkPositionFunc.inc.c" ApiStatus N(SetDojoBattle)(Evt* script, s32 isInitialCall) { Enemy* enemy = script->owner1.enemy; diff --git a/src/world/area_mac/mac_00/7ED280.c b/src/world/area_mac/mac_00/7ED280.c index 543567aab0..a7ef9825bb 100644 --- a/src/world/area_mac/mac_00/7ED280.c +++ b/src/world/area_mac/mac_00/7ED280.c @@ -1,23 +1,23 @@ #include "mac_00.h" -#include "world/common/enemy/PatrolNoAttackAI.inc.c" +#include "world/common/enemy/ai/PatrolNoAttackAI.inc.c" static char* N(exit_str_0) = "mac_01"; #define NAMESPACE dup_mac_00 -#include "world/common/StashVars.inc.c" +#include "world/common/todo/StashVars.inc.c" #define NAMESPACE mac_00 #define NAMESPACE dup_mac_00 -#include "world/common/GetItemName.inc.c" +#include "world/common/todo/GetItemName.inc.c" #define NAMESPACE mac_00 #define NAMESPACE dup_mac_00 -#include "world/common/GetNpcCollisionHeight.inc.c" +#include "world/common/todo/GetNpcCollisionHeight.inc.c" #define NAMESPACE mac_00 #define NAMESPACE dup_mac_00 -#include "world/common/AddPlayerHandsOffset.inc.c" +#include "world/common/todo/AddPlayerHandsOffset.inc.c" #define NAMESPACE mac_00 INCLUDE_ASM(s32, "world/area_mac/mac_00/7ED280", func_80243744_7EE454); @@ -47,5 +47,5 @@ ApiStatus func_802437D0_7EE4E0(Evt* script, s32 isInitialCall) { #define NAMESPACE dup_mac_00 extern s32 N(LetterDelivery_SavedNpcAnim); -#include "world/common/LetterDelivery.inc.c" +#include "world/common/todo/LetterDelivery.inc.c" #define NAMESPACE mac_00 diff --git a/src/world/area_mac/mac_01/8017D0.c b/src/world/area_mac/mac_01/8017D0.c index 1b87b16c3e..7d0c3e901d 100644 --- a/src/world/area_mac/mac_01/8017D0.c +++ b/src/world/area_mac/mac_01/8017D0.c @@ -9,7 +9,7 @@ extern s32 D_80262F68; #include "world/common/atomic/MonitorMusicProximityTrigger.inc.c" -#include "world/common/enemy/PatrolNoAttackAI.inc.c" +#include "world/common/enemy/ai/PatrolNoAttackAI.inc.c" static char* N(exit_str_0) = "flo_00"; static char* N(exit_str_1) = "kmr_22"; @@ -22,7 +22,7 @@ extern EffectInstance* N(Quizmo_VannaTEffect); #include "world/common/atomic/Quizmo.inc.c" -#include "world/common/UnkFoldFunc.inc.c" +#include "world/common/todo/UnkFoldFunc.inc.c" ApiStatus func_80243380_803C00(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; @@ -61,9 +61,9 @@ INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80243740_803FC0); #include "world/common/atomic/ToadHouse.inc.c" -#include "world/common/GetNpcCollisionHeight.inc.c" +#include "world/common/todo/GetNpcCollisionHeight.inc.c" -#include "world/common/AddPlayerHandsOffset.inc.c" +#include "world/common/todo/AddPlayerHandsOffset.inc.c" INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80243CD4_804554); @@ -97,9 +97,9 @@ ApiStatus func_80243D60_8045E0(Evt* script, s32 isInitialCall) { } extern s32 N(LetterDelivery_SavedNpcAnim); -#include "world/common/LetterDelivery.inc.c" +#include "world/common/todo/LetterDelivery.inc.c" -#include "world/common/GetPlayerCoins.inc.c" +#include "world/common/todo/GetPlayerCoins.inc.c" INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_802440FC_80497C); @@ -111,7 +111,7 @@ INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_802443E0_804C60); INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_802446AC_804F2C); -#include "world/common/UnkPositionFunc.inc.c" +#include "world/common/todo/UnkPositionFunc.inc.c" ApiStatus func_802447E0_805060(Evt* script, s32 isInitialCall) { if (isInitialCall) { @@ -157,7 +157,7 @@ INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", pause_tabs_draw_stats_805418); INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", pause_tabs_draw_badges_805540); -#include "world/common/UnkMachiFunc.inc.c" +#include "world/common/todo/UnkMachiFunc.inc.c" INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80244E10_805690); diff --git a/src/world/area_mac/mac_01/805DD0.c b/src/world/area_mac/mac_01/805DD0.c index af02dc083e..3f277d167d 100644 --- a/src/world/area_mac/mac_01/805DD0.c +++ b/src/world/area_mac/mac_01/805DD0.c @@ -2,9 +2,9 @@ #define NAMESPACE dup_mac_01 -#include "world/common/enemy/PatrolNoAttackAI.inc.c" +#include "world/common/enemy/ai/PatrolNoAttackAI.inc.c" -#include "world/common/UnkMachiFunc.inc.c" +#include "world/common/todo/UnkMachiFunc.inc.c" #define NAMESPACE mac_01 diff --git a/src/world/area_mac/mac_02/8232C0.c b/src/world/area_mac/mac_02/8232C0.c index 14635cd1f7..c8ac4b30ff 100644 --- a/src/world/area_mac/mac_02/8232C0.c +++ b/src/world/area_mac/mac_02/8232C0.c @@ -7,7 +7,7 @@ static char* N(exit_str_3) = "mac_03"; static char* N(exit_str_4) = "tik_06"; static char* N(exit_str_5) = "tik_15"; -#include "world/common/atomic/Pipe.inc.c" +#include "world/common/entity/Pipe.inc.c" #include "world/common/atomic/TexturePan.inc.c" diff --git a/src/world/area_mac/mac_02/823BB0.c b/src/world/area_mac/mac_02/823BB0.c index b9caa07b17..81f74e4289 100644 --- a/src/world/area_mac/mac_02/823BB0.c +++ b/src/world/area_mac/mac_02/823BB0.c @@ -1,3 +1,3 @@ #include "mac_02.h" -#include "world/common/RemovePadlock.inc.c" +#include "world/common/todo/RemovePadlock.inc.c" diff --git a/src/world/area_mac/mac_02/823BF0.c b/src/world/area_mac/mac_02/823BF0.c index 44fcd892ba..226d2350d7 100644 --- a/src/world/area_mac/mac_02/823BF0.c +++ b/src/world/area_mac/mac_02/823BF0.c @@ -2,7 +2,7 @@ #define CHUCK_QUIZMO_NPC_ID 12 -#include "world/common/enemy/PatrolNoAttackAI.inc.c" +#include "world/common/enemy/ai/PatrolNoAttackAI.inc.c" extern s32 N(Quizmo_Worker); extern s32 N(Quizmo_AnswerResult); @@ -16,9 +16,9 @@ extern s32 D_8024EA14; #include "world/common/atomic/Quizmo.inc.c" -#include "world/common/GetNpcCollisionHeight.inc.c" +#include "world/common/todo/GetNpcCollisionHeight.inc.c" -#include "world/common/AddPlayerHandsOffset.inc.c" +#include "world/common/todo/AddPlayerHandsOffset.inc.c" // needs data migration, matching otherwise #ifdef NON_MATCHING @@ -123,6 +123,6 @@ ApiStatus func_802430D0_826390(Evt* script, s32 isInitialCall) { } extern s32 N(LetterDelivery_SavedNpcAnim); -#include "world/common/LetterDelivery.inc.c" +#include "world/common/todo/LetterDelivery.inc.c" #include "world/common/atomic/MonitorMusicProximityTrigger.inc.c" diff --git a/src/world/area_mac/mac_03/831800.c b/src/world/area_mac/mac_03/831800.c index 1a8cbecbff..50e9bf816f 100644 --- a/src/world/area_mac/mac_03/831800.c +++ b/src/world/area_mac/mac_03/831800.c @@ -5,7 +5,7 @@ static char* N(exit_str_1) = "mgm_00"; static char* N(exit_str_2) = "iwa_11"; static char* N(exit_str_3) = "mac_03"; -#include "world/common/atomic/Pipe.inc.c" +#include "world/common/entity/Pipe.inc.c" ApiStatus func_802402E0_831AE0(Evt* script, s32 isInitialCall) { if (script->varTable[15] > 720) { diff --git a/src/world/area_mac/mac_03/831B20.c b/src/world/area_mac/mac_03/831B20.c index c6990948ad..2cd171ee35 100644 --- a/src/world/area_mac/mac_03/831B20.c +++ b/src/world/area_mac/mac_03/831B20.c @@ -13,9 +13,9 @@ extern EffectInstance* N(Quizmo_VannaTEffect); #include "world/common/atomic/Quizmo.inc.c" -#include "world/common/GetNpcCollisionHeight.inc.c" +#include "world/common/todo/GetNpcCollisionHeight.inc.c" -#include "world/common/AddPlayerHandsOffset.inc.c" +#include "world/common/todo/AddPlayerHandsOffset.inc.c" INCLUDE_ASM(s32, "world/area_mac/mac_03/831B20", func_80241770_832F70); @@ -43,7 +43,7 @@ ApiStatus func_802417FC_832FFC(Evt* script, s32 isInitialCall) { } extern s32 N(LetterDelivery_SavedNpcAnim); -#include "world/common/LetterDelivery.inc.c" +#include "world/common/todo/LetterDelivery.inc.c" INCLUDE_ASM(s32, "world/area_mac/mac_03/831B20", func_80241B84_833384); diff --git a/src/world/area_mac/mac_03/833740.c b/src/world/area_mac/mac_03/833740.c index 5d897b68d7..fce3ee3b07 100644 --- a/src/world/area_mac/mac_03/833740.c +++ b/src/world/area_mac/mac_03/833740.c @@ -9,9 +9,9 @@ typedef struct LilOinkReward { extern LilOinkReward D_8024F800_841000[10]; -#include "world/common/GetFloorCollider.inc.c" +#include "world/common/todo/GetFloorCollider.inc.c" -#include "world/common/GetPlayerCoins.inc.c" +#include "world/common/todo/GetPlayerCoins.inc.c" ApiStatus func_80241F80_833780(Evt* script, s32 isInitialCall) { hide_coin_counter_immediately(); diff --git a/src/world/area_mac/mac_04/843030.c b/src/world/area_mac/mac_04/843030.c index 9db7351a7e..317c607839 100644 --- a/src/world/area_mac/mac_04/843030.c +++ b/src/world/area_mac/mac_04/843030.c @@ -11,9 +11,9 @@ extern EffectInstance* N(Quizmo_VannaTEffect); #include "world/common/atomic/Quizmo.inc.c" -#include "world/common/GetNpcCollisionHeight.inc.c" +#include "world/common/todo/GetNpcCollisionHeight.inc.c" -#include "world/common/AddPlayerHandsOffset.inc.c" +#include "world/common/todo/AddPlayerHandsOffset.inc.c" INCLUDE_ASM(s32, "world/area_mac/mac_04/843030", func_80241720_8442F0); @@ -54,7 +54,7 @@ ApiStatus PostChapter4StatUpdate(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -#include "world/common/GetFloorCollider.inc.c" +#include "world/common/todo/GetFloorCollider.inc.c" ApiStatus N(IsPartnerBow)(Evt* script, s32 isInitialCall) { if (gPartnerActionStatus.actingPartner == PARTNER_BOW) { @@ -65,7 +65,7 @@ ApiStatus N(IsPartnerBow)(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -#include "world/common/GetPlayerCoins.inc.c" +#include "world/common/todo/GetPlayerCoins.inc.c" INCLUDE_ASM(s32, "world/area_mac/mac_04/843030", func_802419E4_8445B4); diff --git a/src/world/area_mac/mac_04/844860.c b/src/world/area_mac/mac_04/844860.c index 6437594596..dd1b4e2601 100644 --- a/src/world/area_mac/mac_04/844860.c +++ b/src/world/area_mac/mac_04/844860.c @@ -53,4 +53,4 @@ void func_80241DAC_84497C(PlayerStatus* playerStatus) { INCLUDE_ASM(s32, "world/area_mac/mac_04/844860", func_80241DAC_84497C); #endif -#include "world/common/RemovePadlock.inc.c" +#include "world/common/todo/RemovePadlock.inc.c" diff --git a/src/world/area_mac/mac_05/852170.c b/src/world/area_mac/mac_05/852170.c index 721b634d29..bc3661d020 100644 --- a/src/world/area_mac/mac_05/852170.c +++ b/src/world/area_mac/mac_05/852170.c @@ -8,12 +8,12 @@ static char* N(exit_str_1) = "kgr_01"; #include "world/common/atomic/TexturePan.inc.c" #define NAMESPACE dup_mac_05 -#include "world/common/UnkFloatFunc001.inc.c" +#include "world/common/todo/UnkFloatFunc001.inc.c" #define NAMESPACE mac_05 INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_8024047C_8525EC); -#include "world/common/enemy/PatrolNoAttackAI.inc.c" +#include "world/common/enemy/ai/PatrolNoAttackAI.inc.c" extern s32 N(Quizmo_Worker); extern s32 N(Quizmo_AnswerResult); @@ -23,9 +23,9 @@ extern EffectInstance* N(Quizmo_VannaTEffect); #include "world/common/atomic/Quizmo.inc.c" -#include "world/common/GetNpcCollisionHeight.inc.c" +#include "world/common/todo/GetNpcCollisionHeight.inc.c" -#include "world/common/AddPlayerHandsOffset.inc.c" +#include "world/common/todo/AddPlayerHandsOffset.inc.c" INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_802425E0_854750); @@ -74,7 +74,7 @@ ApiStatus func_80242708_854878(Evt* script, s32 isInitialCall) { } extern s32 N(LetterDelivery_SavedNpcAnim); -#include "world/common/LetterDelivery.inc.c" +#include "world/common/todo/LetterDelivery.inc.c" INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_80242A90_854C00); @@ -84,7 +84,7 @@ INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_80242C78_854DE8); INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_80242E84_854FF4); -#include "world/common/GetFloorCollider.inc.c" +#include "world/common/todo/GetFloorCollider.inc.c" INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_802430B4_855224); 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 df00ebb8a2..9d7c0010cf 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 @@ -45,7 +45,7 @@ ApiStatus N(GetWaveAmplitude)(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -#include "world/common/SpawnSunEffect.inc.c" +#include "world/common/todo/SpawnSunEffect.inc.c" EvtScript N(EVS_AnimateWaves) = { EVT_SET_GROUP(EVT_GROUP_00) @@ -73,7 +73,7 @@ EvtScript N(EVS_Main) = { EVT_CALL(SetMusicTrack, 0, SONG_RIDING_THE_WHALE, 0, 8) EVT_CALL(PlayAmbientSounds, AMBIENT_BEACH) EVT_EXEC(N(EVS_AnimateWaves)) - EVT_CALL(SetTexPanner, MODEL_o214, 1) + EVT_CALL(SetTexPanner, MODEL_o214, TEX_PANNER_1) EVT_CALL(N(SpawnSunEffect)) EVT_CALL(GetEntryID, LVar0) EVT_IF_EQ(LVar0, mac_06_ENTRY_0) diff --git a/src/world/area_mgm/mgm_00/mgm_00_1_main.c b/src/world/area_mgm/mgm_00/mgm_00_1_main.c index 72b210cc07..432435c2f7 100644 --- a/src/world/area_mgm/mgm_00/mgm_00_1_main.c +++ b/src/world/area_mgm/mgm_00/mgm_00_1_main.c @@ -25,8 +25,8 @@ EvtScript N(D_80241850_E0FFF0) = { EVT_END }; -#include "world/common/atomic/Pipe.inc.c" -#include "world/common/atomic/Pipe.data.inc.c" +#include "world/common/entity/Pipe.inc.c" +#include "world/common/entity/Pipe.data.inc.c" EvtScript N(EVS_GotoMap_ToadTown) = { EVT_CALL(GotoMap, EVT_PTR("mac_03"), mac_03_ENTRY_2) @@ -95,13 +95,13 @@ EvtScript N(EVS_BindExitTriggers) = { EvtScript N(EVS_EnterMap) = { EVT_IF_EQ(GF_MGM_Unlocked_JumpAttack, FALSE) - EVT_CALL(ModifyColliderFlags, 0, COLLIDER_o5, COLLIDER_FLAGS_UPPER_MASK) - EVT_CALL(ModifyColliderFlags, 0, COLLIDER_deili2, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o5, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_deili2, COLLIDER_FLAGS_UPPER_MASK) EVT_CALL(EnableModel, MODEL_o5, FALSE) EVT_END_IF EVT_IF_EQ(GF_MGM_Unlocked_SmashAttack, FALSE) - EVT_CALL(ModifyColliderFlags, 0, COLLIDER_o9, COLLIDER_FLAGS_UPPER_MASK) - EVT_CALL(ModifyColliderFlags, 0, COLLIDER_deili3, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o9, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_deili3, COLLIDER_FLAGS_UPPER_MASK) EVT_CALL(EnableModel, MODEL_o9, FALSE) EVT_END_IF EVT_CALL(GetEntryID, LVar0) 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 5fea1a0d22..b5676c0723 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 @@ -3,7 +3,7 @@ extern EvtScript N(EVS_OnEnterPipe_JumpAttack); extern EvtScript N(EVS_OnEnterPipe_SmashAttack); -#include "world/common/enemy/PatrolNoAttackAI.inc.c" +#include "world/common/enemy/ai/PatrolNoAttackAI.inc.c" MobileAISettings N(AISettings_GreenToad) = { .moveSpeed = 1.5f, 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 2da2f5abcb..267bfb80ff 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 @@ -1481,7 +1481,7 @@ EvtScript N(EVS_OnHitBox) = { EVT_CALL(TranslateModel, LVarA, 0, -21, 0) EVT_WAIT(1) EVT_CALL(EnableModel, LVarA, FALSE) - EVT_CALL(ModifyColliderFlags, 0, LVarB, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, LVarB, COLLIDER_FLAGS_UPPER_MASK) EVT_WAIT(4) EVT_SUB(LVar1, 5) EVT_PLAY_EFFECT(EFFECT_WALKING_DUST, 1, LVar0, LVar1, LVar2) @@ -1492,7 +1492,7 @@ EvtScript N(EVS_OnHitBox) = { EVT_END_CASE_GROUP EVT_END_SWITCH EVT_CALL(EnableModel, LVarA, FALSE) - EVT_CALL(ModifyColliderFlags, 0, LVarB, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, LVarB, COLLIDER_FLAGS_UPPER_MASK) EVT_RETURN EVT_END }; diff --git a/src/world/area_mim/mim.h b/src/world/area_mim/mim.h index d98052a427..50e8d25876 100644 --- a/src/world/area_mim/mim.h +++ b/src/world/area_mim/mim.h @@ -27,4 +27,17 @@ enum { AF_MIM12_BackgroundLitUp = AreaFlag(3), }; +extern MapSettings mim_01_settings; +extern MapSettings mim_02_settings; +extern MapSettings mim_03_settings; +extern MapSettings mim_04_settings; +extern MapSettings mim_05_settings; +extern MapSettings mim_06_settings; +extern MapSettings mim_07_settings; +extern MapSettings mim_08_settings; +extern MapSettings mim_09_settings; +extern MapSettings mim_10_settings; +extern MapSettings mim_11_settings; +extern MapSettings mim_12_settings; + #endif diff --git a/src/world/area_mim/mim_01/mim_01_2_main.c b/src/world/area_mim/mim_01/mim_01_2_main.c index a5fb48c5c6..a11795181b 100644 --- a/src/world/area_mim/mim_01/mim_01_2_main.c +++ b/src/world/area_mim/mim_01/mim_01_2_main.c @@ -1,6 +1,6 @@ #include "mim_01.h" -#include "world/common/SetForeverForestFog.inc.c" +#include "world/common/todo/SetForeverForestFog.inc.c" EvtScript N(EVS_ExitWalk_n) = EVT_EXIT_WALK(60, mim_01_ENTRY_0, "mim_01", mim_01_ENTRY_1); EvtScript N(EVS_ExitWalk_w) = EVT_EXIT_WALK(60, mim_01_ENTRY_1, "mim_10", mim_10_ENTRY_1); diff --git a/src/world/area_mim/mim_02/mim_02_2_main.c b/src/world/area_mim/mim_02/mim_02_2_main.c index 2ce437bbe6..b44edd4582 100644 --- a/src/world/area_mim/mim_02/mim_02_2_main.c +++ b/src/world/area_mim/mim_02/mim_02_2_main.c @@ -1,6 +1,6 @@ #include "mim_02.h" -#include "world/common/SetForeverForestFog.inc.c" +#include "world/common/todo/SetForeverForestFog.inc.c" EvtScript N(EVS_ExitWalk_s) = EVT_EXIT_WALK(60, mim_02_ENTRY_0, "mim_03", mim_03_ENTRY_2); EvtScript N(EVS_ExitWalk_e) = EVT_EXIT_WALK(60, mim_02_ENTRY_1, "mim_01", mim_01_ENTRY_3); diff --git a/src/world/area_mim/mim_03/mim_03_2_main.c b/src/world/area_mim/mim_03/mim_03_2_main.c index 061d27a29e..69ea0bb127 100644 --- a/src/world/area_mim/mim_03/mim_03_2_main.c +++ b/src/world/area_mim/mim_03/mim_03_2_main.c @@ -1,6 +1,6 @@ #include "mim_03.h" -#include "world/common/SetForeverForestFog.inc.c" +#include "world/common/todo/SetForeverForestFog.inc.c" API_CALLABLE(N(GetPlayerDistFromMapCenter)) { script->varTable[0] = get_xz_dist_to_player(0.0f, 0.0f); diff --git a/src/world/area_mim/mim_03/mim_03_4_hint.c b/src/world/area_mim/mim_03/mim_03_4_hint.c index c9f6b583fd..a1ef06fcfb 100644 --- a/src/world/area_mim/mim_03/mim_03_4_hint.c +++ b/src/world/area_mim/mim_03/mim_03_4_hint.c @@ -160,19 +160,19 @@ EvtScript N(EVS_CheckFlowers_East) = { }; EvtScript N(EVS_SetupExitHint) = { - EVT_CALL(SetTexPanner, MODEL_o2, 0) - EVT_CALL(SetTexPanner, MODEL_o4, 0) - EVT_CALL(SetTexPanner, MODEL_o6, 0) - EVT_CALL(SetTexPanner, MODEL_o20, 1) - EVT_CALL(SetTexPanner, MODEL_o22, 1) - EVT_CALL(SetTexPanner, MODEL_o24, 1) - EVT_CALL(SetTexPanner, MODEL_o26, 1) - EVT_CALL(SetTexPanner, MODEL_o14, 2) - EVT_CALL(SetTexPanner, MODEL_o16, 2) - EVT_CALL(SetTexPanner, MODEL_o18, 2) - EVT_CALL(SetTexPanner, MODEL_o8, 3) - EVT_CALL(SetTexPanner, MODEL_o10, 3) - EVT_CALL(SetTexPanner, MODEL_o12, 3) + EVT_CALL(SetTexPanner, MODEL_o2, TEX_PANNER_0) + EVT_CALL(SetTexPanner, MODEL_o4, TEX_PANNER_0) + EVT_CALL(SetTexPanner, MODEL_o6, TEX_PANNER_0) + EVT_CALL(SetTexPanner, MODEL_o20, TEX_PANNER_1) + EVT_CALL(SetTexPanner, MODEL_o22, TEX_PANNER_1) + EVT_CALL(SetTexPanner, MODEL_o24, TEX_PANNER_1) + EVT_CALL(SetTexPanner, MODEL_o26, TEX_PANNER_1) + EVT_CALL(SetTexPanner, MODEL_o14, TEX_PANNER_2) + EVT_CALL(SetTexPanner, MODEL_o16, TEX_PANNER_2) + EVT_CALL(SetTexPanner, MODEL_o18, TEX_PANNER_2) + EVT_CALL(SetTexPanner, MODEL_o8, TEX_PANNER_3) + EVT_CALL(SetTexPanner, MODEL_o10, TEX_PANNER_3) + EVT_CALL(SetTexPanner, MODEL_o12, TEX_PANNER_3) EVT_BIND_TRIGGER(EVT_PTR(N(EVS_CheckFlowers_West)), TRIGGER_WALL_PRESS_A, COLLIDER_o132, 1, 0) EVT_BIND_TRIGGER(EVT_PTR(N(EVS_CheckFlowers_North)), TRIGGER_WALL_PRESS_A, COLLIDER_o149, 1, 0) EVT_BIND_TRIGGER(EVT_PTR(N(EVS_CheckFlowers_South)), TRIGGER_WALL_PRESS_A, COLLIDER_o151, 1, 0) diff --git a/src/world/area_mim/mim_04/mim_04_2_main.c b/src/world/area_mim/mim_04/mim_04_2_main.c index 9a6fddd929..01008bf7ff 100644 --- a/src/world/area_mim/mim_04/mim_04_2_main.c +++ b/src/world/area_mim/mim_04/mim_04_2_main.c @@ -1,6 +1,6 @@ #include "mim_04.h" -#include "world/common/SetForeverForestFog.inc.c" +#include "world/common/todo/SetForeverForestFog.inc.c" EvtScript N(EVS_ExitWalk_n) = EVT_EXIT_WALK(60, mim_04_ENTRY_0, "mim_05", mim_05_ENTRY_2); EvtScript N(EVS_ExitWalk_w) = EVT_EXIT_WALK(60, mim_04_ENTRY_1, "mim_01", mim_01_ENTRY_1); diff --git a/src/world/area_mim/mim_04/mim_04_4_hint.c b/src/world/area_mim/mim_04/mim_04_4_hint.c index ddcea84f84..20ec7dad7c 100644 --- a/src/world/area_mim/mim_04/mim_04_4_hint.c +++ b/src/world/area_mim/mim_04/mim_04_4_hint.c @@ -73,11 +73,11 @@ EvtScript N(EVS_SetupExitHint) = { EVT_WAIT(20) EVT_EXEC(N(EVS_ManageEvilTree)) EVT_THREAD - EVT_CALL(SetTexPanner, MODEL_kao, 0) + EVT_CALL(SetTexPanner, MODEL_kao, TEX_PANNER_0) EVT_LABEL(0) - EVT_CALL(SetTexPanOffset, 0, 0, 0, -0x8000) + EVT_CALL(SetTexPanOffset, TEX_PANNER_0, TEX_PANNER_MAIN, 0, -0x8000) EVT_WAIT(2) - EVT_CALL(SetTexPanOffset, 0, 0, 0, 0) + EVT_CALL(SetTexPanOffset, TEX_PANNER_0, TEX_PANNER_MAIN, 0, 0) EVT_WAIT(3) EVT_GOTO(0) EVT_END_THREAD diff --git a/src/world/area_mim/mim_05/mim_05_2_main.c b/src/world/area_mim/mim_05/mim_05_2_main.c index 7fa73b23b1..8238335da1 100644 --- a/src/world/area_mim/mim_05/mim_05_2_main.c +++ b/src/world/area_mim/mim_05/mim_05_2_main.c @@ -1,6 +1,6 @@ #include "mim_05.h" -#include "world/common/SetForeverForestFog.inc.c" +#include "world/common/todo/SetForeverForestFog.inc.c" EvtScript N(EVS_ExitWalk_n) = EVT_EXIT_WALK(60, mim_05_ENTRY_0, "mim_01", mim_01_ENTRY_1); EvtScript N(EVS_ExitWalk_w) = EVT_EXIT_WALK(60, mim_05_ENTRY_1, "mim_06", mim_06_ENTRY_3); diff --git a/src/world/area_mim/mim_06/mim_06_2_main.c b/src/world/area_mim/mim_06/mim_06_2_main.c index f824b1fb68..cc7d5242c7 100644 --- a/src/world/area_mim/mim_06/mim_06_2_main.c +++ b/src/world/area_mim/mim_06/mim_06_2_main.c @@ -1,6 +1,6 @@ #include "mim_06.h" -#include "world/common/SetForeverForestFog.inc.c" +#include "world/common/todo/SetForeverForestFog.inc.c" EvtScript N(EVS_ExitWalk_n) = EVT_EXIT_WALK(60, mim_06_ENTRY_0, "mim_07", mim_07_ENTRY_2); EvtScript N(EVS_ExitWalk_w) = EVT_EXIT_WALK(60, mim_06_ENTRY_1, "mim_01", mim_01_ENTRY_1); diff --git a/src/world/area_mim/mim_06/mim_06_4_hint.c b/src/world/area_mim/mim_06/mim_06_4_hint.c index 4228fdb0ad..07fa6a55cc 100644 --- a/src/world/area_mim/mim_06/mim_06_4_hint.c +++ b/src/world/area_mim/mim_06/mim_06_4_hint.c @@ -81,9 +81,9 @@ EvtScript N(EVS_FlowersWither) = { }; EvtScript N(EVS_InspectFlowers_South) = { - EVT_CALL(SetTexPanOffset, 0, 0, 0, -0x8000) + EVT_CALL(SetTexPanOffset, TEX_PANNER_0, TEX_PANNER_MAIN, 0, -0x8000) EVT_WAIT(2) - EVT_CALL(SetTexPanOffset, 0, 0, 0, -0x10000) + EVT_CALL(SetTexPanOffset, TEX_PANNER_0, TEX_PANNER_MAIN, 0, -0x10000) EVT_CALL(PlaySoundAt, SOUND_205B, 0, -10, 0, -300) EVT_CALL(MakeLerp, 0, 30, 50, EASING_COS_IN_OUT) EVT_LABEL(0) @@ -129,17 +129,17 @@ EvtScript N(EVS_InspectFlowers_South) = { EVT_IF_EQ(LVar1, 1) EVT_GOTO(20) EVT_END_IF - EVT_CALL(SetTexPanOffset, 0, 0, 0, -0x8000) + EVT_CALL(SetTexPanOffset, TEX_PANNER_0, TEX_PANNER_MAIN, 0, -0x8000) EVT_WAIT(2) - EVT_CALL(SetTexPanOffset, 0, 0, 0, 0) + EVT_CALL(SetTexPanOffset, TEX_PANNER_0, TEX_PANNER_MAIN, 0, 0) EVT_RETURN EVT_END }; EvtScript N(EVS_InspectFlowers_West) = { - EVT_CALL(SetTexPanOffset, 1, 0, 0, -0x8000) + EVT_CALL(SetTexPanOffset, TEX_PANNER_1, TEX_PANNER_MAIN, 0, -0x8000) EVT_WAIT(2) - EVT_CALL(SetTexPanOffset, 1, 0, 0, -0x10000) + EVT_CALL(SetTexPanOffset, TEX_PANNER_1, TEX_PANNER_MAIN, 0, -0x10000) EVT_WAIT(15) EVT_CALL(PlaySoundAt, SOUND_205C, 0, -300, 0, -10) EVT_USE_BUF(EVT_PTR(N(FlowerModels_West))) @@ -155,9 +155,9 @@ EvtScript N(EVS_InspectFlowers_West) = { }; EvtScript N(EVS_InspectFlowers_North) = { - EVT_CALL(SetTexPanOffset, 2, 0, 0, -0x8000) + EVT_CALL(SetTexPanOffset, TEX_PANNER_2, TEX_PANNER_MAIN, 0, -0x8000) EVT_WAIT(2) - EVT_CALL(SetTexPanOffset, 2, 0, 0, -0x10000) + EVT_CALL(SetTexPanOffset, TEX_PANNER_2, TEX_PANNER_MAIN, 0, -0x10000) EVT_WAIT(15) EVT_CALL(PlaySoundAt, SOUND_205C, 0, 10, 0, 300) EVT_USE_BUF(EVT_PTR(N(FlowerModels_North))) @@ -173,9 +173,9 @@ EvtScript N(EVS_InspectFlowers_North) = { }; EvtScript N(EVS_InspectFlowers_East) = { - EVT_CALL(SetTexPanOffset, 3, 0, 0, -0x8000) + EVT_CALL(SetTexPanOffset, TEX_PANNER_3, TEX_PANNER_MAIN, 0, -0x8000) EVT_WAIT(2) - EVT_CALL(SetTexPanOffset, 3, 0, 0, -0x10000) + EVT_CALL(SetTexPanOffset, TEX_PANNER_3, TEX_PANNER_MAIN, 0, -0x10000) EVT_WAIT(15) EVT_CALL(PlaySoundAt, SOUND_205C, 0, 300, 0, -10) EVT_USE_BUF(EVT_PTR(N(FlowerModels_East))) @@ -191,18 +191,18 @@ EvtScript N(EVS_InspectFlowers_East) = { }; EvtScript N(D_802439F8_BA8178) = { - EVT_CALL(SetTexPanner, MODEL_sa_2, 0) - EVT_CALL(SetTexPanner, MODEL_sb_2, 0) - EVT_CALL(SetTexPanner, MODEL_sc_2, 0) - EVT_CALL(SetTexPanner, MODEL_wa_2, 1) - EVT_CALL(SetTexPanner, MODEL_wb_2, 1) - EVT_CALL(SetTexPanner, MODEL_wc_2, 1) - EVT_CALL(SetTexPanner, MODEL_na_2, 2) - EVT_CALL(SetTexPanner, MODEL_nb_2, 2) - EVT_CALL(SetTexPanner, MODEL_nc_2, 2) - EVT_CALL(SetTexPanner, MODEL_ea_2, 3) - EVT_CALL(SetTexPanner, MODEL_eb_2, 3) - EVT_CALL(SetTexPanner, MODEL_ec_2, 3) + EVT_CALL(SetTexPanner, MODEL_sa_2, TEX_PANNER_0) + EVT_CALL(SetTexPanner, MODEL_sb_2, TEX_PANNER_0) + EVT_CALL(SetTexPanner, MODEL_sc_2, TEX_PANNER_0) + EVT_CALL(SetTexPanner, MODEL_wa_2, TEX_PANNER_1) + EVT_CALL(SetTexPanner, MODEL_wb_2, TEX_PANNER_1) + EVT_CALL(SetTexPanner, MODEL_wc_2, TEX_PANNER_1) + EVT_CALL(SetTexPanner, MODEL_na_2, TEX_PANNER_2) + EVT_CALL(SetTexPanner, MODEL_nb_2, TEX_PANNER_2) + EVT_CALL(SetTexPanner, MODEL_nc_2, TEX_PANNER_2) + EVT_CALL(SetTexPanner, MODEL_ea_2, TEX_PANNER_3) + EVT_CALL(SetTexPanner, MODEL_eb_2, TEX_PANNER_3) + EVT_CALL(SetTexPanner, MODEL_ec_2, TEX_PANNER_3) EVT_BIND_TRIGGER(EVT_PTR(N(EVS_InspectFlowers_South)), TRIGGER_WALL_PRESS_A, COLLIDER_o416, 1, 0) EVT_BIND_TRIGGER(EVT_PTR(N(EVS_InspectFlowers_West)), TRIGGER_WALL_PRESS_A, COLLIDER_o418, 1, 0) EVT_BIND_TRIGGER(EVT_PTR(N(EVS_InspectFlowers_North)), TRIGGER_WALL_PRESS_A, COLLIDER_o417, 1, 0) diff --git a/src/world/area_mim/mim_07/mim_07_2_main.c b/src/world/area_mim/mim_07/mim_07_2_main.c index d34ae24389..f8b8eed346 100644 --- a/src/world/area_mim/mim_07/mim_07_2_main.c +++ b/src/world/area_mim/mim_07/mim_07_2_main.c @@ -1,6 +1,6 @@ #include "mim_07.h" -#include "world/common/SetForeverForestFog.inc.c" +#include "world/common/todo/SetForeverForestFog.inc.c" EvtScript N(EVS_ExitWalk_n) = EVT_EXIT_WALK(60, mim_07_ENTRY_0, "mim_09", mim_09_ENTRY_2); EvtScript N(EVS_ExitWalk_w) = EVT_EXIT_WALK(60, mim_07_ENTRY_1, "mim_01", mim_01_ENTRY_1); diff --git a/src/world/area_mim/mim_07/mim_07_4_hint.c b/src/world/area_mim/mim_07/mim_07_4_hint.c index b4a5dc6d37..c1a088c2f2 100644 --- a/src/world/area_mim/mim_07/mim_07_4_hint.c +++ b/src/world/area_mim/mim_07/mim_07_4_hint.c @@ -70,9 +70,9 @@ API_CALLABLE(N(TryEvilRockLaugh)) { EvtScript N(EVS_ManageEvilRock) = { EVT_LABEL(0) - EVT_CALL(SetTexPanOffset, 0, 0, 0, -0x8000) + EVT_CALL(SetTexPanOffset, TEX_PANNER_0, TEX_PANNER_MAIN, 0, -0x8000) EVT_WAIT(3) - EVT_CALL(SetTexPanOffset, 0, 0, 0, 0) + EVT_CALL(SetTexPanOffset, TEX_PANNER_0, TEX_PANNER_MAIN, 0, 0) EVT_WAIT(3) EVT_GOTO(0) EVT_RETURN @@ -115,7 +115,7 @@ EvtScript N(EVS_SetupExitHint) = { EVT_CALL(SetModelCustomGfx, MODEL_o440, 1, -1) EVT_CALL(SetModelFlags, MODEL_o440, 16, TRUE) EVT_BIND_TRIGGER(EVT_PTR(N(EVS_OnInspectEvilRock)), TRIGGER_WALL_PRESS_A, COLLIDER_o491, 1, 0) - EVT_CALL(SetTexPanner, MODEL_o440, 0) + EVT_CALL(SetTexPanner, MODEL_o440, TEX_PANNER_0) EVT_RETURN EVT_END }; diff --git a/src/world/area_mim/mim_08/mim_08_2_main.c b/src/world/area_mim/mim_08/mim_08_2_main.c index ede5edc8cc..b329fd317e 100644 --- a/src/world/area_mim/mim_08/mim_08_2_main.c +++ b/src/world/area_mim/mim_08/mim_08_2_main.c @@ -1,6 +1,6 @@ #include "mim_08.h" -#include "world/common/SetForeverForestFog.inc.c" +#include "world/common/todo/SetForeverForestFog.inc.c" API_CALLABLE(N(GetPlayerDistFromMapCenter)) { script->varTable[0] = get_xz_dist_to_player(0.0f, 0.0f); diff --git a/src/world/area_mim/mim_09/mim_09_2_main.c b/src/world/area_mim/mim_09/mim_09_2_main.c index c420261a06..0be62fd374 100644 --- a/src/world/area_mim/mim_09/mim_09_2_main.c +++ b/src/world/area_mim/mim_09/mim_09_2_main.c @@ -1,6 +1,6 @@ #include "mim_09.h" -#include "world/common/SetForeverForestFog.inc.c" +#include "world/common/todo/SetForeverForestFog.inc.c" API_CALLABLE(N(GetPlayerDistFromMapCenter)) { script->varTable[0] = get_xz_dist_to_player(0.0f, 0.0f); 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 dbd6165189..a4b44a9d02 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 @@ -1,7 +1,7 @@ #include "mim_11.h" -#include "world/common/atomic/Pipe.inc.c" -#include "world/common/atomic/Pipe.data.inc.c" +#include "world/common/entity/Pipe.inc.c" +#include "world/common/entity/Pipe.data.inc.c" #include "world/common/atomic/TexturePan.inc.c" #include "world/common/atomic/TexturePan.data.inc.c" diff --git a/src/world/area_nok/nok_01/9C53E0.c b/src/world/area_nok/nok_01/9C53E0.c index 3fc72f8e4f..f11cbc5778 100644 --- a/src/world/area_nok/nok_01/9C53E0.c +++ b/src/world/area_nok/nok_01/9C53E0.c @@ -9,7 +9,7 @@ static char* N(exit_str_1) = "nok_02"; #define CHUCK_QUIZMO_NPC_ID 15 -#include "world/common/enemy/StationaryAI.inc.c" +#include "world/common/enemy/ai/StationaryAI.inc.c" #include "world/common/atomic/ToadHouse.inc.c" @@ -21,9 +21,9 @@ extern EffectInstance* N(Quizmo_VannaTEffect); #include "world/common/atomic/Quizmo.inc.c" -#include "world/common/GetNpcCollisionHeight.inc.c" +#include "world/common/todo/GetNpcCollisionHeight.inc.c" -#include "world/common/AddPlayerHandsOffset.inc.c" +#include "world/common/todo/AddPlayerHandsOffset.inc.c" // Requires data migration #ifdef NON_MATCHING @@ -69,7 +69,7 @@ ApiStatus func_802420B4_9C7494(Evt* script, s32 isInitialCall) { } extern s32 N(LetterDelivery_SavedNpcAnim); -#include "world/common/LetterDelivery.inc.c" +#include "world/common/todo/LetterDelivery.inc.c" ApiStatus func_8024243C_9C781C(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; diff --git a/src/world/area_nok/nok_02/9D7020.c b/src/world/area_nok/nok_02/9D7020.c index 72fa8a6f8c..bf00eb41fc 100644 --- a/src/world/area_nok/nok_02/9D7020.c +++ b/src/world/area_nok/nok_02/9D7020.c @@ -5,20 +5,20 @@ static char* N(exit_str_1) = "nok_03"; static char* N(exit_str_2) = "tik_01"; static char* N(exit_str_3) = ""; -#include "world/common/atomic/Pipe.inc.c" +#include "world/common/entity/Pipe.inc.c" -#include "world/common/StashVars.inc.c" +#include "world/common/todo/StashVars.inc.c" #define NAMESPACE dup_nok_02 -#include "world/common/GetItemName.inc.c" +#include "world/common/todo/GetItemName.inc.c" #define NAMESPACE nok_02 #define NAMESPACE dup_nok_02 -#include "world/common/GetNpcCollisionHeight.inc.c" +#include "world/common/todo/GetNpcCollisionHeight.inc.c" #define NAMESPACE nok_02 #define NAMESPACE dup_nok_02 -#include "world/common/AddPlayerHandsOffset.inc.c" +#include "world/common/todo/AddPlayerHandsOffset.inc.c" #define NAMESPACE nok_02 INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7020", func_80240624_9D7644); diff --git a/src/world/area_nok/nok_02/9D7AA0.c b/src/world/area_nok/nok_02/9D7AA0.c index 7e09fc182b..775350034f 100644 --- a/src/world/area_nok/nok_02/9D7AA0.c +++ b/src/world/area_nok/nok_02/9D7AA0.c @@ -2,7 +2,7 @@ #define CHUCK_QUIZMO_NPC_ID 19 -#include "world/common/enemy/PatrolNoAttackAI.inc.c" +#include "world/common/enemy/ai/PatrolNoAttackAI.inc.c" static char* N(exit_str_0) = "nok_02"; static char* N(exit_str_1) = "obk_09"; @@ -15,9 +15,9 @@ extern EffectInstance* N(Quizmo_VannaTEffect); #include "world/common/atomic/Quizmo.inc.c" -#include "world/common/GetNpcCollisionHeight.inc.c" +#include "world/common/todo/GetNpcCollisionHeight.inc.c" -#include "world/common/AddPlayerHandsOffset.inc.c" +#include "world/common/todo/AddPlayerHandsOffset.inc.c" INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_80242BD0_9D9BF0); @@ -45,9 +45,9 @@ ApiStatus func_80242C5C_9D9C7C(Evt* script, s32 isInitialCall) { } extern s32 N(LetterDelivery_SavedNpcAnim); -#include "world/common/LetterDelivery.inc.c" +#include "world/common/todo/LetterDelivery.inc.c" -#include "world/common/SwitchToPartner.inc.c" +#include "world/common/todo/SwitchToPartner.inc.c" ApiStatus func_80243010_9DA030(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; diff --git a/src/world/area_nok/nok_02/9DA8F0.c b/src/world/area_nok/nok_02/9DA8F0.c index f133e5ad7d..d645dc0fbb 100644 --- a/src/world/area_nok/nok_02/9DA8F0.c +++ b/src/world/area_nok/nok_02/9DA8F0.c @@ -3,11 +3,11 @@ INCLUDE_ASM(s32, "world/area_nok/nok_02/9DA8F0", func_802438D0_9DA8F0); #define NAMESPACE dup2_nok_02 -#include "world/common/GetNpcCollisionHeight.inc.c" +#include "world/common/todo/GetNpcCollisionHeight.inc.c" #define NAMESPACE nok_02 #define NAMESPACE dup2_nok_02 -#include "world/common/AddPlayerHandsOffset.inc.c" +#include "world/common/todo/AddPlayerHandsOffset.inc.c" #define NAMESPACE nok_02 INCLUDE_ASM(s32, "world/area_nok/nok_02/9DA8F0", func_80243BEC_9DAC0C); @@ -57,11 +57,11 @@ ApiStatus func_80243D14_9DAD34(Evt* script, s32 isInitialCall) { } #define NAMESPACE dup2_nok_02 -#include "world/common/StashVars.inc.c" +#include "world/common/todo/StashVars.inc.c" #define NAMESPACE nok_02 #define NAMESPACE dup2_nok_02 -#include "world/common/GetItemName.inc.c" +#include "world/common/todo/GetItemName.inc.c" #define NAMESPACE nok_02 INCLUDE_ASM(s32, "world/area_nok/nok_02/9DA8F0", func_80243EC8_9DAEE8); diff --git a/src/world/area_nok/nok_03/9EB7F0.c b/src/world/area_nok/nok_03/9EB7F0.c index 7c43db57cb..c092532310 100644 --- a/src/world/area_nok/nok_03/9EB7F0.c +++ b/src/world/area_nok/nok_03/9EB7F0.c @@ -3,4 +3,4 @@ static char* N(exit_str_0) = "nok_02"; static char* N(exit_str_1) = "nok_04"; -#include "world/common/enemy/HoppingAI.inc.c" +#include "world/common/enemy/ai/HoppingAI.inc.c" diff --git a/src/world/area_nok/nok_04/9EEA80.c b/src/world/area_nok/nok_04/9EEA80.c index a0ed8452a7..49211569fb 100644 --- a/src/world/area_nok/nok_04/9EEA80.c +++ b/src/world/area_nok/nok_04/9EEA80.c @@ -2,5 +2,5 @@ // TODO(data) //#define PARTY_IMAGE "party_kameki" -//#include "world/common/LoadPartyImage.inc.c" +//#include "world/common/todo/LoadPartyImage.inc.c" INCLUDE_ASM(s32, "world/area_nok/nok_04/9EEA80", func_80240E90_9EEA80); diff --git a/src/world/area_nok/nok_11/9F4A40.c b/src/world/area_nok/nok_11/9F4A40.c index b688e9061d..79cde3e685 100644 --- a/src/world/area_nok/nok_11/9F4A40.c +++ b/src/world/area_nok/nok_11/9F4A40.c @@ -3,9 +3,9 @@ static char* N(exit_str_0) = "mac_01"; static char* N(exit_str_1) = "nok_12"; -#include "world/common/enemy/TackleAI.inc.c" +#include "world/common/enemy/ai/TackleAI.inc.c" -#include "world/common/enemy/FlyingAI.inc.c" +#include "world/common/enemy/ai/FlyingAI.inc.c" #include "common/foliage.inc.c" diff --git a/src/world/area_nok/nok_12/9FA970.c b/src/world/area_nok/nok_12/9FA970.c index 25155db610..c84cc8a105 100644 --- a/src/world/area_nok/nok_12/9FA970.c +++ b/src/world/area_nok/nok_12/9FA970.c @@ -19,4 +19,4 @@ ApiStatus func_80240180_9FA970(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -#include "world/common/SetEntityPosition.inc.c" +#include "world/common/todo/SetEntityPosition.inc.c" diff --git a/src/world/area_nok/nok_12/9FAAE0.c b/src/world/area_nok/nok_12/9FAAE0.c index 51d6262f9a..1cc5e61b52 100644 --- a/src/world/area_nok/nok_12/9FAAE0.c +++ b/src/world/area_nok/nok_12/9FAAE0.c @@ -1,5 +1,5 @@ #include "nok_12.h" -#include "world/common/SetCamera0Flag1000.inc.c" +#include "world/common/todo/SetCamera0Flag1000.inc.c" -#include "world/common/UnsetCamera0Flag1000.inc.c" +#include "world/common/todo/UnsetCamera0Flag1000.inc.c" diff --git a/src/world/area_nok/nok_12/9FAD60.c b/src/world/area_nok/nok_12/9FAD60.c index c7d22525ec..7bd60a7287 100644 --- a/src/world/area_nok/nok_12/9FAD60.c +++ b/src/world/area_nok/nok_12/9FAD60.c @@ -1,7 +1,7 @@ #include "nok_12.h" -#include "world/common/enemy/TackleAI.inc.c" +#include "world/common/enemy/ai/TackleAI.inc.c" -#include "world/common/enemy/KoopaPatrolAI.inc.c" +#include "world/common/enemy/ai/KoopaPatrolAI.inc.c" static char* N(exit_str_0) = "nok_12"; diff --git a/src/world/area_nok/nok_13/A00600.c b/src/world/area_nok/nok_13/A00600.c index 28cecf3ef2..2c31363ef1 100644 --- a/src/world/area_nok/nok_13/A00600.c +++ b/src/world/area_nok/nok_13/A00600.c @@ -5,4 +5,4 @@ static char* N(exit_str_1) = "nok_01"; static char* N(exit_str_2) = "nok_14"; static char* N(exit_str_3) = ""; -#include "world/common/enemy/HoppingAI.inc.c" +#include "world/common/enemy/ai/HoppingAI.inc.c" diff --git a/src/world/area_nok/nok_14/A029C0.c b/src/world/area_nok/nok_14/A029C0.c index f44e15b345..403c8e4146 100644 --- a/src/world/area_nok/nok_14/A029C0.c +++ b/src/world/area_nok/nok_14/A029C0.c @@ -1,5 +1,5 @@ #include "nok_14.h" -#include "world/common/SetCamera0Flag1000.inc.c" +#include "world/common/todo/SetCamera0Flag1000.inc.c" -#include "world/common/UnsetCamera0Flag1000.inc.c" +#include "world/common/todo/UnsetCamera0Flag1000.inc.c" diff --git a/src/world/area_nok/nok_14/A02A00.c b/src/world/area_nok/nok_14/A02A00.c index 4d77aca8d5..d2149a2b59 100644 --- a/src/world/area_nok/nok_14/A02A00.c +++ b/src/world/area_nok/nok_14/A02A00.c @@ -1,5 +1,5 @@ #include "nok_14.h" -#include "world/common/enemy/TackleAI.inc.c" +#include "world/common/enemy/ai/TackleAI.inc.c" -#include "world/common/enemy/ParatroopaAI.inc.c" +#include "world/common/enemy/ai/ParatroopaAI.inc.c" diff --git a/src/world/area_nok/nok_15/A06F00.c b/src/world/area_nok/nok_15/A06F00.c index 2292a87748..420f85c1ce 100644 --- a/src/world/area_nok/nok_15/A06F00.c +++ b/src/world/area_nok/nok_15/A06F00.c @@ -5,8 +5,8 @@ static char* N(exit_str_1) = "trd_00"; static char* N(exit_str_2) = "nok_15"; static char* N(exit_str_3) = ""; -#include "world/common/atomic/Pipe.inc.c" +#include "world/common/entity/Pipe.inc.c" -#include "world/common/enemy/TackleAI.inc.c" +#include "world/common/enemy/ai/TackleAI.inc.c" -#include "world/common/enemy/ParatroopaAI.inc.c" +#include "world/common/enemy/ai/ParatroopaAI.inc.c" diff --git a/src/world/area_obk/obk_01/BBD1A0.c b/src/world/area_obk/obk_01/BBD1A0.c index 01edebae64..9c02f3b660 100644 --- a/src/world/area_obk/obk_01/BBD1A0.c +++ b/src/world/area_obk/obk_01/BBD1A0.c @@ -7,9 +7,9 @@ static char* N(exit_str_3) = "obk_07"; static char* N(exit_str_4) = "obk_08"; static char* N(exit_str_5) = "obk_09"; -#include "world/common/UnsetCamera0MoveFlag1.inc.c" +#include "world/common/todo/UnsetCamera0MoveFlag1.inc.c" -#include "world/common/SetCamera0MoveFlag1.inc.c" +#include "world/common/todo/SetCamera0MoveFlag1.inc.c" INCLUDE_ASM(s32, "world/area_obk/obk_01/BBD1A0", func_80240038_BBD1D8); diff --git a/src/world/area_obk/obk_01/BBD980.c b/src/world/area_obk/obk_01/BBD980.c index b98ec1a4b0..770fe4e408 100644 --- a/src/world/area_obk/obk_01/BBD980.c +++ b/src/world/area_obk/obk_01/BBD980.c @@ -1,12 +1,12 @@ #include "obk_01.h" -#include "world/common/StashVars.inc.c" +#include "world/common/todo/StashVars.inc.c" -#include "world/common/GetItemName.inc.c" +#include "world/common/todo/GetItemName.inc.c" -#include "world/common/GetNpcCollisionHeight.inc.c" +#include "world/common/todo/GetNpcCollisionHeight.inc.c" -#include "world/common/AddPlayerHandsOffset.inc.c" +#include "world/common/todo/AddPlayerHandsOffset.inc.c" INCLUDE_ASM(s32, "world/area_obk/obk_01/BBD980", func_80240B24_BBDCC4); @@ -15,7 +15,7 @@ INCLUDE_ASM(s32, "world/area_obk/obk_01/BBD980", func_80240B78_BBDD18); INCLUDE_ASM(s32, "world/area_obk/obk_01/BBD980", func_80240BB0_BBDD50); extern s32 N(LetterDelivery_SavedNpcAnim); -#include "world/common/LetterDelivery.inc.c" +#include "world/common/todo/LetterDelivery.inc.c" INCLUDE_ASM(s32, "world/area_obk/obk_01/BBD980", func_80240F38_BBE0D8); diff --git a/src/world/area_obk/obk_02/BC2A90.c b/src/world/area_obk/obk_02/BC2A90.c index 7e79efaa6a..09a4990050 100644 --- a/src/world/area_obk/obk_02/BC2A90.c +++ b/src/world/area_obk/obk_02/BC2A90.c @@ -7,6 +7,6 @@ static char* N(exit_str_3) = ""; INCLUDE_ASM(s32, "world/area_obk/obk_02/BC2A90", func_80240000_BC2A90); -#include "world/common/UnkAngleFunc004.inc.c" +#include "world/common/todo/UnkAngleFunc004.inc.c" INCLUDE_ASM(s32, "world/area_obk/obk_02/BC2A90", func_80240194_BC2C24); diff --git a/src/world/area_obk/obk_03/BC4280.c b/src/world/area_obk/obk_03/BC4280.c index fde022eb16..fe79858b55 100644 --- a/src/world/area_obk/obk_03/BC4280.c +++ b/src/world/area_obk/obk_03/BC4280.c @@ -3,6 +3,6 @@ static char* N(exit_str_0) = "obk_02"; static char* N(exit_str_1) = "obk_04"; -#include "world/common/SetEntityPosition.inc.c" +#include "world/common/todo/SetEntityPosition.inc.c" -#include "world/common/GetEntityPosition.inc.c" +#include "world/common/todo/GetEntityPosition.inc.c" diff --git a/src/world/area_obk/obk_03/BC43F0.c b/src/world/area_obk/obk_03/BC43F0.c index b2dce9431a..fe6b7568fa 100644 --- a/src/world/area_obk/obk_03/BC43F0.c +++ b/src/world/area_obk/obk_03/BC43F0.c @@ -1,12 +1,12 @@ #include "obk_03.h" -#include "world/common/StashVars.inc.c" +#include "world/common/todo/StashVars.inc.c" -#include "world/common/GetItemName.inc.c" +#include "world/common/todo/GetItemName.inc.c" -#include "world/common/GetNpcCollisionHeight.inc.c" +#include "world/common/todo/GetNpcCollisionHeight.inc.c" -#include "world/common/AddPlayerHandsOffset.inc.c" +#include "world/common/todo/AddPlayerHandsOffset.inc.c" INCLUDE_ASM(s32, "world/area_obk/obk_03/BC43F0", func_802404B4_BC4734); @@ -34,4 +34,4 @@ ApiStatus func_80240540_BC47C0(Evt* script, s32 isInitialCall) { } extern s32 N(LetterDelivery_SavedNpcAnim); -#include "world/common/LetterDelivery.inc.c" +#include "world/common/todo/LetterDelivery.inc.c" diff --git a/src/world/area_obk/obk_04/BC7EB0.c b/src/world/area_obk/obk_04/BC7EB0.c index 039bcbed7e..7ecf2b2f55 100644 --- a/src/world/area_obk/obk_04/BC7EB0.c +++ b/src/world/area_obk/obk_04/BC7EB0.c @@ -20,9 +20,9 @@ INCLUDE_ASM(s32, "world/area_obk/obk_04/BC7EB0", func_80240624_BC8484); INCLUDE_ASM(s32, "world/area_obk/obk_04/BC7EB0", func_80240910_BC8770); -#include "world/common/StashVars.inc.c" +#include "world/common/todo/StashVars.inc.c" -#include "world/common/GetItemName.inc.c" +#include "world/common/todo/GetItemName.inc.c" INCLUDE_ASM(s32, "world/area_obk/obk_04/BC7EB0", func_80240A58_BC88B8); diff --git a/src/world/area_obk/obk_05/BCD060.c b/src/world/area_obk/obk_05/BCD060.c index 1f38229189..c40efc5c30 100644 --- a/src/world/area_obk/obk_05/BCD060.c +++ b/src/world/area_obk/obk_05/BCD060.c @@ -6,9 +6,9 @@ static char* N(exit_str_0) = "obk_01"; static char* N(exit_str_1) = "obk_06"; -#include "world/common/UnsetCamera0MoveFlag1.inc.c" +#include "world/common/todo/UnsetCamera0MoveFlag1.inc.c" -#include "world/common/SetCamera0MoveFlag1.inc.c" +#include "world/common/todo/SetCamera0MoveFlag1.inc.c" ApiStatus N(RetroJar_AwaitPlayerEntry)(Evt* script, s32 isInitialCall) { if (gCollisionStatus.currentFloor == COLLIDER_o420) { diff --git a/src/world/area_obk/obk_07/BCEBF0.c b/src/world/area_obk/obk_07/BCEBF0.c index bf77c9a864..4eb6ed4342 100644 --- a/src/world/area_obk/obk_07/BCEBF0.c +++ b/src/world/area_obk/obk_07/BCEBF0.c @@ -3,10 +3,10 @@ static char* N(exit_str_0) = "obk_01"; static char* N(exit_str_1) = ""; -#include "world/common/StashVars.inc.c" +#include "world/common/todo/StashVars.inc.c" -#include "world/common/GetItemName.inc.c" +#include "world/common/todo/GetItemName.inc.c" -#include "world/common/SomeItemEntityFunc.inc.c" +#include "world/common/todo/SomeItemEntityFunc.inc.c" -#include "world/common/IsItemBadge.inc.c" +#include "world/common/todo/IsItemBadge.inc.c" diff --git a/src/world/area_obk/obk_07/BCEEB0.c b/src/world/area_obk/obk_07/BCEEB0.c index 7c031deee0..27f3272b2e 100644 --- a/src/world/area_obk/obk_07/BCEEB0.c +++ b/src/world/area_obk/obk_07/BCEEB0.c @@ -2,6 +2,6 @@ INCLUDE_ASM(s32, "world/area_obk/obk_07/BCEEB0", func_802402C0_BCEEB0); -#include "world/common/UnkAngleFunc004.inc.c" +#include "world/common/todo/UnkAngleFunc004.inc.c" INCLUDE_ASM(s32, "world/area_obk/obk_07/BCEEB0", func_80240454_BCF044); diff --git a/src/world/area_obk/obk_08/BD3870.c b/src/world/area_obk/obk_08/BD3870.c index 1aefb8e735..98ec01c165 100644 --- a/src/world/area_obk/obk_08/BD3870.c +++ b/src/world/area_obk/obk_08/BD3870.c @@ -1,6 +1,6 @@ #include "obk_08.h" -#include "world/common/UnkFoldFunc.inc.c" +#include "world/common/todo/UnkFoldFunc.inc.c" INCLUDE_ASM(s32, "world/area_obk/obk_08/BD3870", func_802403DC_BD3C4C); diff --git a/src/world/area_omo/omo_02/D9D4D0.c b/src/world/area_omo/omo_02/D9D4D0.c index d2eb658db3..f66e908b21 100644 --- a/src/world/area_omo/omo_02/D9D4D0.c +++ b/src/world/area_omo/omo_02/D9D4D0.c @@ -3,6 +3,6 @@ static char* N(exit_str_0) = "omo_10"; static char* N(exit_str_1) = "omo_14"; -#include "world/common/UnsetCamera0MoveFlag1.inc.c" +#include "world/common/todo/UnsetCamera0MoveFlag1.inc.c" -#include "world/common/SetCamera0MoveFlag1.inc.c" +#include "world/common/todo/SetCamera0MoveFlag1.inc.c" diff --git a/src/world/area_omo/omo_02/D9D510.c b/src/world/area_omo/omo_02/D9D510.c index 067e3598a8..2f111bdadd 100644 --- a/src/world/area_omo/omo_02/D9D510.c +++ b/src/world/area_omo/omo_02/D9D510.c @@ -6,12 +6,12 @@ INCLUDE_ASM(s32, "world/area_omo/omo_02/D9D510", func_802402C0_D9D790); INCLUDE_ASM(s32, "world/area_omo/omo_02/D9D510", func_8024043C_D9D90C); -#include "world/common/enemy/ShyGuyWanderAI.inc.c" +#include "world/common/enemy/ai/ShyGuyWanderAI.inc.c" -#include "world/common/enemy/StationaryAI.inc.c" +#include "world/common/enemy/ai/StationaryAI.inc.c" -#include "world/common/enemy/RangedAttackAI.inc.c" +#include "world/common/enemy/ai/RangedAttackAI.inc.c" -#include "world/common/SetNpcB5_3.inc.c" +#include "world/common/todo/SetNpcB5_3.inc.c" -#include "world/common/GetEncounterEnemyIsOwner.inc.c" +#include "world/common/todo/GetEncounterEnemyIsOwner.inc.c" diff --git a/src/world/area_omo/omo_03/DA5240.c b/src/world/area_omo/omo_03/DA5240.c index 4e09f15435..6c4d908097 100644 --- a/src/world/area_omo/omo_03/DA5240.c +++ b/src/world/area_omo/omo_03/DA5240.c @@ -11,4 +11,4 @@ static char* N(exit_str_7) = "omo_16"; static char* N(exit_str_8) = "mac_04\0"; static char* N(exit_str_9) = "jan_04"; -#include "world/common/UnsetCamera0MoveFlag1.inc.c" +#include "world/common/todo/UnsetCamera0MoveFlag1.inc.c" diff --git a/src/world/area_omo/omo_03/DA5260.c b/src/world/area_omo/omo_03/DA5260.c index 5a60ac682a..3432dec134 100644 --- a/src/world/area_omo/omo_03/DA5260.c +++ b/src/world/area_omo/omo_03/DA5260.c @@ -1,7 +1,7 @@ #include "omo_03.h" #define NAMESPACE dup_omo_03 -#include "world/common/UnsetCamera0MoveFlag1.inc.c" +#include "world/common/todo/UnsetCamera0MoveFlag1.inc.c" #define NAMESPACE omo_03 #include "common/SetAngleClamped.inc.c" diff --git a/src/world/area_omo/omo_04/DAD400.c b/src/world/area_omo/omo_04/DAD400.c index 2d4a7b2fca..a03be3847f 100644 --- a/src/world/area_omo/omo_04/DAD400.c +++ b/src/world/area_omo/omo_04/DAD400.c @@ -3,17 +3,17 @@ static char* N(exit_str_0) = "omo_03"; static char* N(exit_str_1) = ""; -#include "world/common/StashVars.inc.c" +#include "world/common/todo/StashVars.inc.c" -#include "world/common/GetItemName.inc.c" +#include "world/common/todo/GetItemName.inc.c" -#include "world/common/SomeItemEntityFunc.inc.c" +#include "world/common/todo/SomeItemEntityFunc.inc.c" -#include "world/common/IsItemBadge.inc.c" +#include "world/common/todo/IsItemBadge.inc.c" -#include "world/common/UnsetCamera0MoveFlag1.inc.c" +#include "world/common/todo/UnsetCamera0MoveFlag1.inc.c" -#include "world/common/SetCamera0MoveFlag1.inc.c" +#include "world/common/todo/SetCamera0MoveFlag1.inc.c" ApiStatus func_802402F4_DAD6F4(Evt* script, s32 isInitialCall) { f32 playerVx = gPlayerStatus.currentSpeed * 5.0f * sin_deg(gPlayerStatus.targetYaw); @@ -24,13 +24,13 @@ ApiStatus func_802402F4_DAD6F4(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -#include "world/common/enemy/FlyingAI.inc.c" +#include "world/common/enemy/ai/FlyingAI.inc.c" -#include "world/common/enemy/ShyGuyWanderAI.inc.c" +#include "world/common/enemy/ai/ShyGuyWanderAI.inc.c" const s32 N(pad_8)[] = { 0, 0 }; static char* N(exit_str_2) = "omo_04"; -#include "world/common/SetCamera0Flag1000.inc.c" +#include "world/common/todo/SetCamera0Flag1000.inc.c" -#include "world/common/UnsetCamera0Flag1000.inc.c" +#include "world/common/todo/UnsetCamera0Flag1000.inc.c" diff --git a/src/world/area_omo/omo_04/DAF240.c b/src/world/area_omo/omo_04/DAF240.c index d4a0b807fd..2bf422ca12 100644 --- a/src/world/area_omo/omo_04/DAF240.c +++ b/src/world/area_omo/omo_04/DAF240.c @@ -1,4 +1,4 @@ #include "omo_04.h" #define UNK_NPC_POS_FUNC_NUM 2 -#include "world/common/UnkNpcPosFunc.inc.c" +#include "world/common/todo/UnkNpcPosFunc.inc.c" diff --git a/src/world/area_omo/omo_05/DB22C0.c b/src/world/area_omo/omo_05/DB22C0.c index a234776c30..7cfdfd627b 100644 --- a/src/world/area_omo/omo_05/DB22C0.c +++ b/src/world/area_omo/omo_05/DB22C0.c @@ -3,15 +3,15 @@ static char* N(exit_str_0) = "omo_17"; static char* N(exit_str_1) = ""; -#include "world/common/enemy/ShyGuyWanderAI.inc.c" +#include "world/common/enemy/ai/ShyGuyWanderAI.inc.c" -#include "world/common/enemy/GrooveGuyAI.inc.c" +#include "world/common/enemy/ai/GrooveGuyAI.inc.c" -#include "world/common/enemy/FlyingAI.inc.c" +#include "world/common/enemy/ai/FlyingAI.inc.c" -#include "world/common/GetNpcCollisionHeight.inc.c" +#include "world/common/todo/GetNpcCollisionHeight.inc.c" -#include "world/common/AddPlayerHandsOffset.inc.c" +#include "world/common/todo/AddPlayerHandsOffset.inc.c" INCLUDE_ASM(s32, "world/area_omo/omo_05/DB22C0", func_80242178_DB4438); diff --git a/src/world/area_omo/omo_06/DB7910.c b/src/world/area_omo/omo_06/DB7910.c index 3fe1e11dfa..04b0f2e779 100644 --- a/src/world/area_omo/omo_06/DB7910.c +++ b/src/world/area_omo/omo_06/DB7910.c @@ -9,7 +9,7 @@ static char* N(exit_str_5) = "omo_03"; static char* N(exit_str_6) = "omo_16"; static char* N(exit_str_7) = ""; -#include "world/common/UnsetCamera0MoveFlag1.inc.c" +#include "world/common/todo/UnsetCamera0MoveFlag1.inc.c" #include "common/SetAngleClamped.inc.c" diff --git a/src/world/area_omo/omo_06/DB8180.c b/src/world/area_omo/omo_06/DB8180.c index 63bc13b608..be69431266 100644 --- a/src/world/area_omo/omo_06/DB8180.c +++ b/src/world/area_omo/omo_06/DB8180.c @@ -1,9 +1,9 @@ #include "omo_06.h" -#include "world/common/StashVars.inc.c" +#include "world/common/todo/StashVars.inc.c" -#include "world/common/GetItemName.inc.c" +#include "world/common/todo/GetItemName.inc.c" -#include "world/common/SomeItemEntityFunc.inc.c" +#include "world/common/todo/SomeItemEntityFunc.inc.c" -#include "world/common/IsItemBadge.inc.c" +#include "world/common/todo/IsItemBadge.inc.c" diff --git a/src/world/area_omo/omo_07/DBD2B0.c b/src/world/area_omo/omo_07/DBD2B0.c index b55fdee82d..55e8d1d766 100644 --- a/src/world/area_omo/omo_07/DBD2B0.c +++ b/src/world/area_omo/omo_07/DBD2B0.c @@ -3,14 +3,14 @@ static char* N(exit_str_0) = "omo_06"; static char* N(exit_str_1) = ""; -#include "world/common/enemy/ShyGuyWanderAI.inc.c" +#include "world/common/enemy/ai/ShyGuyWanderAI.inc.c" -#include "world/common/enemy/ShyGuyPatrolAI.inc.c" +#include "world/common/enemy/ai/ShyGuyPatrolAI.inc.c" -#include "world/common/enemy/FlyingAI.inc.c" +#include "world/common/enemy/ai/FlyingAI.inc.c" -#include "world/common/SetCamera0Flag1000.inc.c" +#include "world/common/todo/SetCamera0Flag1000.inc.c" -#include "world/common/UnsetCamera0Flag1000.inc.c" +#include "world/common/todo/UnsetCamera0Flag1000.inc.c" INCLUDE_ASM(s32, "world/area_omo/omo_07/DBD2B0", func_80242EA8_DC0158); diff --git a/src/world/area_omo/omo_07/DC01D0.c b/src/world/area_omo/omo_07/DC01D0.c index 614ff5b42a..9447223651 100644 --- a/src/world/area_omo/omo_07/DC01D0.c +++ b/src/world/area_omo/omo_07/DC01D0.c @@ -2,14 +2,14 @@ static char* N(exit_str_2) = "omo_07"; -#include "world/common/StashVars.inc.c" +#include "world/common/todo/StashVars.inc.c" -#include "world/common/GetItemName.inc.c" +#include "world/common/todo/GetItemName.inc.c" -#include "world/common/SomeItemEntityFunc.inc.c" +#include "world/common/todo/SomeItemEntityFunc.inc.c" -#include "world/common/IsItemBadge.inc.c" +#include "world/common/todo/IsItemBadge.inc.c" -#include "world/common/UnsetCamera0MoveFlag1.inc.c" +#include "world/common/todo/UnsetCamera0MoveFlag1.inc.c" -#include "world/common/SetCamera0MoveFlag1.inc.c" +#include "world/common/todo/SetCamera0MoveFlag1.inc.c" diff --git a/src/world/area_omo/omo_07/DC04D0.c b/src/world/area_omo/omo_07/DC04D0.c index d5747baa3e..9ea97cc7b6 100644 --- a/src/world/area_omo/omo_07/DC04D0.c +++ b/src/world/area_omo/omo_07/DC04D0.c @@ -1,4 +1,4 @@ #include "omo_07.h" #define UNK_NPC_POS_FUNC_NUM 7 -#include "world/common/UnkNpcPosFunc.inc.c" +#include "world/common/todo/UnkNpcPosFunc.inc.c" diff --git a/src/world/area_omo/omo_08/DC43D0.c b/src/world/area_omo/omo_08/DC43D0.c index 421d524288..6fdb08b70c 100644 --- a/src/world/area_omo/omo_08/DC43D0.c +++ b/src/world/area_omo/omo_08/DC43D0.c @@ -7,7 +7,7 @@ static char* N(exit_str_3) = "omo_06"; static char* N(exit_str_4) = "omo_03"; static char* N(exit_str_5) = "omo_16"; -#include "world/common/UnsetCamera0MoveFlag1.inc.c" +#include "world/common/todo/UnsetCamera0MoveFlag1.inc.c" #include "common/SetAngleClamped.inc.c" diff --git a/src/world/area_omo/omo_08/DC4C40.c b/src/world/area_omo/omo_08/DC4C40.c index 47bcef9f11..137c964c7a 100644 --- a/src/world/area_omo/omo_08/DC4C40.c +++ b/src/world/area_omo/omo_08/DC4C40.c @@ -1,3 +1,3 @@ #include "omo_08.h" -#include "world/common/enemy/ShyGuyWanderAI.inc.c" +#include "world/common/enemy/ai/ShyGuyWanderAI.inc.c" diff --git a/src/world/area_omo/omo_09/DCD3F0.c b/src/world/area_omo/omo_09/DCD3F0.c index 9cd64a7bc4..df7801a79c 100644 --- a/src/world/area_omo/omo_09/DCD3F0.c +++ b/src/world/area_omo/omo_09/DCD3F0.c @@ -1,9 +1,9 @@ #include "omo_09.h" -#include "world/common/StashVars.inc.c" +#include "world/common/todo/StashVars.inc.c" -#include "world/common/GetItemName.inc.c" +#include "world/common/todo/GetItemName.inc.c" -#include "world/common/SomeItemEntityFunc.inc.c" +#include "world/common/todo/SomeItemEntityFunc.inc.c" -#include "world/common/IsItemBadge.inc.c" +#include "world/common/todo/IsItemBadge.inc.c" diff --git a/src/world/area_omo/omo_09/DCD6B0.c b/src/world/area_omo/omo_09/DCD6B0.c index 0d2821b1f1..e3bbae8caf 100644 --- a/src/world/area_omo/omo_09/DCD6B0.c +++ b/src/world/area_omo/omo_09/DCD6B0.c @@ -1,19 +1,19 @@ #include "omo_09.h" -#include "world/common/enemy/ShyGuyWanderAI.inc.c" +#include "world/common/enemy/ai/ShyGuyWanderAI.inc.c" -#include "world/common/enemy/ShyGuyPatrolAI.inc.c" +#include "world/common/enemy/ai/ShyGuyPatrolAI.inc.c" -#include "world/common/enemy/RangedAttackAI.inc.c" +#include "world/common/enemy/ai/RangedAttackAI.inc.c" -#include "world/common/SetNpcB5_3.inc.c" +#include "world/common/todo/SetNpcB5_3.inc.c" -#include "world/common/GetEncounterEnemyIsOwner.inc.c" +#include "world/common/todo/GetEncounterEnemyIsOwner.inc.c" #define NAMESPACE dup_omo_09 -#include "world/common/SetNpcB5_3.inc.c" +#include "world/common/todo/SetNpcB5_3.inc.c" #define NAMESPACE omo_09 -#include "world/common/SetCamera0Flag1000.inc.c" +#include "world/common/todo/SetCamera0Flag1000.inc.c" -#include "world/common/UnsetCamera0Flag1000.inc.c" +#include "world/common/todo/UnsetCamera0Flag1000.inc.c" diff --git a/src/world/area_omo/omo_09/DD02E0.c b/src/world/area_omo/omo_09/DD02E0.c index c81d996609..bde907a884 100644 --- a/src/world/area_omo/omo_09/DD02E0.c +++ b/src/world/area_omo/omo_09/DD02E0.c @@ -3,4 +3,4 @@ static char* N(exit_str_0) = "omo_09"; #define UNK_NPC_POS_FUNC_NUM 7 -#include "world/common/UnkNpcPosFunc.inc.c" +#include "world/common/todo/UnkNpcPosFunc.inc.c" diff --git a/src/world/area_omo/omo_10/DD79B0.c b/src/world/area_omo/omo_10/DD79B0.c index 2b87dda9f0..5728c31b6e 100644 --- a/src/world/area_omo/omo_10/DD79B0.c +++ b/src/world/area_omo/omo_10/DD79B0.c @@ -9,7 +9,7 @@ static char* N(exit_str_5) = "omo_03"; static char* N(exit_str_6) = "omo_16"; static char* N(exit_str_7) = ""; -#include "world/common/UnsetCamera0MoveFlag1.inc.c" +#include "world/common/todo/UnsetCamera0MoveFlag1.inc.c" #include "common/SetAngleClamped.inc.c" diff --git a/src/world/area_omo/omo_11/DDCFC0.c b/src/world/area_omo/omo_11/DDCFC0.c index 2b68c568a7..1d7ff5bfac 100644 --- a/src/world/area_omo/omo_11/DDCFC0.c +++ b/src/world/area_omo/omo_11/DDCFC0.c @@ -1,3 +1,3 @@ #include "omo_11.h" -#include "world/common/atomic/SuperBlock.inc.c" +#include "world/common/entity/SuperBlock.inc.c" diff --git a/src/world/area_omo/omo_12/DDF310.c b/src/world/area_omo/omo_12/DDF310.c index e9dd4b351d..ae09a1b292 100644 --- a/src/world/area_omo/omo_12/DDF310.c +++ b/src/world/area_omo/omo_12/DDF310.c @@ -2,11 +2,11 @@ #include "world/common/util/ChangeNpcToPartner.inc.c" -#include "world/common/atomic/DarkRoom.inc.c" +#include "world/common/atomic/CreateDarkness.inc.c" -#include "world/common/SetCamera0Flag1000.inc.c" +#include "world/common/todo/SetCamera0Flag1000.inc.c" -#include "world/common/UnsetCamera0Flag1000.inc.c" +#include "world/common/todo/UnsetCamera0Flag1000.inc.c" INCLUDE_ASM(s32, "world/area_omo/omo_12/DDF310", func_80240314_DDF624); diff --git a/src/world/area_omo/omo_12/DDF730.c b/src/world/area_omo/omo_12/DDF730.c index b6c36faf22..ff841480dd 100644 --- a/src/world/area_omo/omo_12/DDF730.c +++ b/src/world/area_omo/omo_12/DDF730.c @@ -4,5 +4,5 @@ static char* N(exit_str_0) = "omo_11\0"; // TODO(data) //#define PARTY_IMAGE "party_akari" -//#include "world/common/LoadPartyImage.inc.c" +//#include "world/common/todo/LoadPartyImage.inc.c" INCLUDE_ASM(s32, "world/area_omo/omo_12/DDF730", func_80240420_DDF730); diff --git a/src/world/area_omo/omo_13/DE2710.c b/src/world/area_omo/omo_13/DE2710.c index 667b869f4a..e6bac56750 100644 --- a/src/world/area_omo/omo_13/DE2710.c +++ b/src/world/area_omo/omo_13/DE2710.c @@ -1,12 +1,12 @@ #include "omo_13.h" -#include "world/common/enemy/ShyGuyWanderAI.inc.c" +#include "world/common/enemy/ai/ShyGuyWanderAI.inc.c" -#include "world/common/enemy/GrooveGuyAI.inc.c" +#include "world/common/enemy/ai/GrooveGuyAI.inc.c" -#include "world/common/GetNpcCollisionHeight.inc.c" +#include "world/common/todo/GetNpcCollisionHeight.inc.c" -#include "world/common/AddPlayerHandsOffset.inc.c" +#include "world/common/todo/AddPlayerHandsOffset.inc.c" // matches, needs data migration #ifdef NON_MATCHING diff --git a/src/world/area_omo/omo_13/DE36C0.c b/src/world/area_omo/omo_13/DE36C0.c index 29551c6cc5..f6cf50051e 100644 --- a/src/world/area_omo/omo_13/DE36C0.c +++ b/src/world/area_omo/omo_13/DE36C0.c @@ -1,9 +1,9 @@ #include "omo_13.h" -#include "world/common/StashVars.inc.c" +#include "world/common/todo/StashVars.inc.c" -#include "world/common/GetItemName.inc.c" +#include "world/common/todo/GetItemName.inc.c" -#include "world/common/SomeItemEntityFunc.inc.c" +#include "world/common/todo/SomeItemEntityFunc.inc.c" -#include "world/common/IsItemBadge.inc.c" +#include "world/common/todo/IsItemBadge.inc.c" diff --git a/src/world/area_omo/omo_14/DE56B0.c b/src/world/area_omo/omo_14/DE56B0.c index bbe213e190..ec3b17d3ba 100644 --- a/src/world/area_omo/omo_14/DE56B0.c +++ b/src/world/area_omo/omo_14/DE56B0.c @@ -3,4 +3,4 @@ static char* N(exit_str_0) = "omo_02"; static char* N(exit_str_1) = "omo_15"; -#include "world/common/atomic/DarkRoom.inc.c" +#include "world/common/atomic/CreateDarkness.inc.c" diff --git a/src/world/area_omo/omo_15/DE8770.c b/src/world/area_omo/omo_15/DE8770.c index e44879f386..87343275e7 100644 --- a/src/world/area_omo/omo_15/DE8770.c +++ b/src/world/area_omo/omo_15/DE8770.c @@ -1,6 +1,6 @@ #include "omo_15.h" -#include "world/common/StarSpiritEffectFunc.inc.c" +#include "world/common/todo/StarSpiritEffectFunc.inc.c" static char* N(exit_str_0) = "kmr_23"; static char* N(exit_str_1) = "omo_14"; diff --git a/src/world/area_omo/omo_16/DEBED0.c b/src/world/area_omo/omo_16/DEBED0.c index 399827bf5a..c3e0f67ae1 100644 --- a/src/world/area_omo/omo_16/DEBED0.c +++ b/src/world/area_omo/omo_16/DEBED0.c @@ -5,7 +5,7 @@ static char* N(exit_str_1) = "omo_08"; static char* N(exit_str_2) = "omo_06"; static char* N(exit_str_3) = "omo_03"; -#include "world/common/UnsetCamera0MoveFlag1.inc.c" +#include "world/common/todo/UnsetCamera0MoveFlag1.inc.c" #include "common/SetAngleClamped.inc.c" diff --git a/src/world/area_omo/omo_17/DEEEA0.c b/src/world/area_omo/omo_17/DEEEA0.c index 79450ead0b..bab02a92c0 100644 --- a/src/world/area_omo/omo_17/DEEEA0.c +++ b/src/world/area_omo/omo_17/DEEEA0.c @@ -9,7 +9,7 @@ static char* N(exit_str_5) = "omo_03"; static char* N(exit_str_6) = "omo_05\0"; static char* N(exit_str_7) = ""; -#include "world/common/UnsetCamera0MoveFlag1.inc.c" +#include "world/common/todo/UnsetCamera0MoveFlag1.inc.c" #include "common/SetAngleClamped.inc.c" diff --git a/src/world/area_omo/omo_17/DEF400.c b/src/world/area_omo/omo_17/DEF400.c index 8cb1e8a52e..4825b56bd0 100644 --- a/src/world/area_omo/omo_17/DEF400.c +++ b/src/world/area_omo/omo_17/DEF400.c @@ -1,13 +1,13 @@ #include "omo_17.h" -#include "world/common/enemy/ShyGuyWanderAI.inc.c" +#include "world/common/enemy/ai/ShyGuyWanderAI.inc.c" -#include "world/common/enemy/GrooveGuyAI.inc.c" +#include "world/common/enemy/ai/GrooveGuyAI.inc.c" -#include "world/common/enemy/FlyingAI.inc.c" +#include "world/common/enemy/ai/FlyingAI.inc.c" -#include "world/common/enemy/RangedAttackAI.inc.c" +#include "world/common/enemy/ai/RangedAttackAI.inc.c" -#include "world/common/SetNpcB5_3.inc.c" +#include "world/common/todo/SetNpcB5_3.inc.c" -#include "world/common/GetEncounterEnemyIsOwner.inc.c" +#include "world/common/todo/GetEncounterEnemyIsOwner.inc.c" diff --git a/src/world/area_osr/osr_00/AAC830.c b/src/world/area_osr/osr_00/AAC830.c index d8483e3ac2..45c69f2866 100644 --- a/src/world/area_osr/osr_00/AAC830.c +++ b/src/world/area_osr/osr_00/AAC830.c @@ -13,4 +13,4 @@ ApiStatus func_8024030C_AACB3C(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -#include "world/common/SpawnSunEffect.inc.c" +#include "world/common/todo/SpawnSunEffect.inc.c" diff --git a/src/world/area_osr/osr_01/AB0350.c b/src/world/area_osr/osr_01/AB0350.c index 520619d325..a3efe1a869 100644 --- a/src/world/area_osr/osr_01/AB0350.c +++ b/src/world/area_osr/osr_01/AB0350.c @@ -1,12 +1,12 @@ #include "osr_01.h" -#include "world/common/StashVars.inc.c" +#include "world/common/todo/StashVars.inc.c" -#include "world/common/GetItemName.inc.c" +#include "world/common/todo/GetItemName.inc.c" -#include "world/common/GetNpcCollisionHeight.inc.c" +#include "world/common/todo/GetNpcCollisionHeight.inc.c" -#include "world/common/AddPlayerHandsOffset.inc.c" +#include "world/common/todo/AddPlayerHandsOffset.inc.c" extern s32 D_8024121C_AB120C; extern s32 D_80241220_AB1210; @@ -48,4 +48,4 @@ INCLUDE_ASM(s32, "world/area_osr/osr_01/AB0350", func_802406F8_AB06E8); INCLUDE_ASM(s32, "world/area_osr/osr_01/AB0350", func_80240730_AB0720); extern s32 N(LetterDelivery_SavedNpcAnim); -#include "world/common/LetterDelivery.inc.c" +#include "world/common/todo/LetterDelivery.inc.c" diff --git a/src/world/area_osr/osr_02/AB2170.c b/src/world/area_osr/osr_02/AB2170.c index 17b79e2ae4..8ce2577cba 100644 --- a/src/world/area_osr/osr_02/AB2170.c +++ b/src/world/area_osr/osr_02/AB2170.c @@ -5,4 +5,4 @@ static char* N(exit_str_1) = "kkj_10"; static char* N(exit_str_2) = "hos_10"; static char* N(exit_str_3) = ""; -#include "world/common/SetPlayerSpriteSet2.inc.c" +#include "world/common/todo/SetPlayerSpriteSet2.inc.c" diff --git a/src/world/area_osr/osr_02/AB2290.c b/src/world/area_osr/osr_02/AB2290.c index c92e8980df..557eb1d135 100644 --- a/src/world/area_osr/osr_02/AB2290.c +++ b/src/world/area_osr/osr_02/AB2290.c @@ -1,3 +1,3 @@ #include "osr_02.h" -#include "world/common/GetPeachDisguise.inc.c" +#include "world/common/todo/GetPeachDisguise.inc.c" diff --git a/src/world/area_osr/osr_03/AB6290.c b/src/world/area_osr/osr_03/AB6290.c index 7dd60e09dd..a964a170e4 100644 --- a/src/world/area_osr/osr_03/AB6290.c +++ b/src/world/area_osr/osr_03/AB6290.c @@ -9,4 +9,4 @@ static char* N(exit_str_5) = "kkj_15"; static char* N(exit_str_6) = "hos_10\0"; static char* N(exit_str_7) = ""; -#include "world/common/SetPlayerSpriteSet2.inc.c" +#include "world/common/todo/SetPlayerSpriteSet2.inc.c" diff --git a/src/world/area_pra/pra_01/D4D040.c b/src/world/area_pra/pra_01/D4D040.c index af0b12abac..516a5629bd 100644 --- a/src/world/area_pra/pra_01/D4D040.c +++ b/src/world/area_pra/pra_01/D4D040.c @@ -5,4 +5,4 @@ static char* N(exit_str_1) = "pra_15"; static char* N(exit_str_2) = "pra_02"; static char* N(exit_str_3) = ""; -#include "world/common/SetGameStatusUnk84_1.inc.c" +#include "world/common/todo/SetGameStatusUnk84_1.inc.c" diff --git a/src/world/area_pra/pra_01/D4D060.c b/src/world/area_pra/pra_01/D4D060.c index b7097a91e5..6810e1a359 100644 --- a/src/world/area_pra/pra_01/D4D060.c +++ b/src/world/area_pra/pra_01/D4D060.c @@ -9,9 +9,9 @@ ApiStatus func_80240F60_D4DFA0(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -#include "world/common/GetNpcCollisionHeight.inc.c" +#include "world/common/todo/GetNpcCollisionHeight.inc.c" -#include "world/common/AddPlayerHandsOffset.inc.c" +#include "world/common/todo/AddPlayerHandsOffset.inc.c" INCLUDE_ASM(s32, "world/area_pra/pra_01/D4D060", func_802411AC_D4E1EC); diff --git a/src/world/area_pra/pra_02/D4FFF0.c b/src/world/area_pra/pra_02/D4FFF0.c index 786fe235e1..2642c4d9ac 100644 --- a/src/world/area_pra/pra_02/D4FFF0.c +++ b/src/world/area_pra/pra_02/D4FFF0.c @@ -7,4 +7,4 @@ static char* N(exit_str_3) = "pra_13"; static char* N(exit_str_4) = "pra_04"; static char* N(exit_str_5) = ""; -#include "world/common/SetGameStatusUnk84_1.inc.c" +#include "world/common/todo/SetGameStatusUnk84_1.inc.c" diff --git a/src/world/area_pra/pra_02/D50010.c b/src/world/area_pra/pra_02/D50010.c index 75d2ccc6a1..fec9af77c8 100644 --- a/src/world/area_pra/pra_02/D50010.c +++ b/src/world/area_pra/pra_02/D50010.c @@ -2,9 +2,9 @@ #include "world/common/atomic/Reflection.inc.c" -#include "world/common/GetNpcCollisionHeight.inc.c" +#include "world/common/todo/GetNpcCollisionHeight.inc.c" -#include "world/common/AddPlayerHandsOffset.inc.c" +#include "world/common/todo/AddPlayerHandsOffset.inc.c" INCLUDE_ASM(s32, "world/area_pra/pra_02/D50010", func_8024114C_D5113C); @@ -33,16 +33,16 @@ ApiStatus func_80241274_D51264(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -#include "world/common/SetEntityPositionF.inc.c" +#include "world/common/todo/SetEntityPositionF.inc.c" -#include "world/common/GetEntityPosition.inc.c" +#include "world/common/todo/GetEntityPosition.inc.c" -#include "world/common/UnkFunc44.inc.c" +#include "world/common/todo/UnkFunc44.inc.c" INCLUDE_ASM(s32, "world/area_pra/pra_02/D50010", func_802414A8_D51498); -#include "world/common/RemovePadlock.inc.c" +#include "world/common/todo/RemovePadlock.inc.c" #define NAMESPACE dup_pra_02 -#include "world/common/GetEntityPosition.inc.c" +#include "world/common/todo/GetEntityPosition.inc.c" #define NAMESPACE pra_02 diff --git a/src/world/area_pra/pra_03/D53CB0.c b/src/world/area_pra/pra_03/D53CB0.c index 9dea8e3ad4..8f15d534b1 100644 --- a/src/world/area_pra/pra_03/D53CB0.c +++ b/src/world/area_pra/pra_03/D53CB0.c @@ -5,4 +5,4 @@ static char* N(exit_str_1) = "pra_38"; static char* N(exit_str_2) = "pra_09"; static char* N(exit_str_3) = ""; -#include "world/common/SetGameStatusUnk84_1.inc.c" +#include "world/common/todo/SetGameStatusUnk84_1.inc.c" diff --git a/src/world/area_pra/pra_04/D54690.c b/src/world/area_pra/pra_04/D54690.c index 4380d61bb9..38e57eeabc 100644 --- a/src/world/area_pra/pra_04/D54690.c +++ b/src/world/area_pra/pra_04/D54690.c @@ -5,4 +5,4 @@ static char* N(exit_str_1) = "pra_39"; static char* N(exit_str_2) = "pra_10"; static char* N(exit_str_3) = ""; -#include "world/common/SetGameStatusUnk84_1.inc.c" +#include "world/common/todo/SetGameStatusUnk84_1.inc.c" diff --git a/src/world/area_pra/pra_04/D54840.c b/src/world/area_pra/pra_04/D54840.c index 4320e7c1c4..c190a28acf 100644 --- a/src/world/area_pra/pra_04/D54840.c +++ b/src/world/area_pra/pra_04/D54840.c @@ -1,3 +1,3 @@ #include "pra_04.h" -#include "world/common/UnkFunc001.inc.c" +#include "world/common/todo/UnkFunc001.inc.c" diff --git a/src/world/area_pra/pra_05/D55BB0.c b/src/world/area_pra/pra_05/D55BB0.c index b6ac737773..7e3cb184dd 100644 --- a/src/world/area_pra/pra_05/D55BB0.c +++ b/src/world/area_pra/pra_05/D55BB0.c @@ -3,4 +3,4 @@ static char* N(exit_str_0) = "pra_38"; static char* N(exit_str_1) = ""; -#include "world/common/SetGameStatusUnk84_1.inc.c" +#include "world/common/todo/SetGameStatusUnk84_1.inc.c" diff --git a/src/world/area_pra/pra_05/D55BD0.c b/src/world/area_pra/pra_05/D55BD0.c index fb6a689785..0355b3a1d5 100644 --- a/src/world/area_pra/pra_05/D55BD0.c +++ b/src/world/area_pra/pra_05/D55BD0.c @@ -2,10 +2,10 @@ #include "world/common/atomic/Reflection.inc.c" -#include "world/common/StashVars.inc.c" +#include "world/common/todo/StashVars.inc.c" -#include "world/common/GetItemName.inc.c" +#include "world/common/todo/GetItemName.inc.c" -#include "world/common/SomeItemEntityFunc.inc.c" +#include "world/common/todo/SomeItemEntityFunc.inc.c" -#include "world/common/IsItemBadge.inc.c" +#include "world/common/todo/IsItemBadge.inc.c" diff --git a/src/world/area_pra/pra_09/D58890.c b/src/world/area_pra/pra_09/D58890.c index f2f9ad3efb..c8fdb6a616 100644 --- a/src/world/area_pra/pra_09/D58890.c +++ b/src/world/area_pra/pra_09/D58890.c @@ -3,4 +3,4 @@ static char* N(exit_str_0) = "pra_03"; static char* N(exit_str_1) = "pra_11"; -#include "world/common/SetGameStatusUnk84_1.inc.c" +#include "world/common/todo/SetGameStatusUnk84_1.inc.c" diff --git a/src/world/area_pra/pra_09/D588B0.c b/src/world/area_pra/pra_09/D588B0.c index ef5bcf1d5d..9485ff4018 100644 --- a/src/world/area_pra/pra_09/D588B0.c +++ b/src/world/area_pra/pra_09/D588B0.c @@ -2,9 +2,9 @@ #include "world/common/atomic/Reflection.inc.c" -#include "world/common/GetNpcCollisionHeight.inc.c" +#include "world/common/todo/GetNpcCollisionHeight.inc.c" -#include "world/common/AddPlayerHandsOffset.inc.c" +#include "world/common/todo/AddPlayerHandsOffset.inc.c" INCLUDE_ASM(s32, "world/area_pra/pra_09/D588B0", func_8024114C_D599DC); diff --git a/src/world/area_pra/pra_10/D5F2B0.c b/src/world/area_pra/pra_10/D5F2B0.c index 055e362db7..feb731214a 100644 --- a/src/world/area_pra/pra_10/D5F2B0.c +++ b/src/world/area_pra/pra_10/D5F2B0.c @@ -3,4 +3,4 @@ static char* N(exit_str_0) = "pra_04"; static char* N(exit_str_1) = "pra_12"; -#include "world/common/SetGameStatusUnk84_1.inc.c" +#include "world/common/todo/SetGameStatusUnk84_1.inc.c" diff --git a/src/world/area_pra/pra_10/D5F2D0.c b/src/world/area_pra/pra_10/D5F2D0.c index a91fca8a29..8c3f8272a9 100644 --- a/src/world/area_pra/pra_10/D5F2D0.c +++ b/src/world/area_pra/pra_10/D5F2D0.c @@ -2,4 +2,4 @@ #include "world/common/atomic/Reflection.inc.c" -#include "world/common/UnkFunc001.inc.c" +#include "world/common/todo/UnkFunc001.inc.c" diff --git a/src/world/area_pra/pra_11/D61500.c b/src/world/area_pra/pra_11/D61500.c index c3025baab9..8949f657bc 100644 --- a/src/world/area_pra/pra_11/D61500.c +++ b/src/world/area_pra/pra_11/D61500.c @@ -3,4 +3,4 @@ static char* N(exit_str_0) = "pra_09"; static char* N(exit_str_1) = ""; -#include "world/common/SetGameStatusUnk84_1.inc.c" +#include "world/common/todo/SetGameStatusUnk84_1.inc.c" diff --git a/src/world/area_pra/pra_11/D61520.c b/src/world/area_pra/pra_11/D61520.c index 2334369dfa..9ce2ae9509 100644 --- a/src/world/area_pra/pra_11/D61520.c +++ b/src/world/area_pra/pra_11/D61520.c @@ -2,10 +2,10 @@ #include "world/common/atomic/Reflection.inc.c" -#include "world/common/StashVars.inc.c" +#include "world/common/todo/StashVars.inc.c" -#include "world/common/GetItemName.inc.c" +#include "world/common/todo/GetItemName.inc.c" -#include "world/common/SomeItemEntityFunc.inc.c" +#include "world/common/todo/SomeItemEntityFunc.inc.c" -#include "world/common/IsItemBadge.inc.c" +#include "world/common/todo/IsItemBadge.inc.c" diff --git a/src/world/area_pra/pra_12/D62D10.c b/src/world/area_pra/pra_12/D62D10.c index 22638625d7..435043d9e8 100644 --- a/src/world/area_pra/pra_12/D62D10.c +++ b/src/world/area_pra/pra_12/D62D10.c @@ -4,10 +4,10 @@ INCLUDE_ASM(s32, "world/area_pra/pra_12/D62D10", func_80240000_D62D10); #include "world/common/atomic/Reflection.inc.c" -#include "world/common/StashVars.inc.c" +#include "world/common/todo/StashVars.inc.c" -#include "world/common/GetItemName.inc.c" +#include "world/common/todo/GetItemName.inc.c" -#include "world/common/SomeItemEntityFunc.inc.c" +#include "world/common/todo/SomeItemEntityFunc.inc.c" -#include "world/common/IsItemBadge.inc.c" +#include "world/common/todo/IsItemBadge.inc.c" diff --git a/src/world/area_pra/pra_13/D645E0.c b/src/world/area_pra/pra_13/D645E0.c index 038b5c3138..74f1f18efe 100644 --- a/src/world/area_pra/pra_13/D645E0.c +++ b/src/world/area_pra/pra_13/D645E0.c @@ -3,4 +3,4 @@ static char* N(exit_str_0) = "pra_02"; static char* N(exit_str_1) = "pra_14"; -#include "world/common/SetGameStatusUnk84_1.inc.c" +#include "world/common/todo/SetGameStatusUnk84_1.inc.c" diff --git a/src/world/area_pra/pra_13/D64600.c b/src/world/area_pra/pra_13/D64600.c index 098b15d7f4..00dad68897 100644 --- a/src/world/area_pra/pra_13/D64600.c +++ b/src/world/area_pra/pra_13/D64600.c @@ -2,9 +2,9 @@ #include "world/common/atomic/Reflection.inc.c" -#include "world/common/GetNpcCollisionHeight.inc.c" +#include "world/common/todo/GetNpcCollisionHeight.inc.c" -#include "world/common/AddPlayerHandsOffset.inc.c" +#include "world/common/todo/AddPlayerHandsOffset.inc.c" INCLUDE_ASM(s32, "world/area_pra/pra_13/D64600", func_8024114C_D6572C); diff --git a/src/world/area_pra/pra_14/D67D00.c b/src/world/area_pra/pra_14/D67D00.c index 8ac3436842..2ecfc520c1 100644 --- a/src/world/area_pra/pra_14/D67D00.c +++ b/src/world/area_pra/pra_14/D67D00.c @@ -3,4 +3,4 @@ static char* N(exit_str_0) = "pra_13"; static char* N(exit_str_1) = ""; -#include "world/common/SetGameStatusUnk84_1.inc.c" +#include "world/common/todo/SetGameStatusUnk84_1.inc.c" diff --git a/src/world/area_pra/pra_14/D67D20.c b/src/world/area_pra/pra_14/D67D20.c index 24079e7486..ced531618e 100644 --- a/src/world/area_pra/pra_14/D67D20.c +++ b/src/world/area_pra/pra_14/D67D20.c @@ -2,10 +2,10 @@ #include "world/common/atomic/Reflection.inc.c" -#include "world/common/StashVars.inc.c" +#include "world/common/todo/StashVars.inc.c" -#include "world/common/GetItemName.inc.c" +#include "world/common/todo/GetItemName.inc.c" -#include "world/common/SomeItemEntityFunc.inc.c" +#include "world/common/todo/SomeItemEntityFunc.inc.c" -#include "world/common/IsItemBadge.inc.c" +#include "world/common/todo/IsItemBadge.inc.c" diff --git a/src/world/area_pra/pra_15/D69810.c b/src/world/area_pra/pra_15/D69810.c index 2549546a30..2f305be06b 100644 --- a/src/world/area_pra/pra_15/D69810.c +++ b/src/world/area_pra/pra_15/D69810.c @@ -3,4 +3,4 @@ static char* N(exit_str_0) = "pra_01"; static char* N(exit_str_1) = ""; -#include "world/common/SetGameStatusUnk84_1.inc.c" +#include "world/common/todo/SetGameStatusUnk84_1.inc.c" diff --git a/src/world/area_pra/pra_16/D69B20.c b/src/world/area_pra/pra_16/D69B20.c index b3f7089b67..8c3a7918c6 100644 --- a/src/world/area_pra/pra_16/D69B20.c +++ b/src/world/area_pra/pra_16/D69B20.c @@ -3,4 +3,4 @@ static char* N(exit_str_0) = "pra_02"; static char* N(exit_str_1) = "pra_18"; -#include "world/common/SetGameStatusUnk84_1.inc.c" +#include "world/common/todo/SetGameStatusUnk84_1.inc.c" diff --git a/src/world/area_pra/pra_18/D6B620.c b/src/world/area_pra/pra_18/D6B620.c index 7d2fc770f1..3f5c74f672 100644 --- a/src/world/area_pra/pra_18/D6B620.c +++ b/src/world/area_pra/pra_18/D6B620.c @@ -3,4 +3,4 @@ static char* N(exit_str_0) = "pra_16"; static char* N(exit_str_1) = "pra_33"; -#include "world/common/SetGameStatusUnk84_1.inc.c" +#include "world/common/todo/SetGameStatusUnk84_1.inc.c" diff --git a/src/world/area_pra/pra_19/D6E9B0.c b/src/world/area_pra/pra_19/D6E9B0.c index 73d809c477..e2b77cc3e6 100644 --- a/src/world/area_pra/pra_19/D6E9B0.c +++ b/src/world/area_pra/pra_19/D6E9B0.c @@ -3,4 +3,4 @@ static char* N(exit_str_0) = "pra_35"; static char* N(exit_str_1) = "pra_20"; -#include "world/common/SetGameStatusUnk84_1.inc.c" +#include "world/common/todo/SetGameStatusUnk84_1.inc.c" diff --git a/src/world/area_pra/pra_19/D6E9D0.c b/src/world/area_pra/pra_19/D6E9D0.c index 1b77b829e0..bf57561040 100644 --- a/src/world/area_pra/pra_19/D6E9D0.c +++ b/src/world/area_pra/pra_19/D6E9D0.c @@ -2,9 +2,9 @@ #include "world/common/atomic/Reflection.inc.c" -#include "world/common/GetNpcCollisionHeight.inc.c" +#include "world/common/todo/GetNpcCollisionHeight.inc.c" -#include "world/common/AddPlayerHandsOffset.inc.c" +#include "world/common/todo/AddPlayerHandsOffset.inc.c" INCLUDE_ASM(s32, "world/area_pra/pra_19/D6E9D0", func_8024114C_D6FAFC); diff --git a/src/world/area_pra/pra_20/D763A0.c b/src/world/area_pra/pra_20/D763A0.c index da217df970..388855a174 100644 --- a/src/world/area_pra/pra_20/D763A0.c +++ b/src/world/area_pra/pra_20/D763A0.c @@ -5,4 +5,4 @@ static char* N(exit_str_1) = "pra_21"; static char* N(exit_str_2) = "pra_29"; static char* N(exit_str_3) = "pra_22"; -#include "world/common/SetGameStatusUnk84_1.inc.c" +#include "world/common/todo/SetGameStatusUnk84_1.inc.c" diff --git a/src/world/area_pra/pra_21/D77F20.c b/src/world/area_pra/pra_21/D77F20.c index 63869f02e3..88a13aeb48 100644 --- a/src/world/area_pra/pra_21/D77F20.c +++ b/src/world/area_pra/pra_21/D77F20.c @@ -3,4 +3,4 @@ static char* N(exit_str_0) = "pra_20"; static char* N(exit_str_1) = "pra_36"; -#include "world/common/SetGameStatusUnk84_1.inc.c" +#include "world/common/todo/SetGameStatusUnk84_1.inc.c" diff --git a/src/world/area_pra/pra_22/D78880.c b/src/world/area_pra/pra_22/D78880.c index 9014bae5d5..0a23594db3 100644 --- a/src/world/area_pra/pra_22/D78880.c +++ b/src/world/area_pra/pra_22/D78880.c @@ -3,4 +3,4 @@ static char* N(exit_str_0) = "pra_20"; static char* N(exit_str_1) = "pra_37"; -#include "world/common/SetGameStatusUnk84_1.inc.c" +#include "world/common/todo/SetGameStatusUnk84_1.inc.c" diff --git a/src/world/area_pra/pra_22/D788A0.c b/src/world/area_pra/pra_22/D788A0.c index f1b5869f1c..812a5f6d7e 100644 --- a/src/world/area_pra/pra_22/D788A0.c +++ b/src/world/area_pra/pra_22/D788A0.c @@ -1,6 +1,6 @@ #include "pra_22.h" -#include "world/common/UnkFunc11.inc.c" +#include "world/common/todo/UnkFunc11.inc.c" INCLUDE_ASM(s32, "world/area_pra/pra_22/D788A0", func_802400DC_D7895C); diff --git a/src/world/area_pra/pra_27/D799F0.c b/src/world/area_pra/pra_27/D799F0.c index 71999a423b..79668bd4e1 100644 --- a/src/world/area_pra/pra_27/D799F0.c +++ b/src/world/area_pra/pra_27/D799F0.c @@ -4,10 +4,10 @@ INCLUDE_ASM(s32, "world/area_pra/pra_27/D799F0", func_80240000_D799F0); #include "world/common/atomic/Reflection.inc.c" -#include "world/common/StashVars.inc.c" +#include "world/common/todo/StashVars.inc.c" -#include "world/common/GetItemName.inc.c" +#include "world/common/todo/GetItemName.inc.c" -#include "world/common/SomeItemEntityFunc.inc.c" +#include "world/common/todo/SomeItemEntityFunc.inc.c" -#include "world/common/IsItemBadge.inc.c" +#include "world/common/todo/IsItemBadge.inc.c" diff --git a/src/world/area_pra/pra_28/D7B2A0.c b/src/world/area_pra/pra_28/D7B2A0.c index 475efe787f..9793dd05a6 100644 --- a/src/world/area_pra/pra_28/D7B2A0.c +++ b/src/world/area_pra/pra_28/D7B2A0.c @@ -4,10 +4,10 @@ INCLUDE_ASM(s32, "world/area_pra/pra_28/D7B2A0", func_80240000_D7B2A0); #include "world/common/atomic/Reflection.inc.c" -#include "world/common/StashVars.inc.c" +#include "world/common/todo/StashVars.inc.c" -#include "world/common/GetItemName.inc.c" +#include "world/common/todo/GetItemName.inc.c" -#include "world/common/SomeItemEntityFunc.inc.c" +#include "world/common/todo/SomeItemEntityFunc.inc.c" -#include "world/common/IsItemBadge.inc.c" +#include "world/common/todo/IsItemBadge.inc.c" diff --git a/src/world/area_pra/pra_29/D7CB50.c b/src/world/area_pra/pra_29/D7CB50.c index 2a38dc38e4..9874f53061 100644 --- a/src/world/area_pra/pra_29/D7CB50.c +++ b/src/world/area_pra/pra_29/D7CB50.c @@ -3,4 +3,4 @@ static char* N(exit_str_0) = "pra_20"; static char* N(exit_str_1) = "pra_34"; -#include "world/common/SetGameStatusUnk84_1.inc.c" +#include "world/common/todo/SetGameStatusUnk84_1.inc.c" diff --git a/src/world/area_pra/pra_31/D7ED80.c b/src/world/area_pra/pra_31/D7ED80.c index f78901fb78..d3f112d101 100644 --- a/src/world/area_pra/pra_31/D7ED80.c +++ b/src/world/area_pra/pra_31/D7ED80.c @@ -1,8 +1,8 @@ #include "pra_31.h" -#include "world/common/GetNpcCollisionHeight.inc.c" +#include "world/common/todo/GetNpcCollisionHeight.inc.c" -#include "world/common/AddPlayerHandsOffset.inc.c" +#include "world/common/todo/AddPlayerHandsOffset.inc.c" INCLUDE_ASM(s32, "world/area_pra/pra_31/D7ED80", func_8024024C_D7EFAC); diff --git a/src/world/area_pra/pra_31/D7F270.c b/src/world/area_pra/pra_31/D7F270.c index a8d7de99e1..296737e367 100644 --- a/src/world/area_pra/pra_31/D7F270.c +++ b/src/world/area_pra/pra_31/D7F270.c @@ -12,7 +12,7 @@ INCLUDE_ASM(s32, "world/area_pra/pra_31/D7F270", delete_actor_D7F91C); INCLUDE_ASM(s32, "world/area_pra/pra_31/D7F270", func_80240C70_D7F9D0); -#include "world/common/UnkFunc12.inc.c" +#include "world/common/todo/UnkFunc12.inc.c" INCLUDE_ASM(s32, "world/area_pra/pra_31/D7F270", func_80240E70_D7FBD0); diff --git a/src/world/area_pra/pra_32/D86A00.c b/src/world/area_pra/pra_32/D86A00.c index ebc64e2d55..ff4c42c9e9 100644 --- a/src/world/area_pra/pra_32/D86A00.c +++ b/src/world/area_pra/pra_32/D86A00.c @@ -1,3 +1,3 @@ #include "pra_32.h" -#include "world/common/SetGameStatusUnk84_1.inc.c" +#include "world/common/todo/SetGameStatusUnk84_1.inc.c" diff --git a/src/world/area_pra/pra_32/D86A20.c b/src/world/area_pra/pra_32/D86A20.c index 282e2cfc1d..02581cd4b7 100644 --- a/src/world/area_pra/pra_32/D86A20.c +++ b/src/world/area_pra/pra_32/D86A20.c @@ -1,6 +1,6 @@ #include "pra_32.h" -#include "world/common/StarSpiritEffectFunc.inc.c" +#include "world/common/todo/StarSpiritEffectFunc.inc.c" static char* N(exit_str_0) = "kmr_23"; static char* N(exit_str_1) = "pra_40"; diff --git a/src/world/area_pra/pra_33/D896E0.c b/src/world/area_pra/pra_33/D896E0.c index 4327ec8db8..ae13066e5a 100644 --- a/src/world/area_pra/pra_33/D896E0.c +++ b/src/world/area_pra/pra_33/D896E0.c @@ -3,4 +3,4 @@ static char* N(exit_str_0) = "pra_35"; static char* N(exit_str_1) = "pra_18"; -#include "world/common/SetGameStatusUnk84_1.inc.c" +#include "world/common/todo/SetGameStatusUnk84_1.inc.c" diff --git a/src/world/area_pra/pra_34/D8B3B0.c b/src/world/area_pra/pra_34/D8B3B0.c index 6aaef547d8..334e6f6ea7 100644 --- a/src/world/area_pra/pra_34/D8B3B0.c +++ b/src/world/area_pra/pra_34/D8B3B0.c @@ -3,4 +3,4 @@ static char* N(exit_str_0) = "pra_29"; static char* N(exit_str_1) = "pra_31"; -#include "world/common/SetGameStatusUnk84_1.inc.c" +#include "world/common/todo/SetGameStatusUnk84_1.inc.c" diff --git a/src/world/area_pra/pra_34/D8B3D0.c b/src/world/area_pra/pra_34/D8B3D0.c index 14ca64b2b0..2118fba0f9 100644 --- a/src/world/area_pra/pra_34/D8B3D0.c +++ b/src/world/area_pra/pra_34/D8B3D0.c @@ -2,6 +2,6 @@ #include "world/common/atomic/Reflection.inc.c" -#include "world/common/RemovePadlock.inc.c" +#include "world/common/todo/RemovePadlock.inc.c" -#include "world/common/GetEntityPosition.inc.c" +#include "world/common/todo/GetEntityPosition.inc.c" diff --git a/src/world/area_pra/pra_35/D8D250.c b/src/world/area_pra/pra_35/D8D250.c index 7d7f67fe14..1725383208 100644 --- a/src/world/area_pra/pra_35/D8D250.c +++ b/src/world/area_pra/pra_35/D8D250.c @@ -3,4 +3,4 @@ static char* N(exit_str_0) = "pra_33"; static char* N(exit_str_1) = "pra_19"; -#include "world/common/SetGameStatusUnk84_1.inc.c" +#include "world/common/todo/SetGameStatusUnk84_1.inc.c" diff --git a/src/world/area_pra/pra_35/D8D270.c b/src/world/area_pra/pra_35/D8D270.c index e49631a255..135c794fcc 100644 --- a/src/world/area_pra/pra_35/D8D270.c +++ b/src/world/area_pra/pra_35/D8D270.c @@ -2,9 +2,9 @@ #include "world/common/atomic/Reflection.inc.c" -#include "world/common/enemy/PatrolNoAttackAI.inc.c" +#include "world/common/enemy/ai/PatrolNoAttackAI.inc.c" -#include "world/common/enemy/MeleeHitbox.inc.c" +#include "world/common/enemy/ai/MeleeHitbox.inc.c" // Requires data migration #ifdef NON_MATCHING @@ -108,4 +108,4 @@ ApiStatus func_802423CC_D8F61C(Evt *script, s32 isInitialCall) { INCLUDE_ASM(s32, "world/area_pra/pra_35/D8D270", func_802423CC_D8F61C); #endif -#include "world/common/enemy/WanderMeleeAI.inc.c" +#include "world/common/enemy/ai/WanderMeleeAI.inc.c" diff --git a/src/world/area_pra/pra_35/D8FBA0.c b/src/world/area_pra/pra_35/D8FBA0.c index 48a9fb879e..0dbcc6ad06 100644 --- a/src/world/area_pra/pra_35/D8FBA0.c +++ b/src/world/area_pra/pra_35/D8FBA0.c @@ -1,9 +1,9 @@ #include "pra_35.h" -#include "world/common/StashVars.inc.c" +#include "world/common/todo/StashVars.inc.c" -#include "world/common/GetItemName.inc.c" +#include "world/common/todo/GetItemName.inc.c" -#include "world/common/SomeItemEntityFunc.inc.c" +#include "world/common/todo/SomeItemEntityFunc.inc.c" -#include "world/common/IsItemBadge.inc.c" +#include "world/common/todo/IsItemBadge.inc.c" diff --git a/src/world/area_pra/pra_37/D92F40.c b/src/world/area_pra/pra_37/D92F40.c index 14926b5292..51eb2f3e45 100644 --- a/src/world/area_pra/pra_37/D92F40.c +++ b/src/world/area_pra/pra_37/D92F40.c @@ -11,6 +11,6 @@ const char* N(exit_str_0) = "pra_22\0\0pra_28"; #include "world/common/atomic/Reflection.inc.c" -#include "world/common/enemy/MeleeHitbox.inc.c" +#include "world/common/enemy/ai/MeleeHitbox.inc.c" -#include "world/common/enemy/WanderMeleeAI.inc.c" +#include "world/common/enemy/ai/WanderMeleeAI.inc.c" diff --git a/src/world/area_pra/pra_38/D955F0.c b/src/world/area_pra/pra_38/D955F0.c index 99d274de52..fe33c49047 100644 --- a/src/world/area_pra/pra_38/D955F0.c +++ b/src/world/area_pra/pra_38/D955F0.c @@ -11,4 +11,4 @@ const char* N(exit_str_0) = "pra_03\0\0pra_05"; #include "world/common/atomic/Reflection.inc.c" -#include "world/common/UnkFunc001.inc.c" +#include "world/common/todo/UnkFunc001.inc.c" diff --git a/src/world/area_pra/pra_39/D97890.c b/src/world/area_pra/pra_39/D97890.c index 1959ef7f48..30892a2c58 100644 --- a/src/world/area_pra/pra_39/D97890.c +++ b/src/world/area_pra/pra_39/D97890.c @@ -11,4 +11,4 @@ const char* N(exit_str_0) = "pra_04\0\0pra_06"; #include "world/common/atomic/Reflection.inc.c" -#include "world/common/UnkFunc001.inc.c" +#include "world/common/todo/UnkFunc001.inc.c" diff --git a/src/world/area_pra/pra_40/D999B0.c b/src/world/area_pra/pra_40/D999B0.c index f907b9959c..59c2786a7d 100644 --- a/src/world/area_pra/pra_40/D999B0.c +++ b/src/world/area_pra/pra_40/D999B0.c @@ -3,4 +3,4 @@ static char* N(exit_str_0) = "pra_31"; static char* N(exit_str_1) = "pra_32"; -#include "world/common/SetGameStatusUnk84_1.inc.c" +#include "world/common/todo/SetGameStatusUnk84_1.inc.c" diff --git a/src/world/area_sam/sam_01/CF7E80.c b/src/world/area_sam/sam_01/CF7E80.c index 56a8af36df..62c224b529 100644 --- a/src/world/area_sam/sam_01/CF7E80.c +++ b/src/world/area_sam/sam_01/CF7E80.c @@ -3,9 +3,9 @@ #define CHUCK_QUIZMO_NPC_ID 14 -#include "world/common/GetNpcCollisionHeight.inc.c" +#include "world/common/todo/GetNpcCollisionHeight.inc.c" -#include "world/common/AddPlayerHandsOffset.inc.c" +#include "world/common/todo/AddPlayerHandsOffset.inc.c" INCLUDE_ASM(s32, "world/area_sam/sam_01/CF7E80", func_8024053C_CF80AC); @@ -62,20 +62,20 @@ extern EffectInstance* N(Quizmo_VannaTEffect); #include "world/common/atomic/Quizmo.inc.c" extern s32 N(LetterDelivery_SavedNpcAnim); -#include "world/common/LetterDelivery.inc.c" +#include "world/common/todo/LetterDelivery.inc.c" #include "common/GetItemEntityPosition.inc.c" -#include "world/common/GetLeftRightPoints.inc.c" +#include "world/common/todo/GetLeftRightPoints.inc.c" #define NAMESPACE dup_sam_01 -#include "world/common/StashVars.inc.c" +#include "world/common/todo/StashVars.inc.c" #define NAMESPACE sam_01 #define NAMESPACE dup_sam_01 -#include "world/common/GetItemName.inc.c" +#include "world/common/todo/GetItemName.inc.c" #define NAMESPACE sam_01 -#include "world/common/SomeItemEntityFunc.inc.c" +#include "world/common/todo/SomeItemEntityFunc.inc.c" -#include "world/common/IsItemBadge.inc.c" +#include "world/common/todo/IsItemBadge.inc.c" diff --git a/src/world/area_sam/sam_02/D05730.c b/src/world/area_sam/sam_02/D05730.c index 1df3eb230f..6b607200cf 100644 --- a/src/world/area_sam/sam_02/D05730.c +++ b/src/world/area_sam/sam_02/D05730.c @@ -5,7 +5,7 @@ static char* N(exit_str_1) = "sam_11"; static char* N(exit_str_2) = "tik_17"; static char* N(exit_str_3) = ""; -#include "world/common/atomic/Pipe.inc.c" +#include "world/common/entity/Pipe.inc.c" #include "world/common/atomic/TexturePan.inc.c" diff --git a/src/world/area_sam/sam_03/D110C0.c b/src/world/area_sam/sam_03/D110C0.c index 7e5d88d7fa..3d13212fd4 100644 --- a/src/world/area_sam/sam_03/D110C0.c +++ b/src/world/area_sam/sam_03/D110C0.c @@ -10,4 +10,4 @@ ApiStatus func_80240000_D110C0(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -#include "world/common/enemy/WanderMeleeAI.inc.c" +#include "world/common/enemy/ai/WanderMeleeAI.inc.c" diff --git a/src/world/area_sam/sam_04/D138E0.c b/src/world/area_sam/sam_04/D138E0.c index 35574618c9..8b0bb53cb4 100644 --- a/src/world/area_sam/sam_04/D138E0.c +++ b/src/world/area_sam/sam_04/D138E0.c @@ -1,8 +1,8 @@ #include "sam_04.h" -#include "world/common/GetNpcCollisionHeight.inc.c" +#include "world/common/todo/GetNpcCollisionHeight.inc.c" -#include "world/common/AddPlayerHandsOffset.inc.c" +#include "world/common/todo/AddPlayerHandsOffset.inc.c" INCLUDE_ASM(s32, "world/area_sam/sam_04/D138E0", func_8024053C_D13B0C); diff --git a/src/world/area_sam/sam_05/D187E0.c b/src/world/area_sam/sam_05/D187E0.c index 1286342a48..d71fc17751 100644 --- a/src/world/area_sam/sam_05/D187E0.c +++ b/src/world/area_sam/sam_05/D187E0.c @@ -3,7 +3,7 @@ static char* N(exit_str_0) = "sam_04"; static char* N(exit_str_1) = "sam_06"; -#include "world/common/enemy/PiranhaPlantAI.inc.c" +#include "world/common/enemy/ai/PiranhaPlantAI.inc.c" INCLUDE_ASM(s32, "world/area_sam/sam_05/D187E0", func_802419A4_D1A184); diff --git a/src/world/area_sam/sam_06/D203E0.c b/src/world/area_sam/sam_06/D203E0.c index 58fe647a16..7cb4b8ced8 100644 --- a/src/world/area_sam/sam_06/D203E0.c +++ b/src/world/area_sam/sam_06/D203E0.c @@ -1,14 +1,14 @@ #include "sam_06.h" -#include "world/common/enemy/FlyingAI.inc.c" +#include "world/common/enemy/ai/FlyingAI.inc.c" -#include "world/common/StashVars.inc.c" +#include "world/common/todo/StashVars.inc.c" -#include "world/common/GetItemName.inc.c" +#include "world/common/todo/GetItemName.inc.c" -#include "world/common/GetNpcCollisionHeight.inc.c" +#include "world/common/todo/GetNpcCollisionHeight.inc.c" -#include "world/common/AddPlayerHandsOffset.inc.c" +#include "world/common/todo/AddPlayerHandsOffset.inc.c" INCLUDE_ASM(s32, "world/area_sam/sam_06/D203E0", func_80241D8C_D21C1C); @@ -59,6 +59,6 @@ ApiStatus func_80241EB4_D21D44(Evt* script, s32 isInitialCall) { #include "world/common/atomic/ToadHouse.inc.c" extern s32 N(LetterDelivery_SavedNpcAnim); -#include "world/common/LetterDelivery.inc.c" +#include "world/common/todo/LetterDelivery.inc.c" INCLUDE_ASM(s32, "world/area_sam/sam_06/D203E0", func_80242538_D223C8); diff --git a/src/world/area_sam/sam_07/D2BD30.c b/src/world/area_sam/sam_07/D2BD30.c index 85fa403bad..2be74f8390 100644 --- a/src/world/area_sam/sam_07/D2BD30.c +++ b/src/world/area_sam/sam_07/D2BD30.c @@ -5,12 +5,12 @@ static char* N(exit_str_1) = "sam_08"; INCLUDE_ASM(s32, "world/area_sam/sam_07/D2BD30", func_80240000_D2BD30); -#include "world/common/SetEntityPositionF.inc.c" +#include "world/common/todo/SetEntityPositionF.inc.c" -#include "world/common/GetEntityPosition.inc.c" +#include "world/common/todo/GetEntityPosition.inc.c" INCLUDE_ASM(s32, "world/area_sam/sam_07/D2BD30", func_802405B0_D2C2E0); -#include "world/common/UnsetCamera0MoveFlag1.inc.c" +#include "world/common/todo/UnsetCamera0MoveFlag1.inc.c" -#include "world/common/enemy/PiranhaPlantAI.inc.c" +#include "world/common/enemy/ai/PiranhaPlantAI.inc.c" diff --git a/src/world/area_sam/sam_08/D2FC80.c b/src/world/area_sam/sam_08/D2FC80.c index 207b23a826..f024f2601a 100644 --- a/src/world/area_sam/sam_08/D2FC80.c +++ b/src/world/area_sam/sam_08/D2FC80.c @@ -3,4 +3,4 @@ static char* N(exit_str_0) = "sam_07"; static char* N(exit_str_1) = "sam_09"; -#include "world/common/atomic/SuperBlock.inc.c" +#include "world/common/entity/SuperBlock.inc.c" diff --git a/src/world/area_sam/sam_08/D309C0.c b/src/world/area_sam/sam_08/D309C0.c index 228a3131a2..d08e1eb8e8 100644 --- a/src/world/area_sam/sam_08/D309C0.c +++ b/src/world/area_sam/sam_08/D309C0.c @@ -1,6 +1,6 @@ #include "sam_08.h" -#include "world/common/enemy/WanderMeleeAI.inc.c" +#include "world/common/enemy/ai/WanderMeleeAI.inc.c" ApiStatus func_80241610_D31290(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; diff --git a/src/world/area_sam/sam_09/D362F0.c b/src/world/area_sam/sam_09/D362F0.c index b34501ac46..7c715614cd 100644 --- a/src/world/area_sam/sam_09/D362F0.c +++ b/src/world/area_sam/sam_09/D362F0.c @@ -3,9 +3,9 @@ static char* N(exit_str_0) = "sam_08"; static char* N(exit_str_1) = "sam_10"; -#include "world/common/StashVars.inc.c" +#include "world/common/todo/StashVars.inc.c" -#include "world/common/GetItemName.inc.c" +#include "world/common/todo/GetItemName.inc.c" INCLUDE_ASM(s32, "world/area_sam/sam_09/D362F0", func_80240118_D36408); diff --git a/src/world/area_sam/sam_10/D37800.c b/src/world/area_sam/sam_10/D37800.c index 61c7466d33..abcdf4e16b 100644 --- a/src/world/area_sam/sam_10/D37800.c +++ b/src/world/area_sam/sam_10/D37800.c @@ -5,13 +5,13 @@ static char* N(exit_str_1) = "pra_01"; static char* N(exit_str_2) = "sam_12"; static char* N(exit_str_3) = ""; -#include "world/common/StashVars.inc.c" +#include "world/common/todo/StashVars.inc.c" -#include "world/common/GetItemName.inc.c" +#include "world/common/todo/GetItemName.inc.c" -#include "world/common/SomeItemEntityFunc.inc.c" +#include "world/common/todo/SomeItemEntityFunc.inc.c" -#include "world/common/IsItemBadge.inc.c" +#include "world/common/todo/IsItemBadge.inc.c" INCLUDE_ASM(s32, "world/area_sam/sam_10/D37800", func_802402BC_D37ABC); diff --git a/src/world/area_sam/sam_10/D37BD0.c b/src/world/area_sam/sam_10/D37BD0.c index ed50f3f888..2b30cde374 100644 --- a/src/world/area_sam/sam_10/D37BD0.c +++ b/src/world/area_sam/sam_10/D37BD0.c @@ -1,3 +1,3 @@ #include "sam_10.h" -#include "world/common/enemy/WanderMeleeAI.inc.c" +#include "world/common/enemy/ai/WanderMeleeAI.inc.c" diff --git a/src/world/area_sam/sam_11/D3A850.c b/src/world/area_sam/sam_11/D3A850.c index 9d3ff6d199..5e9eb9c068 100644 --- a/src/world/area_sam/sam_11/D3A850.c +++ b/src/world/area_sam/sam_11/D3A850.c @@ -1,5 +1,5 @@ #include "sam_11.h" -#include "world/common/RemovePadlock.inc.c" +#include "world/common/todo/RemovePadlock.inc.c" -#include "world/common/GetEntityPosition.inc.c" +#include "world/common/todo/GetEntityPosition.inc.c" diff --git a/src/world/area_sam/sam_11/D3A930.c b/src/world/area_sam/sam_11/D3A930.c index 8beca4a48c..aec4116a72 100644 --- a/src/world/area_sam/sam_11/D3A930.c +++ b/src/world/area_sam/sam_11/D3A930.c @@ -16,9 +16,9 @@ ApiStatus N(Set80151310_0)(Evt* script, s32 isInitialCall) { } #define NAMESPACE sam_11 -#include "world/common/UnsetCamera0MoveFlag1.inc.c" +#include "world/common/todo/UnsetCamera0MoveFlag1.inc.c" -#include "world/common/SetCamera0MoveFlag1.inc.c" +#include "world/common/todo/SetCamera0MoveFlag1.inc.c" INCLUDE_ASM(s32, "world/area_sam/sam_11/D3A930", func_8024059C_D3AB6C); diff --git a/src/world/area_sbk/sbk.h b/src/world/area_sbk/sbk.h index c7f26665ae..c389651bef 100644 --- a/src/world/area_sbk/sbk.h +++ b/src/world/area_sbk/sbk.h @@ -31,7 +31,7 @@ enum { extern MapSettings sbk_00_settings; extern MapSettings sbk_01_settings; -//extern MapSettings sbk_02_settings; +extern MapSettings sbk_02_settings; extern MapSettings sbk_03_settings; extern MapSettings sbk_04_settings; extern MapSettings sbk_05_settings; @@ -50,7 +50,7 @@ extern MapSettings sbk_23_settings; extern MapSettings sbk_24_settings; extern MapSettings sbk_25_settings; extern MapSettings sbk_26_settings; -//extern MapSettings sbk_30_settings; +extern MapSettings sbk_30_settings; extern MapSettings sbk_31_settings; extern MapSettings sbk_32_settings; extern MapSettings sbk_33_settings; 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 e8e39167f6..6952b5babc 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 @@ -19,7 +19,7 @@ MapSettings N(settings) = { .tattle = { MSG_MapTattle_sbk_00 }, }; -#include "world/common/SpawnSunEffect.inc.c" +#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); EvtScript N(EVS_ExitWalk_sbk_10_2) = EVT_EXIT_WALK(60, sbk_00_ENTRY_3, "sbk_10", sbk_10_ENTRY_2); diff --git a/src/world/area_sbk/sbk_01/sbk_01_1_main.c b/src/world/area_sbk/sbk_01/sbk_01_1_main.c index ea490f2172..e3ff5e8910 100644 --- a/src/world/area_sbk/sbk_01/sbk_01_1_main.c +++ b/src/world/area_sbk/sbk_01/sbk_01_1_main.c @@ -18,7 +18,7 @@ MapSettings N(settings) = { .tattle = { MSG_MapTattle_sbk_01 }, }; -#include "world/common/SpawnSunEffect.inc.c" +#include "world/common/todo/SpawnSunEffect.inc.c" EvtScript N(EVS_ExitWalk_sbk_00_1) = EVT_EXIT_WALK(60, sbk_01_ENTRY_0, "sbk_00", sbk_00_ENTRY_1); EvtScript N(EVS_ExitWalk_sbk_02_0) = EVT_EXIT_WALK(60, sbk_01_ENTRY_1, "sbk_02", sbk_02_ENTRY_0); diff --git a/src/world/area_sbk/sbk_02/92A2B0.c b/src/world/area_sbk/sbk_02/92A2B0.c deleted file mode 100644 index ad88af8cda..0000000000 --- a/src/world/area_sbk/sbk_02/92A2B0.c +++ /dev/null @@ -1,74 +0,0 @@ -#include "sbk_02.h" -#include "effects.h" - -static char* N(exit_str_0) = "sbk_01"; -static char* N(exit_str_1) = "sbk_03"; -static char* N(exit_str_2) = "sbk_12"; -static char* N(exit_str_3) = "isk_01"; -static char* N(exit_str_4) = "sbk_30"; -static char* N(exit_str_5) = ""; - -void get_model_env_color_parameters(u8* arg0, u8* arg1, u8* arg2, u8* arg3, u8* arg4, u8* arg5); - -s32 N(get_tattle)(void) { - s32 tattle; - if (evt_get_variable(NULL, GB_StoryProgress) > STORY_CH2_GOT_PULSE_STONE) { - tattle = MSG_MapTattle_sbk_02_after; - } else { - tattle = MSG_MapTattle_sbk_02_before; - } - return tattle; -} - -#include "world/common/atomic/UnkFunc27.inc.c" - -API_CALLABLE(func_80240338_92A5E8) { - EffectInstance* effect = (EffectInstance*)evt_get_variable(script, MapVar(0)); - - effect->data.sun->targetAlpha = 0; - return ApiStatus_DONE2; -} - -API_CALLABLE(func_80240364_92A614) { - static u8 savedPrimR, savedPrimG, savedPrimB; - static u8 savedEnvR, savedEnvG, savedEnvB; - static s32 targetPrimR, targetPrimG, targetPrimB; - static s32 targetEnvR, targetEnvG, targetEnvB; - static s32 duration, elapsed; - - Bytecode* args = script->ptrReadPos; - s32 blendPrimR, blendPrimG, blendPrimB; - s32 blendEnvR, blendEnvG, blendEnvB; - - if (isInitialCall) { - get_model_env_color_parameters(&savedPrimR, &savedPrimG, &savedPrimB, &savedEnvR, &savedEnvG, &savedEnvB); - targetPrimR = evt_get_variable(script, *args++); - targetPrimG = evt_get_variable(script, *args++); - targetPrimB = evt_get_variable(script, *args++); - targetEnvR = evt_get_variable(script, *args++); - targetEnvG = evt_get_variable(script, *args++); - targetEnvB = evt_get_variable(script, *args++); - duration = evt_get_variable(script, *args++); - elapsed = 0; - } - - if (duration > 0) { - elapsed++; - blendPrimR = savedPrimR + ((targetPrimR - savedPrimR) * elapsed) / duration; - blendPrimG = savedPrimG + ((targetPrimG - savedPrimG) * elapsed) / duration; - blendPrimB = savedPrimB + ((targetPrimB - savedPrimB) * elapsed) / duration; - blendEnvR = savedEnvR + ((targetEnvR - savedEnvR) * elapsed) / duration; - blendEnvG = savedEnvG + ((targetEnvG - savedEnvG) * elapsed) / duration; - blendEnvB = savedEnvB + ((targetEnvB - savedEnvB) * elapsed) / duration; - - set_model_env_color_parameters(blendPrimR, blendPrimG, blendPrimB, blendEnvR, blendEnvG, blendEnvB); - if (elapsed >= duration) { - return ApiStatus_DONE2; - } - } else { - set_model_env_color_parameters(targetPrimR, targetPrimG, targetPrimB, targetEnvR, targetEnvG, targetEnvB); - return ApiStatus_DONE2; - } - - return ApiStatus_BLOCK; -} diff --git a/src/world/area_sbk/sbk_02/92A9A0.c b/src/world/area_sbk/sbk_02/92A9A0.c deleted file mode 100644 index ee6358be20..0000000000 --- a/src/world/area_sbk/sbk_02/92A9A0.c +++ /dev/null @@ -1,79 +0,0 @@ -#include "sbk_02.h" - -#include "world/common/GetNpcCollisionHeight.inc.c" - -#include "world/common/AddPlayerHandsOffset.inc.c" - -// needs data -#ifdef NON_MATCHING -API_CALLABLE(func_8024091C_92ABCC) { - Bytecode* args = script->ptrReadPos; - if (isInitialCall) { - D_8024404C_92E2FC = FALSE; - } - if (D_8024404C_92E2FC) { - D_8024404C_92E2FC = FALSE; - evt_set_variable(script, *args++, D_80244050_92E300); - return ApiStatus_DONE2; - } else { - return ApiStatus_BLOCK; - } -} -#else -INCLUDE_ASM(s32, "world/area_sbk/sbk_02/92A9A0", func_8024091C_92ABCC); -#endif - -static s32 sbk_02_D_80245630[91]; -extern s32 D_8024404C_92E2FC; -extern s32 D_80244050_92E300; - -API_CALLABLE(func_80240970_92AC20) { - Bytecode* args = script->ptrReadPos; - - D_80244050_92E300 = evt_get_variable(script, *args++); - D_8024404C_92E2FC = TRUE; - return ApiStatus_DONE2; -} - -API_CALLABLE(func_802409A8_92AC58) { - Bytecode* args = script->ptrReadPos; - s32* buf = (s32*) evt_get_variable(script, *args++); - s32 i; - - if (buf != NULL) { - for (i = 0; *buf != NULL; i++) { - sbk_02_D_80245630[i] = *buf++; - } - sbk_02_D_80245630[i] = 0; - } else { - for (i = 0; i <= 90; i++) { - sbk_02_D_80245630[i] = i + 0x80; - sbk_02_D_80245630[91] = 0; - } - } - return ApiStatus_DONE2; -} - -#include "world/common/StashVars.inc.c" - -#include "world/common/GetItemName.inc.c" - -API_CALLABLE(PostChapter2StatUpdate) { - PlayerData* playerData = &gPlayerData; - - set_max_SP(2); - playerData->curHP = playerData->curMaxHP; - playerData->curFP = playerData->curMaxFP; - sync_status_menu(); - return ApiStatus_DONE2; -} - -API_CALLABLE(N(CheckTradeEventTime)) { - script->varTable[0] = (s32)((gPlayerData.frameCounter - gPlayerData.tradeEventStartTime) / 3600) < script->varTable[0]; - return ApiStatus_DONE2; -} - -API_CALLABLE(GetItemCount) { - script->varTable[0] = get_item_count(); - return ApiStatus_DONE2; -} diff --git a/src/world/area_sbk/sbk_02/sbk_02.h b/src/world/area_sbk/sbk_02/sbk_02.h index e3b96ce502..74135b2085 100644 --- a/src/world/area_sbk/sbk_02/sbk_02.h +++ b/src/world/area_sbk/sbk_02/sbk_02.h @@ -13,12 +13,19 @@ #include "sprite/npc/Toad.h" enum { - NPC_Mamar = 1, - NPC_Toad = 2, + NPC_Mamar = 1, + NPC_TradingToad = 2, }; enum { - MV_Unk_00 = MapVar(0), + MV_Unk_00 = MapVar(0), }; #define NAMESPACE sbk_02 + +extern EvtScript N(EVS_Main); +extern EvtScript N(EVS_SetupRuins); +extern EvtScript N(EVS_Ruins_Arise_Continued); +extern EvtScript N(EVS_SetupMusic); +extern EvtScript N(EVS_MakeEntities); +extern NpcGroupList N(DefaultNPCs); diff --git a/src/world/area_sbk/sbk_02/sbk_02_0_header.c b/src/world/area_sbk/sbk_02/sbk_02_0_header.c index fd67af6b91..5612fdc425 100644 --- a/src/world/area_sbk/sbk_02/sbk_02_0_header.c +++ b/src/world/area_sbk/sbk_02/sbk_02_0_header.c @@ -1,7 +1,5 @@ #include "sbk_02.h" -extern EvtScript N(EVS_Main); - s32 N(get_tattle)(void) { s32 tattle; if (evt_get_variable(NULL, GB_StoryProgress) > STORY_CH2_GOT_PULSE_STONE) { @@ -28,18 +26,5 @@ MapSettings N(settings) = { .entryList = &N(Entrances), .entryCount = ENTRY_COUNT(N(Entrances)), .background = &gBackgroundImage, - .tattle = { &N(get_tattle) }, -}; - -EvtScript N(EVS_SetupMusic) = { - EVT_CALL(GetEntryID, LVar0) - EVT_SWITCH(LVar0) - EVT_CASE_OR_EQ(sbk_02_ENTRY_6) - EVT_CASE_OR_EQ(sbk_02_ENTRY_7) - EVT_CASE_DEFAULT - EVT_CALL(SetMusicTrack, 0, SONG_DRY_DRY_DESERT, 0, 8) - EVT_END_CASE_GROUP - EVT_END_SWITCH - EVT_RETURN - EVT_END + .tattle = { .get = &N(get_tattle) }, }; diff --git a/src/world/area_sbk/sbk_02/sbk_02_1_music.c b/src/world/area_sbk/sbk_02/sbk_02_1_music.c new file mode 100644 index 0000000000..28d9e8aeb7 --- /dev/null +++ b/src/world/area_sbk/sbk_02/sbk_02_1_music.c @@ -0,0 +1,14 @@ +#include "sbk_02.h" + +EvtScript N(EVS_SetupMusic) = { + EVT_CALL(GetEntryID, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_OR_EQ(sbk_02_ENTRY_6) + EVT_CASE_OR_EQ(sbk_02_ENTRY_7) + EVT_CASE_DEFAULT + EVT_CALL(SetMusicTrack, 0, SONG_DRY_DRY_DESERT, 0, 8) + EVT_END_CASE_GROUP + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_sbk/sbk_02/sbk_02_1_main.c b/src/world/area_sbk/sbk_02/sbk_02_2_main.c similarity index 87% rename from src/world/area_sbk/sbk_02/sbk_02_1_main.c rename to src/world/area_sbk/sbk_02/sbk_02_2_main.c index 8a4d4e9868..d668422d60 100644 --- a/src/world/area_sbk/sbk_02/sbk_02_1_main.c +++ b/src/world/area_sbk/sbk_02/sbk_02_2_main.c @@ -1,13 +1,5 @@ #include "sbk_02.h" #include "effects.h" -#include "entity.h" - -extern EvtScript N(EVS_Main); -extern EvtScript N(EVS_80243A00); -extern EvtScript N(EVS_80243B38); -extern EvtScript N(EVS_SetupMusic); -extern EvtScript N(EVS_MakeEntities); -extern NpcGroupList N(DefaultNPCs); EvtScript N(EVS_ExitWalk_sbk_01_1) = EVT_EXIT_WALK(60, sbk_02_ENTRY_0, "sbk_01", sbk_01_ENTRY_1); EvtScript N(EVS_ExitWalk_sbk_03_0) = EVT_EXIT_WALK(60, sbk_02_ENTRY_1, "sbk_03", sbk_03_ENTRY_0); @@ -23,7 +15,7 @@ EvtScript N(EVS_BindExitTriggers) = { EVT_END }; -EvtScript N(D_80240F30_92B1E0) = { +EvtScript N(EVS_EnterMap) = { EVT_CALL(GetEntryID, LVar0) EVT_SWITCH(LVar0) EVT_CASE_EQ(sbk_02_ENTRY_5) @@ -64,16 +56,16 @@ EvtScript N(EVS_Main) = { EVT_CASE_OR_EQ(sbk_02_ENTRY_7) EVT_END_CASE_GROUP EVT_CASE_DEFAULT - EVT_EXEC_WAIT(N(EVS_80243A00)) + EVT_EXEC_WAIT(N(EVS_SetupRuins)) EVT_END_SWITCH - EVT_EXEC(N(D_80240F30_92B1E0)) + EVT_EXEC(N(EVS_EnterMap)) EVT_CALL(GetEntryID, LVar0) EVT_SWITCH(LVar0) EVT_CASE_EQ(sbk_02_ENTRY_5) EVT_WAIT(65) EVT_CASE_OR_EQ(sbk_02_ENTRY_6) EVT_CASE_OR_EQ(sbk_02_ENTRY_7) - EVT_EXEC(N(EVS_80243B38)) + EVT_EXEC(N(EVS_Ruins_Arise_Continued)) EVT_WAIT(3) EVT_END_CASE_GROUP EVT_CASE_DEFAULT diff --git a/src/world/area_sbk/sbk_02/sbk_02_2_ruins.c b/src/world/area_sbk/sbk_02/sbk_02_3_ruins.c similarity index 65% rename from src/world/area_sbk/sbk_02/sbk_02_2_ruins.c rename to src/world/area_sbk/sbk_02/sbk_02_3_ruins.c index f1d0969fbc..6a1bfc73cf 100644 --- a/src/world/area_sbk/sbk_02/sbk_02_2_ruins.c +++ b/src/world/area_sbk/sbk_02/sbk_02_3_ruins.c @@ -1,16 +1,18 @@ #include "sbk_02.h" #include "effects.h" +void get_model_env_color_parameters(u8* primR, u8* primG, u8* primB, u8* envR, u8* envG, u8* envB); + #include "world/common/atomic/UnkFunc27.inc.c" -API_CALLABLE(N(func_80240338_92A5E8)) { +API_CALLABLE(N(HideSun)) { EffectInstance* effect = (EffectInstance*)evt_get_variable(script, MapVar(0)); effect->data.sun->targetAlpha = 0; return ApiStatus_DONE2; } -API_CALLABLE(N(func_80240364_92A614)) { +API_CALLABLE(N(InterpWorldEnvColor)) { static u8 savedPrimR, savedPrimG, savedPrimB; static u8 savedEnvR, savedEnvG, savedEnvB; static s32 targetPrimR, targetPrimG, targetPrimB; @@ -54,12 +56,12 @@ API_CALLABLE(N(func_80240364_92A614)) { return ApiStatus_BLOCK; } -s32 N(D_80241250_92B500)[] = { +s32 N(PedestalKeyList)[] = { ITEM_PULSE_STONE, ITEM_NONE }; -EvtScript N(D_80241258_92B508) = { +EvtScript N(EVS_Pedestal_Sink) = { EVT_PLAY_EFFECT(EFFECT_SMOKE_IMPACT, 0, 0, 0, 0, 20, 10, 0, 60) EVT_PLAY_EFFECT(EFFECT_DUST, 2, 0, 0, 0, 60) EVT_CALL(PlaySoundAtCollider, COLLIDER_iwa, SOUND_5F, 0) @@ -76,54 +78,54 @@ EvtScript N(D_80241258_92B508) = { EVT_BREAK_LOOP EVT_END_IF EVT_END_LOOP - EVT_CALL(ModifyColliderFlags, 0, COLLIDER_iwa, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_iwa, COLLIDER_FLAGS_UPPER_MASK) EVT_CALL(EnableModel, MODEL_point_iwa, FALSE) EVT_CALL(PlaySound, SOUND_8000005F) EVT_RETURN EVT_END }; -s32 N(D_80241418_92B6C8)[] = { +s32 N(ModelList_Solid)[] = { MODEL_ruins, MODEL_step, 0x0000FFFF }; -s32 N(D_80241424_92B6D4)[] = { +s32 N(ModelList_Translucent)[] = { MODEL_upper_light, MODEL_o225, 0x0000FFFF }; -EvtScript N(D_80241430_92B6E0) = { +EvtScript N(EVS_DarkenEnvironment) = { EVT_CALL(N(UnkFunc27), 2, 0, 3) EVT_CALL(N(UnkFunc27), 1, -1, 3) - EVT_CALL(N(UnkFunc27), 1, EVT_PTR(N(D_80241418_92B6C8)), 0) - EVT_CALL(N(UnkFunc27), 0, EVT_PTR(N(D_80241424_92B6D4)), 0) - EVT_CALL(N(func_80240364_92A614), 255, 255, 255, 0, 0, 0, 0) + EVT_CALL(N(UnkFunc27), 1, EVT_PTR(N(ModelList_Solid)), 0) + EVT_CALL(N(UnkFunc27), 0, EVT_PTR(N(ModelList_Translucent)), 0) + EVT_CALL(N(InterpWorldEnvColor), 255, 255, 255, 0, 0, 0, 0) EVT_WAIT(1) - EVT_CALL(N(func_80240364_92A614), 44, 32, 177, 0, 0, 0, 60) + EVT_CALL(N(InterpWorldEnvColor), 44, 32, 177, 0, 0, 0, 60) EVT_RETURN EVT_END }; -EvtScript N(D_802414FC_92B7AC) = { +EvtScript N(EVS_TexPan_SandRing) = { EVT_CALL(SetRenderMode, MODEL_o225, RENDER_MODE_SURFACE_XLU_LAYER2) EVT_CALL(EnableTexPanning, MODEL_o225, TRUE) - EVT_CALL(EnableTexPanning, 0x00002710, TRUE) + EVT_CALL(EnableTexPanning, CLONED_MODEL(0), TRUE) EVT_SET(LVar0, 0) EVT_SET(LVar1, 0) EVT_SET(LVar2, 0) EVT_LOOP(0) - EVT_CALL(SetTexPanOffset, 3, 0, LVar0, 0) - EVT_CALL(SetTexPanOffset, 3, 1, LVar1, LVar2) - EVT_ADD(LVar0, 0x00001770) - EVT_ADD(LVar1, 0x00001388) - EVT_ADD(LVar2, 0x00000FA0) - EVT_IF_GT(LVar0, 0x00020000) - EVT_SUB(LVar0, 0x00020000) + EVT_CALL(SetTexPanOffset, TEX_PANNER_3, TEX_PANNER_MAIN, LVar0, 0) + EVT_CALL(SetTexPanOffset, TEX_PANNER_3, TEX_PANNER_AUX, LVar1, LVar2) + EVT_ADD(LVar0, 6000) + EVT_ADD(LVar1, 5000) + EVT_ADD(LVar2, 4000) + EVT_IF_GT(LVar0, 0x20000) + EVT_SUB(LVar0, 0x20000) EVT_END_IF - EVT_IF_GT(LVar1, 0x00020000) - EVT_SUB(LVar1, 0x00020000) + EVT_IF_GT(LVar1, 0x20000) + EVT_SUB(LVar1, 0x20000) EVT_END_IF - EVT_IF_GT(LVar2, 0x00020000) - EVT_SUB(LVar2, 0x00020000) + EVT_IF_GT(LVar2, 0x20000) + EVT_SUB(LVar2, 0x20000) EVT_END_IF EVT_WAIT(1) EVT_END_LOOP @@ -131,7 +133,7 @@ EvtScript N(D_802414FC_92B7AC) = { EVT_END }; -EvtScript N(D_80241678_92B928) = { +EvtScript N(EVS_SandRing_Appear) = { EVT_CALL(EnableModel, MODEL_o225, TRUE) EVT_SET(LVar2, 0) EVT_SET(LVar0, -100) @@ -152,29 +154,29 @@ EvtScript N(D_80241678_92B928) = { EVT_END }; -EvtScript N(D_80241790_92BA40) = { +EvtScript N(EVS_SandRingClone_Appear) = { EVT_WAIT(10) - EVT_CALL(EnableModel, 0x00002710, TRUE) + EVT_CALL(EnableModel, CLONED_MODEL(0), TRUE) EVT_SET(LVar2, 0) EVT_SET(LVar0, -100) EVT_LOOP(100) EVT_SET(LVar3, LVar2) EVT_DIVF(LVar3, 110) - EVT_CALL(ScaleModel, 0x00002710, LVar3, EVT_FLOAT(1.0), LVar3) - EVT_CALL(TranslateModel, 0x00002710, 0, LVar0, 0) + EVT_CALL(ScaleModel, CLONED_MODEL(0), LVar3, EVT_FLOAT(1.0), LVar3) + EVT_CALL(TranslateModel, CLONED_MODEL(0), 0, LVar0, 0) EVT_ADD(LVar0, 1) EVT_ADD(LVar2, 1) EVT_WAIT(1) EVT_END_LOOP EVT_LOOP(0) - EVT_CALL(ScaleModel, 0x00002710, LVar3, EVT_FLOAT(1.0), LVar3) + EVT_CALL(ScaleModel, CLONED_MODEL(0), LVar3, EVT_FLOAT(1.0), LVar3) EVT_WAIT(1) EVT_END_LOOP EVT_RETURN EVT_END }; -EvtScript N(D_802418B4_92BB64) = { +EvtScript N(EVS_SandRing_Vanish) = { EVT_CALL(EnableModel, MODEL_o225, TRUE) EVT_SET(LVar0, 0) EVT_SET(LVar2, 100) @@ -197,39 +199,39 @@ EvtScript N(D_802418B4_92BB64) = { EVT_END }; -EvtScript N(D_802419F0_92BCA0) = { +EvtScript N(EVS_SandRingClone_Vanish) = { EVT_WAIT(10) - EVT_CALL(EnableModel, 0x00002710, TRUE) + EVT_CALL(EnableModel, CLONED_MODEL(0), TRUE) EVT_SET(LVar0, 0) EVT_SET(LVar2, 100) - EVT_SETF(LVar3, EVT_FLOAT(0.91)) + EVT_SETF(LVar3, EVT_FLOAT(0.9091)) EVT_LOOP(20) - EVT_CALL(ScaleModel, 0x00002710, LVar3, EVT_FLOAT(1.0), LVar3) + EVT_CALL(ScaleModel, CLONED_MODEL(0), LVar3, EVT_FLOAT(1.0), LVar3) EVT_WAIT(1) EVT_END_LOOP EVT_LOOP(70) EVT_SET(LVar3, LVar2) EVT_DIVF(LVar3, 110) - EVT_CALL(ScaleModel, 0x00002710, LVar3, LVar3, LVar3) - EVT_CALL(TranslateModel, 0x00002710, 0, LVar0, 0) + EVT_CALL(ScaleModel, CLONED_MODEL(0), LVar3, LVar3, LVar3) + EVT_CALL(TranslateModel, CLONED_MODEL(0), 0, LVar0, 0) EVT_SUB(LVar0, 2) EVT_ADD(LVar2, 5) EVT_WAIT(1) EVT_END_LOOP - EVT_CALL(EnableModel, 0x00002710, FALSE) + EVT_CALL(EnableModel, CLONED_MODEL(0), FALSE) EVT_RETURN EVT_END }; -EvtScript N(D_80241B38_92BDE8) = { +EvtScript N(EVS_LightRays_Appear) = { EVT_CHILD_THREAD EVT_CALL(EnableTexPanning, MODEL_upper_light, TRUE) EVT_SET(LVar0, 0) EVT_LOOP(0) - EVT_CALL(SetTexPanOffset, 1, 0, LVar0, 0) - EVT_ADD(LVar0, 0x000009C4) - EVT_IF_GT(LVar0, 0x00008000) - EVT_SUB(LVar0, 0x00008000) + EVT_CALL(SetTexPanOffset, TEX_PANNER_1, TEX_PANNER_MAIN, LVar0, 0) + EVT_ADD(LVar0, 2500) + EVT_IF_GT(LVar0, 0x8000) + EVT_SUB(LVar0, 0x8000) EVT_END_IF EVT_WAIT(1) EVT_END_LOOP @@ -249,15 +251,15 @@ EvtScript N(D_80241B38_92BDE8) = { EVT_END }; -EvtScript N(D_80241C90_92BF40) = { +EvtScript N(EVS_LightRays_Vanish) = { EVT_CHILD_THREAD EVT_CALL(EnableTexPanning, MODEL_upper_light, TRUE) EVT_SET(LVar0, 0) EVT_LOOP(0) - EVT_CALL(SetTexPanOffset, 1, 0, LVar0, 0) - EVT_ADD(LVar0, 0x000009C4) - EVT_IF_GT(LVar0, 0x00008000) - EVT_SUB(LVar0, 0x00008000) + EVT_CALL(SetTexPanOffset, TEX_PANNER_1, TEX_PANNER_MAIN, LVar0, 0) + EVT_ADD(LVar0, 2500) + EVT_IF_GT(LVar0, 0x8000) + EVT_SUB(LVar0, 0x8000) EVT_END_IF EVT_WAIT(1) EVT_END_LOOP @@ -275,7 +277,7 @@ EvtScript N(D_80241C90_92BF40) = { EVT_END }; -EvtScript N(D_80241DE0_92C090) = { +EvtScript N(EVS_Ruins_Arise) = { EVT_CALL(MakeTransformGroup, MODEL_ruins) EVT_CALL(EnableGroup, MODEL_ruins, TRUE) EVT_THREAD @@ -284,11 +286,11 @@ EvtScript N(D_80241DE0_92C090) = { EVT_SET(LVar1, 0) EVT_SET(LVar2, 0) EVT_LOOP(600) - EVT_CALL(SetTexPanOffset, 2, 0, 0, LVar0) - EVT_CALL(SetTexPanOffset, 2, 1, LVar1, LVar2) - EVT_ADD(LVar0, 200) + EVT_CALL(SetTexPanOffset, TEX_PANNER_2, TEX_PANNER_MAIN, 0, LVar0) + EVT_CALL(SetTexPanOffset, TEX_PANNER_2, TEX_PANNER_AUX, LVar1, LVar2) + EVT_ADD(LVar0, 200) EVT_ADD(LVar1, -200) - EVT_ADD(LVar2, 700) + EVT_ADD(LVar2, 700) EVT_WAIT(1) EVT_END_LOOP EVT_CALL(EnableModel, MODEL_o232, FALSE) @@ -343,20 +345,20 @@ EvtScript N(D_80241DE0_92C090) = { EVT_END }; -EvtScript N(D_802422F0_92C5A0) = { +EvtScript N(EVS_Ruins_FinishRising) = { EVT_CALL(MakeTransformGroup, MODEL_ruins) EVT_CALL(EnableGroup, MODEL_ruins, TRUE) EVT_THREAD EVT_CALL(EnableTexPanning, MODEL_o232, TRUE) - EVT_SET(LVar0, 0x0000EA60) - EVT_SET(LVar1, 0xFFFF15A0) - EVT_SET(LVar2, 0x00033450) + EVT_SET(LVar0, 60000) + EVT_SET(LVar1, -60000) + EVT_SET(LVar2, 210000) EVT_LOOP(300) - EVT_CALL(SetTexPanOffset, 2, 0, 0, LVar0) - EVT_CALL(SetTexPanOffset, 2, 1, LVar1, LVar2) - EVT_ADD(LVar0, 200) + EVT_CALL(SetTexPanOffset, TEX_PANNER_2, TEX_PANNER_MAIN, 0, LVar0) + EVT_CALL(SetTexPanOffset, TEX_PANNER_2, TEX_PANNER_AUX, LVar1, LVar2) + EVT_ADD(LVar0, 200) EVT_ADD(LVar1, -200) - EVT_ADD(LVar2, 700) + EVT_ADD(LVar2, 700) EVT_WAIT(1) EVT_END_LOOP EVT_CALL(EnableModel, MODEL_o232, FALSE) @@ -409,7 +411,7 @@ EvtScript N(D_802422F0_92C5A0) = { EVT_END }; -EvtScript N(D_802427F4_92CAA4) = { +EvtScript N(EVS_SetChompStatueRotation) = { EVT_CALL(RotateGroup, MODEL_c_wang, LVar0, 0, 1, 0) EVT_CALL(RotateGroup, MODEL_d_wang, LVar0, 0, 1, 0) EVT_SET(LVar2, 0) @@ -420,11 +422,11 @@ EvtScript N(D_802427F4_92CAA4) = { EVT_END }; -EvtScript N(D_802428A4_92CB54) = { +EvtScript N(EVS_InterpChompStatueRotation) = { EVT_CALL(MakeLerp, 180, 0, 60, EASING_QUADRATIC_OUT) EVT_LOOP(0) EVT_CALL(UpdateLerp) - EVT_EXEC_WAIT(N(D_802427F4_92CAA4)) + EVT_EXEC_WAIT(N(EVS_SetChompStatueRotation)) EVT_WAIT(1) EVT_IF_EQ(LVar1, 0) EVT_BREAK_LOOP @@ -434,94 +436,94 @@ EvtScript N(D_802428A4_92CB54) = { EVT_END }; -EvtScript N(D_80242928_92CBD8) = { +EvtScript N(EVS_Doors_Open) = { EVT_CALL(MakeLerp, 0, 60, 180, EASING_QUADRATIC_IN) EVT_LABEL(10) - EVT_CALL(UpdateLerp) - EVT_CALL(RotateModel, MODEL_o168, LVar0, 0, 1, 0) - EVT_CALL(RotateModel, MODEL_o177, LVar0, 0, 1, 0) - EVT_CALL(TranslateModel, MODEL_o169, -20, 0, 0) - EVT_CALL(TranslateModel, MODEL_o178, -20, 0, 0) - EVT_CALL(RotateModel, MODEL_o169, LVar0, 0, 1, 0) - EVT_CALL(RotateModel, MODEL_o178, LVar0, 0, 1, 0) - EVT_CALL(TranslateModel, MODEL_o169, 20, 0, 0) - EVT_CALL(TranslateModel, MODEL_o178, 20, 0, 0) - EVT_CALL(RotateModel, MODEL_o130, LVar0, 0, 1, 0) - EVT_CALL(RotateModel, MODEL_o176, LVar0, 0, 1, 0) - EVT_CALL(TranslateModel, MODEL_o175, -20, 0, 0) - EVT_CALL(TranslateModel, MODEL_o129, -20, 0, 0) - EVT_CALL(RotateModel, MODEL_o175, LVar0, 0, 1, 0) - EVT_CALL(RotateModel, MODEL_o129, LVar0, 0, 1, 0) - EVT_CALL(TranslateModel, MODEL_o175, 20, 0, 0) - EVT_CALL(TranslateModel, MODEL_o129, 20, 0, 0) - EVT_SET(LVar2, 0) - EVT_SUB(LVar2, LVar0) - EVT_CALL(RotateModel, MODEL_o141, LVar2, 0, 1, 0) - EVT_CALL(RotateModel, MODEL_o174, LVar2, 0, 1, 0) - EVT_CALL(TranslateModel, MODEL_o140, 20, 0, 0) - EVT_CALL(TranslateModel, MODEL_o173, 20, 0, 0) - EVT_CALL(RotateModel, MODEL_o140, LVar2, 0, 1, 0) - EVT_CALL(RotateModel, MODEL_o173, LVar2, 0, 1, 0) - EVT_CALL(TranslateModel, MODEL_o140, -20, 0, 0) - EVT_CALL(TranslateModel, MODEL_o173, -20, 0, 0) - EVT_CALL(RotateModel, MODEL_o157, LVar2, 0, 1, 0) - EVT_CALL(RotateModel, MODEL_o171, LVar2, 0, 1, 0) - EVT_CALL(TranslateModel, MODEL_o158, 20, 0, 0) - EVT_CALL(TranslateModel, MODEL_o172, 20, 0, 0) - EVT_CALL(RotateModel, MODEL_o158, LVar2, 0, 1, 0) - EVT_CALL(RotateModel, MODEL_o172, LVar2, 0, 1, 0) - EVT_CALL(TranslateModel, MODEL_o158, -20, 0, 0) - EVT_CALL(TranslateModel, MODEL_o172, -20, 0, 0) - EVT_WAIT(1) - EVT_IF_EQ(LVar1, 1) - EVT_GOTO(10) - EVT_END_IF + EVT_CALL(UpdateLerp) + EVT_CALL(RotateModel, MODEL_o168, LVar0, 0, 1, 0) + EVT_CALL(RotateModel, MODEL_o177, LVar0, 0, 1, 0) + EVT_CALL(TranslateModel, MODEL_o169, -20, 0, 0) + EVT_CALL(TranslateModel, MODEL_o178, -20, 0, 0) + EVT_CALL(RotateModel, MODEL_o169, LVar0, 0, 1, 0) + EVT_CALL(RotateModel, MODEL_o178, LVar0, 0, 1, 0) + EVT_CALL(TranslateModel, MODEL_o169, 20, 0, 0) + EVT_CALL(TranslateModel, MODEL_o178, 20, 0, 0) + EVT_CALL(RotateModel, MODEL_o130, LVar0, 0, 1, 0) + EVT_CALL(RotateModel, MODEL_o176, LVar0, 0, 1, 0) + EVT_CALL(TranslateModel, MODEL_o175, -20, 0, 0) + EVT_CALL(TranslateModel, MODEL_o129, -20, 0, 0) + EVT_CALL(RotateModel, MODEL_o175, LVar0, 0, 1, 0) + EVT_CALL(RotateModel, MODEL_o129, LVar0, 0, 1, 0) + EVT_CALL(TranslateModel, MODEL_o175, 20, 0, 0) + EVT_CALL(TranslateModel, MODEL_o129, 20, 0, 0) + EVT_SET(LVar2, 0) + EVT_SUB(LVar2, LVar0) + EVT_CALL(RotateModel, MODEL_o141, LVar2, 0, 1, 0) + EVT_CALL(RotateModel, MODEL_o174, LVar2, 0, 1, 0) + EVT_CALL(TranslateModel, MODEL_o140, 20, 0, 0) + EVT_CALL(TranslateModel, MODEL_o173, 20, 0, 0) + EVT_CALL(RotateModel, MODEL_o140, LVar2, 0, 1, 0) + EVT_CALL(RotateModel, MODEL_o173, LVar2, 0, 1, 0) + EVT_CALL(TranslateModel, MODEL_o140, -20, 0, 0) + EVT_CALL(TranslateModel, MODEL_o173, -20, 0, 0) + EVT_CALL(RotateModel, MODEL_o157, LVar2, 0, 1, 0) + EVT_CALL(RotateModel, MODEL_o171, LVar2, 0, 1, 0) + EVT_CALL(TranslateModel, MODEL_o158, 20, 0, 0) + EVT_CALL(TranslateModel, MODEL_o172, 20, 0, 0) + EVT_CALL(RotateModel, MODEL_o158, LVar2, 0, 1, 0) + EVT_CALL(RotateModel, MODEL_o172, LVar2, 0, 1, 0) + EVT_CALL(TranslateModel, MODEL_o158, -20, 0, 0) + EVT_CALL(TranslateModel, MODEL_o172, -20, 0, 0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 1) + EVT_GOTO(10) + EVT_END_IF EVT_CALL(MakeLerp, 0, 60, 180, EASING_QUADRATIC_OUT) EVT_LABEL(20) - EVT_CALL(UpdateLerp) - EVT_CALL(TranslateModel, MODEL_o169, -20, 0, 0) - EVT_CALL(TranslateModel, MODEL_o178, -20, 0, 0) - EVT_CALL(RotateModel, MODEL_o169, 60, 0, 1, 0) - EVT_CALL(RotateModel, MODEL_o178, 60, 0, 1, 0) - EVT_CALL(TranslateModel, MODEL_o169, 20, 0, 0) - EVT_CALL(TranslateModel, MODEL_o178, 20, 0, 0) - EVT_CALL(RotateModel, MODEL_o169, LVar0, 0, 1, 0) - EVT_CALL(RotateModel, MODEL_o178, LVar0, 0, 1, 0) - EVT_CALL(TranslateModel, MODEL_o175, -20, 0, 0) - EVT_CALL(TranslateModel, MODEL_o129, -20, 0, 0) - EVT_CALL(RotateModel, MODEL_o175, 60, 0, 1, 0) - EVT_CALL(RotateModel, MODEL_o129, 60, 0, 1, 0) - EVT_CALL(TranslateModel, MODEL_o175, 20, 0, 0) - EVT_CALL(TranslateModel, MODEL_o129, 20, 0, 0) - EVT_CALL(RotateModel, MODEL_o175, LVar0, 0, 1, 0) - EVT_CALL(RotateModel, MODEL_o129, LVar0, 0, 1, 0) - EVT_SET(LVar2, 0) - EVT_SUB(LVar2, LVar0) - EVT_CALL(TranslateModel, MODEL_o140, 20, 0, 0) - EVT_CALL(TranslateModel, MODEL_o173, 20, 0, 0) - EVT_CALL(RotateModel, MODEL_o140, -60, 0, 1, 0) - EVT_CALL(RotateModel, MODEL_o173, -60, 0, 1, 0) - EVT_CALL(TranslateModel, MODEL_o140, -20, 0, 0) - EVT_CALL(TranslateModel, MODEL_o173, -20, 0, 0) - EVT_CALL(RotateModel, MODEL_o140, LVar2, 0, 1, 0) - EVT_CALL(RotateModel, MODEL_o173, LVar2, 0, 1, 0) - EVT_CALL(TranslateModel, MODEL_o158, 20, 0, 0) - EVT_CALL(TranslateModel, MODEL_o172, 20, 0, 0) - EVT_CALL(RotateModel, MODEL_o158, -60, 0, 1, 0) - EVT_CALL(RotateModel, MODEL_o172, -60, 0, 1, 0) - EVT_CALL(TranslateModel, MODEL_o158, -20, 0, 0) - EVT_CALL(TranslateModel, MODEL_o172, -20, 0, 0) - EVT_CALL(RotateModel, MODEL_o158, LVar2, 0, 1, 0) - EVT_CALL(RotateModel, MODEL_o172, LVar2, 0, 1, 0) - EVT_WAIT(1) - EVT_IF_EQ(LVar1, 1) - EVT_GOTO(20) - EVT_END_IF + EVT_CALL(UpdateLerp) + EVT_CALL(TranslateModel, MODEL_o169, -20, 0, 0) + EVT_CALL(TranslateModel, MODEL_o178, -20, 0, 0) + EVT_CALL(RotateModel, MODEL_o169, 60, 0, 1, 0) + EVT_CALL(RotateModel, MODEL_o178, 60, 0, 1, 0) + EVT_CALL(TranslateModel, MODEL_o169, 20, 0, 0) + EVT_CALL(TranslateModel, MODEL_o178, 20, 0, 0) + EVT_CALL(RotateModel, MODEL_o169, LVar0, 0, 1, 0) + EVT_CALL(RotateModel, MODEL_o178, LVar0, 0, 1, 0) + EVT_CALL(TranslateModel, MODEL_o175, -20, 0, 0) + EVT_CALL(TranslateModel, MODEL_o129, -20, 0, 0) + EVT_CALL(RotateModel, MODEL_o175, 60, 0, 1, 0) + EVT_CALL(RotateModel, MODEL_o129, 60, 0, 1, 0) + EVT_CALL(TranslateModel, MODEL_o175, 20, 0, 0) + EVT_CALL(TranslateModel, MODEL_o129, 20, 0, 0) + EVT_CALL(RotateModel, MODEL_o175, LVar0, 0, 1, 0) + EVT_CALL(RotateModel, MODEL_o129, LVar0, 0, 1, 0) + EVT_SET(LVar2, 0) + EVT_SUB(LVar2, LVar0) + EVT_CALL(TranslateModel, MODEL_o140, 20, 0, 0) + EVT_CALL(TranslateModel, MODEL_o173, 20, 0, 0) + EVT_CALL(RotateModel, MODEL_o140, -60, 0, 1, 0) + EVT_CALL(RotateModel, MODEL_o173, -60, 0, 1, 0) + EVT_CALL(TranslateModel, MODEL_o140, -20, 0, 0) + EVT_CALL(TranslateModel, MODEL_o173, -20, 0, 0) + EVT_CALL(RotateModel, MODEL_o140, LVar2, 0, 1, 0) + EVT_CALL(RotateModel, MODEL_o173, LVar2, 0, 1, 0) + EVT_CALL(TranslateModel, MODEL_o158, 20, 0, 0) + EVT_CALL(TranslateModel, MODEL_o172, 20, 0, 0) + EVT_CALL(RotateModel, MODEL_o158, -60, 0, 1, 0) + EVT_CALL(RotateModel, MODEL_o172, -60, 0, 1, 0) + EVT_CALL(TranslateModel, MODEL_o158, -20, 0, 0) + EVT_CALL(TranslateModel, MODEL_o172, -20, 0, 0) + EVT_CALL(RotateModel, MODEL_o158, LVar2, 0, 1, 0) + EVT_CALL(RotateModel, MODEL_o172, LVar2, 0, 1, 0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 1) + EVT_GOTO(20) + EVT_END_IF EVT_RETURN EVT_END }; -EvtScript N(D_802431C0_92D470) = { +EvtScript N(EVS_Steps_Arise) = { EVT_CALL(EnableGroup, MODEL_step, TRUE) EVT_CALL(MakeLerp, -310, 0, 310, EASING_LINEAR) EVT_LOOP(0) @@ -536,7 +538,7 @@ EvtScript N(D_802431C0_92D470) = { EVT_END }; -EvtScript N(D_80243268_92D518) = { +EvtScript N(EVS_Steps_FinishRising) = { EVT_CALL(EnableGroup, MODEL_step, TRUE) EVT_CALL(MakeLerp, -20, 0, 20, EASING_LINEAR) EVT_LOOP(0) @@ -551,7 +553,7 @@ EvtScript N(D_80243268_92D518) = { EVT_END }; -EvtScript N(D_80243310_92D5C0) = { +EvtScript N(EVS_Steps_Unfold) = { EVT_CALL(PlaySoundAt, SOUND_5E, 0, 0, 39, -80) EVT_THREAD EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 5, EVT_FLOAT(0.2)) @@ -578,7 +580,7 @@ EvtScript N(D_80243310_92D5C0) = { EVT_END }; -EvtScript N(D_8024358C_92D83C) = { +EvtScript N(EVS_OnInteract_Pedestal) = { EVT_CALL(DisablePulseStone, TRUE) EVT_CALL(ShowKeyChoicePopup) EVT_IF_LE(LVar0, 0) @@ -591,7 +593,7 @@ EvtScript N(D_8024358C_92D83C) = { EVT_CALL(RemoveKeyItemAt, LVar1) EVT_CALL(CloseChoicePopup) EVT_SET(GB_StoryProgress, STORY_CH2_UNCOVERED_DRY_DRY_RUINS) - EVT_CALL(N(func_80240338_92A5E8)) + EVT_CALL(N(HideSun)) EVT_CALL(SetMusicTrack, 0, SONG_DRY_DRY_RUINS_APPEAR, 1, 8) EVT_CALL(UseSettingsFrom, CAM_DEFAULT, 0, 0, 0) EVT_CALL(SetPanTarget, CAM_DEFAULT, 210, 0, 137) @@ -603,13 +605,13 @@ EvtScript N(D_8024358C_92D83C) = { EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) EVT_WAIT(10) EVT_SET(LVar0, 180) - EVT_EXEC_WAIT(N(D_802427F4_92CAA4)) + EVT_EXEC_WAIT(N(EVS_SetChompStatueRotation)) EVT_THREAD EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 120, EVT_FLOAT(0.2)) EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 300, EVT_FLOAT(0.5)) EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 300, EVT_FLOAT(0.2)) EVT_END_THREAD - EVT_EXEC(N(D_80241258_92B508)) + EVT_EXEC(N(EVS_Pedestal_Sink)) EVT_WAIT(30) EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) EVT_IF_LT(LVar0, 0) @@ -625,23 +627,23 @@ EvtScript N(D_8024358C_92D83C) = { EVT_CALL(PlayerMoveTo, LVar0, 80, 0) EVT_CALL(func_802D2884, 0, 0, 0) EVT_END_THREAD - EVT_EXEC(N(D_80241430_92B6E0)) + EVT_EXEC(N(EVS_DarkenEnvironment)) EVT_WAIT(30) - EVT_CALL(CloneModel, MODEL_o225, 0x00002710) - EVT_EXEC(N(D_802414FC_92B7AC)) - EVT_EXEC(N(D_80241678_92B928)) - EVT_EXEC(N(D_80241790_92BA40)) + EVT_CALL(CloneModel, MODEL_o225, CLONED_MODEL(0)) + EVT_EXEC(N(EVS_TexPan_SandRing)) + EVT_EXEC(N(EVS_SandRing_Appear)) + EVT_EXEC(N(EVS_SandRingClone_Appear)) EVT_WAIT(100) - EVT_EXEC(N(D_80241B38_92BDE8)) + EVT_EXEC(N(EVS_LightRays_Appear)) EVT_WAIT(150) - EVT_EXEC(N(D_80241DE0_92C090)) - EVT_EXEC(N(D_802431C0_92D470)) + EVT_EXEC(N(EVS_Ruins_Arise)) + EVT_EXEC(N(EVS_Steps_Arise)) EVT_WAIT(100) EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(8.0), EVT_FLOAT(-9.0)) EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(0.2)) EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) EVT_WAIT(80) - EVT_EXEC(N(D_802428A4_92CB54)) + EVT_EXEC(N(EVS_InterpChompStatueRotation)) EVT_WAIT(60) EVT_WAIT(50) EVT_IF_EQ(LocalFlag(0), FALSE) @@ -654,18 +656,18 @@ EvtScript N(D_8024358C_92D83C) = { EVT_END }; -EvtScript N(EVS_80243A00) = { +EvtScript N(EVS_SetupRuins) = { EVT_SWITCH(GB_StoryProgress) EVT_CASE_LT(STORY_CH2_GOT_PULSE_STONE) EVT_CALL(EnableGroup, MODEL_day_version, FALSE) - EVT_CALL(ModifyColliderFlags, 0, COLLIDER_ruin, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_ruin, COLLIDER_FLAGS_UPPER_MASK) EVT_CASE_LT(STORY_CH2_UNCOVERED_DRY_DRY_RUINS) EVT_CALL(EnableGroup, MODEL_day_version, FALSE) - EVT_CALL(ModifyColliderFlags, 0, COLLIDER_ruin, COLLIDER_FLAGS_UPPER_MASK) - EVT_BIND_PADLOCK(EVT_PTR(N(D_8024358C_92D83C)), TRIGGER_WALL_PRESS_A, COLLIDER_iwa, EVT_PTR(N(D_80241250_92B500)), 0, 1) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_ruin, COLLIDER_FLAGS_UPPER_MASK) + EVT_BIND_PADLOCK(EVT_PTR(N(EVS_OnInteract_Pedestal)), TRIGGER_WALL_PRESS_A, COLLIDER_iwa, EVT_PTR(N(PedestalKeyList)), 0, 1) EVT_CASE_DEFAULT EVT_CALL(EnableModel, MODEL_point_iwa, FALSE) - EVT_CALL(ModifyColliderFlags, 0, COLLIDER_pikapika, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_pikapika, COLLIDER_FLAGS_UPPER_MASK) EVT_END_SWITCH EVT_CALL(EnableGroup, MODEL_ruins, FALSE) EVT_CALL(EnableGroup, MODEL_step, FALSE) @@ -675,12 +677,12 @@ EvtScript N(EVS_80243A00) = { EVT_END }; -EvtScript N(EVS_80243B38) = { +EvtScript N(EVS_Ruins_Arise_Continued) = { EVT_CALL(PlaySound, SOUND_5C) EVT_CALL(DisablePlayerInput, TRUE) EVT_CALL(func_802CF56C, 1) EVT_CALL(func_802D2884, 0, 0, 0) - EVT_CALL(ModifyColliderFlags, 0, COLLIDER_iwa, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_iwa, COLLIDER_FLAGS_UPPER_MASK) EVT_CALL(EnableModel, MODEL_point_iwa, FALSE) EVT_CALL(EnableGroup, MODEL_day_version, FALSE) EVT_THREAD @@ -696,17 +698,17 @@ EvtScript N(EVS_80243B38) = { EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) EVT_CALL(N(UnkFunc27), 2, 0, 3) EVT_CALL(N(UnkFunc27), 1, -1, 3) - EVT_CALL(N(UnkFunc27), 1, EVT_PTR(N(D_80241418_92B6C8)), 0) - EVT_CALL(N(UnkFunc27), 0, EVT_PTR(N(D_80241424_92B6D4)), 0) - EVT_CALL(N(func_80240364_92A614), 44, 32, 177, 0, 0, 0, 0) - EVT_EXEC(N(D_802422F0_92C5A0)) - EVT_EXEC(N(D_80243268_92D518)) - EVT_CALL(CloneModel, MODEL_o225, 0x00002710) - EVT_EXEC(N(D_802414FC_92B7AC)) - EVT_EXEC(N(D_802418B4_92BB64)) - EVT_EXEC(N(D_802419F0_92BCA0)) + EVT_CALL(N(UnkFunc27), 1, EVT_PTR(N(ModelList_Solid)), 0) + EVT_CALL(N(UnkFunc27), 0, EVT_PTR(N(ModelList_Translucent)), 0) + EVT_CALL(N(InterpWorldEnvColor), 44, 32, 177, 0, 0, 0, 0) + EVT_EXEC(N(EVS_Ruins_FinishRising)) + EVT_EXEC(N(EVS_Steps_FinishRising)) + EVT_CALL(CloneModel, MODEL_o225, CLONED_MODEL(0)) + EVT_EXEC(N(EVS_TexPan_SandRing)) + EVT_EXEC(N(EVS_SandRing_Vanish)) + EVT_EXEC(N(EVS_SandRingClone_Vanish)) EVT_WAIT(20) - EVT_EXEC(N(D_80241C90_92BF40)) + EVT_EXEC(N(EVS_LightRays_Vanish)) EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) EVT_CALL(UseSettingsFrom, CAM_DEFAULT, 0, 0, 0) EVT_CALL(SetPanTarget, CAM_DEFAULT, 0, 0, 0) @@ -715,9 +717,9 @@ EvtScript N(EVS_80243B38) = { EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(0.2)) EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) EVT_WAIT(100) - EVT_EXEC(N(D_80242928_92CBD8)) + EVT_EXEC(N(EVS_Doors_Open)) EVT_WAIT(100) - EVT_EXEC_WAIT(N(D_80243310_92D5C0)) + EVT_EXEC_WAIT(N(EVS_Steps_Unfold)) EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_CLEAR_BITS, COLLIDER_ruin, COLLIDER_FLAGS_UPPER_MASK) EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) EVT_WAIT(60) diff --git a/src/world/area_sbk/sbk_02/sbk_02_3_npc.c b/src/world/area_sbk/sbk_02/sbk_02_4_npc.c similarity index 72% rename from src/world/area_sbk/sbk_02/sbk_02_3_npc.c rename to src/world/area_sbk/sbk_02/sbk_02_4_npc.c index 4b267cad36..dafd6355e1 100644 --- a/src/world/area_sbk/sbk_02/sbk_02_3_npc.c +++ b/src/world/area_sbk/sbk_02/sbk_02_4_npc.c @@ -1,97 +1,22 @@ #include "sbk_02.h" #include "effects.h" - -#include "world/common/GetNpcCollisionHeight.inc.c" - -#include "world/common/AddPlayerHandsOffset.inc.c" - -// needs data -#ifdef NON_MATCHING -API_CALLABLE(func_8024091C_92ABCC) { - Bytecode* args = script->ptrReadPos; - if (isInitialCall) { - D_8024404C_92E2FC = FALSE; - } - if (D_8024404C_92E2FC) { - D_8024404C_92E2FC = FALSE; - evt_set_variable(script, *args++, D_80244050_92E300); - return ApiStatus_DONE2; - } else { - return ApiStatus_BLOCK; - } -} -#else -INCLUDE_ASM(s32, "world/area_sbk/sbk_02/92A9A0", func_8024091C_92ABCC); -#endif - -static s32 sbk_02_D_80245630[91]; -extern s32 D_8024404C_92E2FC; -extern s32 D_80244050_92E300; - -API_CALLABLE(func_80240970_92AC20) { - Bytecode* args = script->ptrReadPos; - - D_80244050_92E300 = evt_get_variable(script, *args++); - D_8024404C_92E2FC = TRUE; - return ApiStatus_DONE2; -} - -API_CALLABLE(func_802409A8_92AC58) { - Bytecode* args = script->ptrReadPos; - s32* buf = (s32*) evt_get_variable(script, *args++); - s32 i; - - if (buf != NULL) { - for (i = 0; *buf != NULL; i++) { - sbk_02_D_80245630[i] = *buf++; - } - sbk_02_D_80245630[i] = 0; - } else { - for (i = 0; i <= 90; i++) { - sbk_02_D_80245630[i] = i + 0x80; - sbk_02_D_80245630[91] = 0; - } - } - return ApiStatus_DONE2; -} - -#include "world/common/StashVars.inc.c" - -#include "world/common/GetItemName.inc.c" - -API_CALLABLE(PostChapter2StatUpdate) { - PlayerData* playerData = &gPlayerData; - - set_max_SP(2); - playerData->curHP = playerData->curMaxHP; - playerData->curFP = playerData->curMaxFP; - sync_status_menu(); - return ApiStatus_DONE2; -} - -API_CALLABLE(N(CheckTradeEventTime)) { - script->varTable[0] = (s32)((gPlayerData.frameCounter - gPlayerData.tradeEventStartTime) / 3600) < script->varTable[0]; - return ApiStatus_DONE2; -} - -API_CALLABLE(GetItemCount) { - script->varTable[0] = get_item_count(); - return ApiStatus_DONE2; -} - - NpcSettings N(NpcSettings_Mamar) = { .height = 26, .radius = 24, .level = 99, }; -s32 N(missing_80243F9C_3F9C)[] = { - 0x00000000, 0x00140014, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00630000, - 0x00000000, 0x00160018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00630000, +NpcSettings N(NpcSettings_Unused1) = { + .height = 20, + .radius = 20, + .level = 99, +}; + +NpcSettings N(NpcSettings_Unused2) = { + .height = 22, + .radius = 24, + .level = 99, }; NpcSettings N(NpcSettings_Toad) = { @@ -100,62 +25,15 @@ NpcSettings N(NpcSettings_Toad) = { .level = 99, }; -s32 N(missing_80244020_4020)[] = { - 0x00000000, 0x00170013, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00630000, +NpcSettings N(NpcSettings_Unused3) = { + .height = 23, + .radius = 19, + .level = 99, }; -s32 N(D_8024404C_92E2FC) = 0; +#include "world/common/complete/NormalItemChoice.inc.c" -s32 N(D_80244050_92E300) = 0; - -EvtScript N(D_80244054_92E304) = { - EVT_SET(LVar9, LVar1) - EVT_CALL(ShowConsumableChoicePopup) - EVT_SET(LVarA, LVar0) - EVT_SWITCH(LVar0) - EVT_CASE_EQ(0) - EVT_CASE_EQ(-1) - EVT_CASE_DEFAULT - EVT_CALL(RemoveItemAt, LVar1) - EVT_CALL(GetPlayerPos, LVar3, LVar4, LVar5) - EVT_CALL(N(AddPlayerHandsOffset), LVar3, LVar4, LVar5) - EVT_CALL(MakeItemEntity, LVar0, LVar3, LVar4, LVar5, ITEM_SPAWN_MODE_DECORATION, 0) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_60005) - EVT_WAIT(30) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) - EVT_CALL(RemoveItemEntity, LVar0) - EVT_END_SWITCH - EVT_CALL(N(func_80240970_92AC20), LVarA) - EVT_CALL(CloseChoicePopup) - EVT_UNBIND - EVT_RETURN - EVT_END -}; - -EvtScript N(D_80244188_92E438) = { - EVT_CALL(N(func_802409A8_92AC58), LVar0) - EVT_BIND_PADLOCK(EVT_PTR(N(D_80244054_92E304)), TRIGGER_FORCE_ACTIVATE, 0, 80245630_BSS[30], 0, 1) - EVT_CALL(N(func_8024091C_92ABCC), LVar0) - EVT_RETURN - EVT_END -}; - -s32** N(varStash) = NULL; - -EvtScript N(D_802441DC_92E48C) = { - EVT_CALL(ShowGotItem, LVar0, TRUE, 0) - EVT_RETURN - EVT_RETURN - EVT_END -}; - -EvtScript N(EVS_8024420C) = { - EVT_CALL(ShowGotItem, LVar0, TRUE, 16) - EVT_RETURN - EVT_RETURN - EVT_END -}; +#include "world/common/complete/GiveReward.inc.c" EvtScript N(EVS_NpcIdle_Mamar) = { EVT_LOOP(0) @@ -176,7 +54,17 @@ EvtScript N(EVS_NpcIdle_Mamar) = { EVT_END }; -EvtScript N(D_80244330_92E5E0) = { +API_CALLABLE(N(UpgradeStarPower)) { + PlayerData* playerData = &gPlayerData; + + set_max_SP(2); + playerData->curHP = playerData->curMaxHP; + playerData->curFP = playerData->curMaxFP; + sync_status_menu(); + return ApiStatus_DONE2; +} + +EvtScript N(EVS_Scene_RescuedMamar) = { EVT_CALL(DisablePartnerAI, 0) EVT_CALL(func_802CF56C, 2) EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) @@ -200,7 +88,7 @@ EvtScript N(D_80244330_92E5E0) = { EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(1.5)) EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) - EVT_CALL(SpeakToPlayer, NPC_Mamar, ANIM_WorldMamar_TalkHappy, ANIM_WorldMamar_Idle, 512, MSG_CH2_00EB) + EVT_CALL(SpeakToPlayer, NPC_Mamar, ANIM_WorldMamar_TalkHappy, ANIM_WorldMamar_Idle, SPEECH_FLAG_200, MSG_CH2_00EB) EVT_CALL(SetCamDistance, CAM_DEFAULT, EVT_FLOAT(300.0)) EVT_CALL(SetCamPitch, CAM_DEFAULT, 18, -9) EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(4.0)) @@ -240,7 +128,7 @@ EvtScript N(D_80244330_92E5E0) = { EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) EVT_CALL(SetNpcAnimation, NPC_Mamar, ANIM_WorldMamar_Idle) EVT_CALL(EnableNpcAI, NPC_Mamar, TRUE) - EVT_CALL(N(PostChapter2StatUpdate)) + EVT_CALL(N(UpgradeStarPower)) EVT_CALL(ShowMessageAtScreenPos, MSG_Menus_0192, 160, 40) EVT_WAIT(10) EVT_CALL(GetNpcPos, NPC_Mamar, LVar0, LVar1, LVar2) @@ -249,7 +137,7 @@ EvtScript N(D_80244330_92E5E0) = { EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) EVT_WAIT(10) - EVT_CALL(SpeakToPlayer, NPC_Mamar, ANIM_WorldMamar_TalkHappy, ANIM_WorldMamar_Idle, 512, MSG_CH2_00EC) + EVT_CALL(SpeakToPlayer, NPC_Mamar, ANIM_WorldMamar_TalkHappy, ANIM_WorldMamar_Idle, SPEECH_FLAG_200, MSG_CH2_00EC) EVT_WAIT(10) EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) EVT_CALL(GetNpcPos, NPC_Mamar, LVar3, LVar4, LVar5) @@ -261,7 +149,7 @@ EvtScript N(D_80244330_92E5E0) = { EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) EVT_WAIT(10) - EVT_CALL(SpeakToPlayer, NPC_Mamar, ANIM_WorldMamar_TalkHappy, ANIM_WorldMamar_Idle, 512, MSG_CH2_00ED) + EVT_CALL(SpeakToPlayer, NPC_Mamar, ANIM_WorldMamar_TalkHappy, ANIM_WorldMamar_Idle, SPEECH_FLAG_200, MSG_CH2_00ED) EVT_CALL(SetNpcFlagBits, NPC_Mamar, NPC_FLAG_40000, TRUE) EVT_THREAD EVT_LOOP(25) @@ -272,7 +160,7 @@ EvtScript N(D_80244330_92E5E0) = { EVT_END_THREAD EVT_THREAD EVT_SET(LVar2, 0) - EVT_SET(LVar3, 0x00000708) + EVT_SET(LVar3, 1800) EVT_CALL(MakeLerp, LVar2, LVar3, 100, EASING_CUBIC_IN) EVT_LOOP(0) EVT_CALL(UpdateLerp) @@ -309,7 +197,7 @@ EvtScript N(D_80244330_92E5E0) = { EVT_WAIT(20) EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) EVT_SET(GB_StoryProgress, STORY_CH2_STAR_SPRIT_DEPARTED) - EVT_EXEC(N(EVS_80240CC0)) + EVT_EXEC(N(EVS_SetupMusic)) EVT_CALL(EnablePartnerAI) EVT_CALL(DisablePlayerInput, FALSE) EVT_RETURN @@ -320,7 +208,7 @@ EvtScript N(EVS_NpcInit_Mamar) = { EVT_CALL(GetEntryID, LVar0) EVT_IF_EQ(LVar0, sbk_02_ENTRY_5) EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(EVS_NpcIdle_Mamar))) - EVT_EXEC(N(D_80244330_92E5E0)) + EVT_EXEC(N(EVS_Scene_RescuedMamar)) EVT_ELSE EVT_CALL(RemoveNpc, NPC_SELF) EVT_END_IF @@ -328,7 +216,18 @@ EvtScript N(EVS_NpcInit_Mamar) = { EVT_END }; -EvtScript N(EVS_NpcInteract_Toad) = { +API_CALLABLE(N(CheckTradeEventTime)) { + s32 timeElapsed = (gPlayerData.frameCounter - gPlayerData.tradeEventStartTime) / 3600; + script->varTable[0] = timeElapsed < script->varTable[0]; + return ApiStatus_DONE2; +} + +API_CALLABLE(N(GetItemCount)) { + script->varTable[0] = get_item_count(); + return ApiStatus_DONE2; +} + +EvtScript N(EVS_NpcInteract_TradingToad) = { EVT_SET(LVar0, 5) EVT_CALL(N(CheckTradeEventTime)) EVT_IF_EQ(LVar0, 0) @@ -347,19 +246,14 @@ EvtScript N(EVS_NpcInteract_Toad) = { EVT_RETURN EVT_END_IF EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Toad_Pink_Talk, ANIM_Toad_Pink_Idle, 0, MSG_CH2_00F0) - EVT_SET(LVar0, 0) - EVT_SET(LVar1, 2) - EVT_EXEC_WAIT(N(D_80244188_92E438)) + EVT_CHOOSE_ANY_CONSUMABLE() EVT_SWITCH(LVar0) EVT_CASE_EQ(-1) EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Toad_Pink_Talk, ANIM_Toad_Pink_Idle, 0, MSG_CH2_00F4) EVT_RETURN - EVT_CASE_EQ(214) + EVT_CASE_EQ(ITEM_NUTTY_CAKE) EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Toad_Pink_Talk, ANIM_Toad_Pink_Idle, 0, MSG_CH2_00F1) - EVT_SET(LVar0, ITEM_MAPLE_SUPER) - EVT_SET(LVar1, ITEM_TYPE_CONSUMABLE) - EVT_EXEC_WAIT(N(D_802441DC_92E48C)) - EVT_CALL(AddItem, LVar0, LVar1) + EVT_GIVE_CONSUMABLE_REWARD(ITEM_MAPLE_SUPER) EVT_WAIT(10) EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Toad_Pink_Talk, ANIM_Toad_Pink_Idle, 0, MSG_CH2_00F2) EVT_WAIT(10) @@ -378,7 +272,7 @@ EvtScript N(EVS_NpcInteract_Toad) = { EvtScript N(EVS_NpcInit_Toad) = { EVT_IF_NE(GF_TradingEvent2_Active, FALSE) - EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(EVS_NpcInteract_Toad))) + EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(EVS_NpcInteract_TradingToad))) EVT_ELSE EVT_CALL(RemoveNpc, NPC_SELF) EVT_END_IF @@ -418,8 +312,8 @@ StaticNpc N(NpcData_Mamar) = { }, }; -StaticNpc N(NpcData_Toad) = { - .id = NPC_Toad, +StaticNpc N(NpcData_TradingToad) = { + .id = NPC_TradingToad, .settings = &N(NpcSettings_Toad), .pos = { 0.0f, 2.0f, 150.0f }, .yaw = 90, @@ -453,6 +347,6 @@ StaticNpc N(NpcData_Toad) = { NpcGroupList N(DefaultNPCs) = { NPC_GROUP(N(NpcData_Mamar)), - NPC_GROUP(N(NpcData_Toad)), + NPC_GROUP(N(NpcData_TradingToad)), {} }; diff --git a/src/world/area_sbk/sbk_02/sbk_02_4_entity.c b/src/world/area_sbk/sbk_02/sbk_02_5_entity.c similarity index 100% rename from src/world/area_sbk/sbk_02/sbk_02_4_entity.c rename to src/world/area_sbk/sbk_02/sbk_02_5_entity.c diff --git a/src/world/area_sbk/sbk_03/sbk_03_1_main.c b/src/world/area_sbk/sbk_03/sbk_03_1_main.c index 36cb6f3a5c..b28621cfbd 100644 --- a/src/world/area_sbk/sbk_03/sbk_03_1_main.c +++ b/src/world/area_sbk/sbk_03/sbk_03_1_main.c @@ -18,7 +18,7 @@ MapSettings N(settings) = { .tattle = { MSG_MapTattle_sbk_03 }, }; -#include "world/common/SpawnSunEffect.inc.c" +#include "world/common/todo/SpawnSunEffect.inc.c" EvtScript N(EVS_ExitWalk_sbk_02_1) = EVT_EXIT_WALK(60, sbk_03_ENTRY_0, "sbk_02", sbk_02_ENTRY_1); EvtScript N(EVS_ExitWalk_sbk_04_0) = EVT_EXIT_WALK(60, sbk_03_ENTRY_1, "sbk_04", sbk_04_ENTRY_0); diff --git a/src/world/area_sbk/sbk_04/sbk_04_1_main.c b/src/world/area_sbk/sbk_04/sbk_04_1_main.c index ad8caf837f..4ef4a7c144 100644 --- a/src/world/area_sbk/sbk_04/sbk_04_1_main.c +++ b/src/world/area_sbk/sbk_04/sbk_04_1_main.c @@ -18,7 +18,7 @@ MapSettings N(settings) = { .tattle = { MSG_MapTattle_sbk_04 }, }; -#include "world/common/SpawnSunEffect.inc.c" +#include "world/common/todo/SpawnSunEffect.inc.c" EvtScript N(EVS_ExitWalk_sbk_03_1) = EVT_EXIT_WALK(60, sbk_04_ENTRY_0, "sbk_03", sbk_03_ENTRY_1); EvtScript N(EVS_ExitWalk_sbk_05_0) = EVT_EXIT_WALK(60, sbk_04_ENTRY_1, "sbk_05", sbk_05_ENTRY_0); diff --git a/src/world/area_sbk/sbk_05/sbk_05_1_main.c b/src/world/area_sbk/sbk_05/sbk_05_1_main.c index 32d7a3f87b..4022569af1 100644 --- a/src/world/area_sbk/sbk_05/sbk_05_1_main.c +++ b/src/world/area_sbk/sbk_05/sbk_05_1_main.c @@ -20,7 +20,7 @@ MapSettings N(settings) = { .tattle = { MSG_MapTattle_sbk_05 }, }; -#include "world/common/SpawnSunEffect.inc.c" +#include "world/common/todo/SpawnSunEffect.inc.c" EvtScript N(EVS_ExitWalk_sbk_04_1) = EVT_EXIT_WALK(60, sbk_05_ENTRY_0, "sbk_04", sbk_04_ENTRY_1); EvtScript N(EVS_ExitWalk_sbk_06_0) = EVT_EXIT_WALK(60, sbk_05_ENTRY_1, "sbk_06", sbk_06_ENTRY_0); diff --git a/src/world/area_sbk/sbk_06/sbk_06_1_main.c b/src/world/area_sbk/sbk_06/sbk_06_1_main.c index 144fe39bed..e164f0e95b 100644 --- a/src/world/area_sbk/sbk_06/sbk_06_1_main.c +++ b/src/world/area_sbk/sbk_06/sbk_06_1_main.c @@ -20,7 +20,7 @@ MapSettings N(settings) = { .tattle = { MSG_MapTattle_sbk_06 }, }; -#include "world/common/SpawnSunEffect.inc.c" +#include "world/common/todo/SpawnSunEffect.inc.c" EvtScript N(EVS_ExitWalk_sbk_05_1) = EVT_EXIT_WALK(60, sbk_06_ENTRY_0, "sbk_05", sbk_05_ENTRY_1); EvtScript N(EVS_ExitWalk_sbk_16_2) = EVT_EXIT_WALK(60, sbk_06_ENTRY_3, "sbk_16", sbk_16_ENTRY_2); diff --git a/src/world/area_sbk/sbk_10/sbk_10_1_main.c b/src/world/area_sbk/sbk_10/sbk_10_1_main.c index 3d10717eb3..1d5f910c48 100644 --- a/src/world/area_sbk/sbk_10/sbk_10_1_main.c +++ b/src/world/area_sbk/sbk_10/sbk_10_1_main.c @@ -18,7 +18,7 @@ MapSettings N(settings) = { .tattle = { MSG_MapTattle_sbk_10 }, }; -#include "world/common/SpawnSunEffect.inc.c" +#include "world/common/todo/SpawnSunEffect.inc.c" EvtScript N(EVS_ExitWalk_sbk_11_0) = EVT_EXIT_WALK(60, sbk_10_ENTRY_1, "sbk_11", sbk_11_ENTRY_0); EvtScript N(EVS_ExitWalk_sbk_00_3) = EVT_EXIT_WALK(60, sbk_10_ENTRY_2, "sbk_00", sbk_00_ENTRY_3); diff --git a/src/world/area_sbk/sbk_11/sbk_11_1_main.c b/src/world/area_sbk/sbk_11/sbk_11_1_main.c index 16c7f1b483..e014ab0267 100644 --- a/src/world/area_sbk/sbk_11/sbk_11_1_main.c +++ b/src/world/area_sbk/sbk_11/sbk_11_1_main.c @@ -18,7 +18,7 @@ MapSettings N(settings) = { .tattle = { MSG_MapTattle_sbk_11 }, }; -#include "world/common/SpawnSunEffect.inc.c" +#include "world/common/todo/SpawnSunEffect.inc.c" EvtScript N(EVS_ExitWalk_sbk_10_1) = EVT_EXIT_WALK(60, sbk_11_ENTRY_0, "sbk_10", sbk_10_ENTRY_1); EvtScript N(EVS_ExitWalk_sbk_12_0) = EVT_EXIT_WALK(60, sbk_11_ENTRY_1, "sbk_12", sbk_12_ENTRY_0); diff --git a/src/world/area_sbk/sbk_12/sbk_12_1_main.c b/src/world/area_sbk/sbk_12/sbk_12_1_main.c index 1571e76193..c37b3a2084 100644 --- a/src/world/area_sbk/sbk_12/sbk_12_1_main.c +++ b/src/world/area_sbk/sbk_12/sbk_12_1_main.c @@ -18,7 +18,7 @@ MapSettings N(settings) = { .tattle = { MSG_MapTattle_sbk_12 }, }; -#include "world/common/SpawnSunEffect.inc.c" +#include "world/common/todo/SpawnSunEffect.inc.c" EvtScript N(EVS_ExitWalk_sbk_11_1) = EVT_EXIT_WALK(60, sbk_12_ENTRY_0, "sbk_11", sbk_11_ENTRY_1); EvtScript N(EVS_ExitWalk_sbk_13_0) = EVT_EXIT_WALK(60, sbk_12_ENTRY_1, "sbk_13", sbk_13_ENTRY_0); diff --git a/src/world/area_sbk/sbk_13/sbk_13_1_main.c b/src/world/area_sbk/sbk_13/sbk_13_1_main.c index 79eed4e6f3..a3262065b1 100644 --- a/src/world/area_sbk/sbk_13/sbk_13_1_main.c +++ b/src/world/area_sbk/sbk_13/sbk_13_1_main.c @@ -18,7 +18,7 @@ MapSettings N(settings) = { .tattle = { MSG_MapTattle_sbk_13 }, }; -#include "world/common/SpawnSunEffect.inc.c" +#include "world/common/todo/SpawnSunEffect.inc.c" EvtScript N(EVS_ExitWalk_sbk_12_1) = EVT_EXIT_WALK(60, sbk_13_ENTRY_0, "sbk_12", sbk_12_ENTRY_1); EvtScript N(EVS_ExitWalk_sbk_14_0) = EVT_EXIT_WALK(60, sbk_13_ENTRY_1, "sbk_14", sbk_14_ENTRY_0); diff --git a/src/world/area_sbk/sbk_14/sbk_14_1_main.c b/src/world/area_sbk/sbk_14/sbk_14_1_main.c index 87d4a36ce2..e42b76fcb5 100644 --- a/src/world/area_sbk/sbk_14/sbk_14_1_main.c +++ b/src/world/area_sbk/sbk_14/sbk_14_1_main.c @@ -20,7 +20,7 @@ MapSettings N(settings) = { .tattle = { MSG_MapTattle_sbk_14 }, }; -#include "world/common/SpawnSunEffect.inc.c" +#include "world/common/todo/SpawnSunEffect.inc.c" EvtScript N(EVS_ExitWalk_sbk_13_1) = EVT_EXIT_WALK(60, sbk_14_ENTRY_0, "sbk_13", sbk_13_ENTRY_1); EvtScript N(EVS_ExitWalk_sbk_15_0) = EVT_EXIT_WALK(60, sbk_14_ENTRY_1, "sbk_15", sbk_15_ENTRY_0); diff --git a/src/world/area_sbk/sbk_15/sbk_15_1_main.c b/src/world/area_sbk/sbk_15/sbk_15_1_main.c index 14c994dbd3..8ed17bd9c2 100644 --- a/src/world/area_sbk/sbk_15/sbk_15_1_main.c +++ b/src/world/area_sbk/sbk_15/sbk_15_1_main.c @@ -18,7 +18,7 @@ MapSettings N(settings) = { .tattle = { MSG_MapTattle_sbk_15 }, }; -#include "world/common/SpawnSunEffect.inc.c" +#include "world/common/todo/SpawnSunEffect.inc.c" EvtScript N(EVS_ExitWalk_sbk_14_1) = EVT_EXIT_WALK(60, sbk_15_ENTRY_0, "sbk_14", sbk_14_ENTRY_1); EvtScript N(EVS_ExitWalk_sbk_16_0) = EVT_EXIT_WALK(60, sbk_15_ENTRY_1, "sbk_16", sbk_16_ENTRY_0); diff --git a/src/world/area_sbk/sbk_16/sbk_16_1_main.c b/src/world/area_sbk/sbk_16/sbk_16_1_main.c index 70df86dd8d..caf51c323f 100644 --- a/src/world/area_sbk/sbk_16/sbk_16_1_main.c +++ b/src/world/area_sbk/sbk_16/sbk_16_1_main.c @@ -18,7 +18,7 @@ MapSettings N(settings) = { .tattle = { MSG_MapTattle_sbk_16 }, }; -#include "world/common/SpawnSunEffect.inc.c" +#include "world/common/todo/SpawnSunEffect.inc.c" EvtScript N(EVS_ExitWalk_sbk_15_1) = EVT_EXIT_WALK(60, sbk_16_ENTRY_0, "sbk_15", sbk_15_ENTRY_1); EvtScript N(EVS_ExitWalk_sbk_06_3) = EVT_EXIT_WALK(60, sbk_16_ENTRY_2, "sbk_06", sbk_06_ENTRY_3); diff --git a/src/world/area_sbk/sbk_20/sbk_20_1_main.c b/src/world/area_sbk/sbk_20/sbk_20_1_main.c index 59b32a308b..7c3a52c8d1 100644 --- a/src/world/area_sbk/sbk_20/sbk_20_1_main.c +++ b/src/world/area_sbk/sbk_20/sbk_20_1_main.c @@ -20,7 +20,7 @@ MapSettings N(settings) = { .tattle = { MSG_MapTattle_sbk_20 }, }; -#include "world/common/SpawnSunEffect.inc.c" +#include "world/common/todo/SpawnSunEffect.inc.c" EvtScript N(EVS_ExitWalk_sbk_21_0) = EVT_EXIT_WALK(60, sbk_20_ENTRY_1, "sbk_21", sbk_21_ENTRY_0); EvtScript N(EVS_ExitWalk_sbk_10_3) = EVT_EXIT_WALK(60, sbk_20_ENTRY_2, "sbk_10", sbk_10_ENTRY_3); diff --git a/src/world/area_sbk/sbk_21/sbk_21_1_main.c b/src/world/area_sbk/sbk_21/sbk_21_1_main.c index b1dd21758d..29b937886d 100644 --- a/src/world/area_sbk/sbk_21/sbk_21_1_main.c +++ b/src/world/area_sbk/sbk_21/sbk_21_1_main.c @@ -17,7 +17,7 @@ MapSettings N(settings) = { .tattle = { MSG_MapTattle_sbk_21 }, }; -#include "world/common/SpawnSunEffect.inc.c" +#include "world/common/todo/SpawnSunEffect.inc.c" EvtScript N(EVS_ExitWalk_sbk_20_1) = EVT_EXIT_WALK(60, sbk_21_ENTRY_0, "sbk_20", sbk_20_ENTRY_1); EvtScript N(EVS_ExitWalk_sbk_22_0) = EVT_EXIT_WALK(60, sbk_21_ENTRY_1, "sbk_22", sbk_22_ENTRY_0); diff --git a/src/world/area_sbk/sbk_22/sbk_22_1_main.c b/src/world/area_sbk/sbk_22/sbk_22_1_main.c index ee391353b2..a8de3a2fad 100644 --- a/src/world/area_sbk/sbk_22/sbk_22_1_main.c +++ b/src/world/area_sbk/sbk_22/sbk_22_1_main.c @@ -19,7 +19,7 @@ MapSettings N(settings) = { .tattle = { MSG_MapTattle_sbk_22 }, }; -#include "world/common/SpawnSunEffect.inc.c" +#include "world/common/todo/SpawnSunEffect.inc.c" EvtScript N(EVS_ExitWalk_sbk_21_1) = EVT_EXIT_WALK(60, sbk_22_ENTRY_0, "sbk_21", sbk_21_ENTRY_1); EvtScript N(EVS_ExitWalk_sbk_23_0) = EVT_EXIT_WALK(60, sbk_22_ENTRY_1, "sbk_23", sbk_23_ENTRY_0); diff --git a/src/world/area_sbk/sbk_23/sbk_23_1_main.c b/src/world/area_sbk/sbk_23/sbk_23_1_main.c index b2a21b64c5..87bc2dba77 100644 --- a/src/world/area_sbk/sbk_23/sbk_23_1_main.c +++ b/src/world/area_sbk/sbk_23/sbk_23_1_main.c @@ -18,7 +18,7 @@ MapSettings N(settings) = { .tattle = { MSG_MapTattle_sbk_23 }, }; -#include "world/common/SpawnSunEffect.inc.c" +#include "world/common/todo/SpawnSunEffect.inc.c" EvtScript N(EVS_ExitWalk_sbk_22_1) = EVT_EXIT_WALK(60, sbk_23_ENTRY_0, "sbk_22", sbk_22_ENTRY_1); EvtScript N(EVS_ExitWalk_sbk_24_0) = EVT_EXIT_WALK(60, sbk_23_ENTRY_1, "sbk_24", sbk_24_ENTRY_0); diff --git a/src/world/area_sbk/sbk_24/sbk_24_1_main.c b/src/world/area_sbk/sbk_24/sbk_24_1_main.c index 3da35daa65..315ce63e68 100644 --- a/src/world/area_sbk/sbk_24/sbk_24_1_main.c +++ b/src/world/area_sbk/sbk_24/sbk_24_1_main.c @@ -21,7 +21,7 @@ MapSettings N(settings) = { .tattle = { MSG_MapTattle_sbk_24 }, }; -#include "world/common/SpawnSunEffect.inc.c" +#include "world/common/todo/SpawnSunEffect.inc.c" EvtScript N(EVS_ExitWalk_sbk_23_1) = EVT_EXIT_WALK(60, sbk_24_ENTRY_0, "sbk_23", sbk_23_ENTRY_1); EvtScript N(EVS_ExitWalk_sbk_25_0) = EVT_EXIT_WALK(60, sbk_24_ENTRY_1, "sbk_25", sbk_25_ENTRY_0); diff --git a/src/world/area_sbk/sbk_25/sbk_25_1_main.c b/src/world/area_sbk/sbk_25/sbk_25_1_main.c index 7e3a1b8888..e5f6c74871 100644 --- a/src/world/area_sbk/sbk_25/sbk_25_1_main.c +++ b/src/world/area_sbk/sbk_25/sbk_25_1_main.c @@ -20,7 +20,7 @@ MapSettings N(settings) = { .tattle = { MSG_MapTattle_sbk_25 }, }; -#include "world/common/SpawnSunEffect.inc.c" +#include "world/common/todo/SpawnSunEffect.inc.c" EvtScript N(EVS_ExitWalk_sbk_24_1) = EVT_EXIT_WALK(60, sbk_25_ENTRY_0, "sbk_24", sbk_24_ENTRY_1); EvtScript N(EVS_ExitWalk_sbk_26_0) = EVT_EXIT_WALK(60, sbk_25_ENTRY_1, "sbk_26", sbk_26_ENTRY_0); diff --git a/src/world/area_sbk/sbk_26/sbk_26_1_main.c b/src/world/area_sbk/sbk_26/sbk_26_1_main.c index cab075d9d4..ff04ca0ccc 100644 --- a/src/world/area_sbk/sbk_26/sbk_26_1_main.c +++ b/src/world/area_sbk/sbk_26/sbk_26_1_main.c @@ -19,7 +19,7 @@ MapSettings N(settings) = { .tattle = { MSG_MapTattle_sbk_26 }, }; -#include "world/common/SpawnSunEffect.inc.c" +#include "world/common/todo/SpawnSunEffect.inc.c" EvtScript N(EVS_ExitWalk_sbk_25_1) = EVT_EXIT_WALK(60, sbk_26_ENTRY_0, "sbk_25", sbk_25_ENTRY_1); EvtScript N(EVS_ExitWalk_sbk_16_3) = EVT_EXIT_WALK(60, sbk_26_ENTRY_2, "sbk_16", sbk_16_ENTRY_3); diff --git a/src/world/area_sbk/sbk_30/93F5B0.c b/src/world/area_sbk/sbk_30/93F5B0.c deleted file mode 100644 index bdb004465d..0000000000 --- a/src/world/area_sbk/sbk_30/93F5B0.c +++ /dev/null @@ -1,85 +0,0 @@ -#include "sbk_30.h" - -static char* N(exit_str_0) = "sbk_99"; -static char* N(exit_str_1) = "sbk_31"; -static char* N(exit_str_2) = "sbk_20"; -static char* N(exit_str_3) = "sbk_40"; -static char* N(exit_str_4) = "dro_01"; -static char* N(exit_str_5) = ""; - -s32 N(get_tattle)(void) { - s32 tattle; - if (evt_get_variable(NULL, GB_StoryProgress) > STORY_CH2_STAR_SPRIT_DEPARTED) { - tattle = MSG_MapTattle_sbk_30_after; - } else { - tattle = MSG_MapTattle_sbk_30_before; - } - return tattle; -} - -#include "world/common/atomic/UnkFunc27.inc.c" - -#include "world/common/SpawnSunEffect.inc.c" - -#include "world/common/enemy/StationaryAI.inc.c" - -#include "world/common/StashVars.inc.c" - -#include "world/common/GetItemName.inc.c" - -#include "world/common/GetNpcCollisionHeight.inc.c" - -#include "world/common/AddPlayerHandsOffset.inc.c" - -// AwaitLetterChoiceResult -INCLUDE_ASM(s32, "world/area_sbk/sbk_30/93F5B0", func_80241120_9406D0); - -// SetLetterChoiceResult -INCLUDE_ASM(s32, "world/area_sbk/sbk_30/93F5B0", func_80241174_940724); - -extern s32 sbk_30_D_80244A50[]; - -ApiStatus func_802411AC_94075C(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++) { - sbk_30_D_80244A50[i] = ptr[i]; - } - sbk_30_D_80244A50[i] = 0; - } else { - for (i = 0; i < 112; i++) { - sbk_30_D_80244A50[i] = i + 16; - sbk_30_D_80244A50[112] = 0; - } - } - return ApiStatus_DONE2; -} - -extern s32 sbk_30_D_80244C18[]; - -ApiStatus func_80241248_9407F8(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++) { - sbk_30_D_80244C18[i] = ptr[i]; - } - sbk_30_D_80244C18[i] = 0; - } else { - for (i = 0; i < 91; i++) { - sbk_30_D_80244C18[i] = i + 128; - sbk_30_D_80244C18[91] = 0; - } - } - return ApiStatus_DONE2; -} - -extern s32 N(LetterDelivery_SavedNpcAnim); -#include "world/common/LetterDelivery.inc.c" - -#include "common/foliage.inc.c" diff --git a/src/world/area_sbk/sbk_30/sbk_30.h b/src/world/area_sbk/sbk_30/sbk_30.h index 88861f1739..02ecc59ca0 100644 --- a/src/world/area_sbk/sbk_30/sbk_30.h +++ b/src/world/area_sbk/sbk_30/sbk_30.h @@ -25,3 +25,8 @@ enum { }; #define NAMESPACE sbk_30 + +extern EvtScript N(EVS_Main); +extern EvtScript N(EVS_SetupMusic); +extern EvtScript N(EVS_SetupFoliage); +extern NpcGroupList N(DefaultNPCs); diff --git a/src/world/area_sbk/sbk_30/sbk_30_0_header.c b/src/world/area_sbk/sbk_30/sbk_30_0_header.c new file mode 100644 index 0000000000..a4f0f38eec --- /dev/null +++ b/src/world/area_sbk/sbk_30/sbk_30_0_header.c @@ -0,0 +1,28 @@ +#include "sbk_30.h" + +s32 N(get_tattle)(void) { + s32 tattle; + if (evt_get_variable(NULL, GB_StoryProgress) > STORY_CH2_STAR_SPRIT_DEPARTED) { + tattle = MSG_MapTattle_sbk_30_after; + } else { + tattle = MSG_MapTattle_sbk_30_before; + } + return tattle; +} + +EntryList N(Entrances) = { + [sbk_30_ENTRY_0] { -475.0, 0.0, 0.0, 90.0 }, + [sbk_30_ENTRY_1] { 475.0, 0.0, 0.0, 270.0 }, + [sbk_30_ENTRY_2] { 0.0, 0.0, -475.0, 180.0 }, + [sbk_30_ENTRY_3] { 0.0, 0.0, 475.0, 0.0 }, + [sbk_30_ENTRY_4] { 0.0, 0.0, 0.0, 0.0 }, + [sbk_30_ENTRY_5] { 0.0, 0.0, 0.0, 0.0 }, +}; + +MapSettings N(settings) = { + .main = &N(EVS_Main), + .entryList = &N(Entrances), + .entryCount = ENTRY_COUNT(N(Entrances)), + .background = &gBackgroundImage, + .tattle = { .get = &N(get_tattle) }, +}; diff --git a/src/world/area_sbk/sbk_30/sbk_30_1_music.c b/src/world/area_sbk/sbk_30/sbk_30_1_music.c new file mode 100644 index 0000000000..198a755181 --- /dev/null +++ b/src/world/area_sbk/sbk_30/sbk_30_1_music.c @@ -0,0 +1,15 @@ +#include "sbk_30.h" + +EvtScript N(EVS_SetupMusic) = { + EVT_CALL(GetEntryID, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_OR_EQ(sbk_30_ENTRY_4) + EVT_CASE_OR_EQ(sbk_30_ENTRY_5) + EVT_END_CASE_GROUP + EVT_CASE_DEFAULT + EVT_CALL(SetMusicTrack, 0, SONG_DRY_DRY_DESERT, 0, 8) + EVT_END_CASE_GROUP + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_sbk/sbk_30/sbk_30_1_main.c b/src/world/area_sbk/sbk_30/sbk_30_2_main.c similarity index 66% rename from src/world/area_sbk/sbk_30/sbk_30_1_main.c rename to src/world/area_sbk/sbk_30/sbk_30_2_main.c index 2c05c955ec..56e788772c 100644 --- a/src/world/area_sbk/sbk_30/sbk_30_1_main.c +++ b/src/world/area_sbk/sbk_30/sbk_30_2_main.c @@ -1,53 +1,8 @@ #include "sbk_30.h" -extern EvtScript N(EVS_Main); -extern EvtScript N(EVS_SetupFoliage); -extern NpcGroupList N(DefaultNPCs); - -s32 N(get_tattle)(void) { - s32 tattle; - if (evt_get_variable(NULL, GB_StoryProgress) > STORY_CH2_STAR_SPRIT_DEPARTED) { - tattle = MSG_MapTattle_sbk_30_after; - } else { - tattle = MSG_MapTattle_sbk_30_before; - } - return tattle; -} - -EntryList N(Entrances) = { - [sbk_30_ENTRY_0] { -475.0, 0.0, 0.0, 90.0 }, - [sbk_30_ENTRY_1] { 475.0, 0.0, 0.0, 270.0 }, - [sbk_30_ENTRY_2] { 0.0, 0.0, -475.0, 180.0 }, - [sbk_30_ENTRY_3] { 0.0, 0.0, 475.0, 0.0 }, - [sbk_30_ENTRY_4] { 0.0, 0.0, 0.0, 0.0 }, - [sbk_30_ENTRY_5] { 0.0, 0.0, 0.0, 0.0 }, -}; - -MapSettings N(settings) = { - .main = &N(EVS_Main), - .entryList = &N(Entrances), - .entryCount = ENTRY_COUNT(N(Entrances)), - .background = &gBackgroundImage, - .tattle = { &N(get_tattle) }, -}; - -EvtScript N(D_802418B0_940E60) = { - EVT_CALL(GetEntryID, LVar0) - EVT_SWITCH(LVar0) - EVT_CASE_OR_EQ(sbk_30_ENTRY_4) - EVT_CASE_OR_EQ(sbk_30_ENTRY_5) - EVT_END_CASE_GROUP - EVT_CASE_DEFAULT - EVT_CALL(SetMusicTrack, 0, SONG_DRY_DRY_DESERT, 0, 8) - EVT_END_CASE_GROUP - EVT_END_SWITCH - EVT_RETURN - EVT_END -}; - #include "world/common/atomic/UnkFunc27.inc.c" -#include "world/common/SpawnSunEffect.inc.c" +#include "world/common/todo/SpawnSunEffect.inc.c" EvtScript N(EVS_ExitWalk_sbk_99_1) = EVT_EXIT_WALK(60, sbk_30_ENTRY_0, "sbk_99", sbk_99_ENTRY_1); EvtScript N(EVS_ExitWalk_sbk_31_0) = EVT_EXIT_WALK(60, sbk_30_ENTRY_1, "sbk_31", sbk_31_ENTRY_0); @@ -63,7 +18,7 @@ EvtScript N(EVS_BindExitTriggers) = { EVT_END }; -EvtScript N(D_80241B20_9410D0) = { +EvtScript N(EVS_EnterMap) = { EVT_CALL(GetEntryID, LVar0) EVT_SWITCH(LVar0) EVT_CASE_EQ(sbk_30_ENTRY_0) @@ -83,7 +38,7 @@ EvtScript N(D_80241B20_9410D0) = { EVT_END }; -EvtScript N(D_80241BEC_94119C) = { +EvtScript N(EVS_Scene_RuinsRising) = { EVT_CALL(PlaySound, SOUND_80000060) EVT_CALL(UseSettingsFrom, CAM_DEFAULT, 193, 0, -237) EVT_CALL(SetPanTarget, CAM_DEFAULT, 193, 0, -237) @@ -123,17 +78,17 @@ EvtScript N(EVS_Main) = { EVT_ELSE EVT_CALL(EnableGroup, MODEL_g23, FALSE) EVT_CALL(EnableGroup, MODEL_sakji_tent, FALSE) - EVT_CALL(ModifyColliderFlags, 0, COLLIDER_Default, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_Default, COLLIDER_FLAGS_UPPER_MASK) EVT_CALL(SetZoneEnabled, ZONE_o25, FALSE) EVT_END_IF - EVT_EXEC(N(D_802418B0_940E60)) - EVT_EXEC(N(D_80241B20_9410D0)) + EVT_EXEC(N(EVS_SetupMusic)) + EVT_EXEC(N(EVS_EnterMap)) EVT_EXEC(N(EVS_SetupFoliage)) EVT_CALL(GetEntryID, LVar0) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(sbk_30_ENTRY_4) EVT_CASE_OR_EQ(sbk_30_ENTRY_5) - EVT_EXEC_WAIT(N(D_80241BEC_94119C)) + EVT_EXEC_WAIT(N(EVS_Scene_RuinsRising)) EVT_END_CASE_GROUP EVT_CASE_DEFAULT EVT_CALL(N(SpawnSunEffect)) @@ -141,3 +96,5 @@ EvtScript N(EVS_Main) = { EVT_RETURN EVT_END }; + +MAP_RODATA_PAD(1,main); diff --git a/src/world/area_sbk/sbk_30/sbk_30_2_npc.c b/src/world/area_sbk/sbk_30/sbk_30_3_npc.c similarity index 94% rename from src/world/area_sbk/sbk_30/sbk_30_2_npc.c rename to src/world/area_sbk/sbk_30/sbk_30_3_npc.c index 5748b772a7..9d73561123 100644 --- a/src/world/area_sbk/sbk_30/sbk_30_2_npc.c +++ b/src/world/area_sbk/sbk_30/sbk_30_3_npc.c @@ -1,6 +1,8 @@ #include "sbk_30.h" +#include "world/common/enemy/ai/StationaryAI.inc.c" + NpcSettings N(NpcSettings_Kolorado) = { .height = 40, .radius = 24, @@ -19,6 +21,11 @@ NpcSettings N(NpcSettings_Archeologist_01) = { .level = 99, }; +#include "world/common/complete/GiveReward.inc.c" +#include "world/common/complete/KeyItemChoice.inc.c" +MAP_STATIC_PAD(2,main); +#include "world/common/complete/NormalItemChoice.inc.c" + #include "world/common/atomic/LetterChoice.inc.c" s32 N(LetterList)[] = { @@ -26,10 +33,10 @@ s32 N(LetterList)[] = { ITEM_NONE }; -EvtScript N(D_80242A8C_94203C) = { +EvtScript N(EVS_DeliveryPrompt) = { EVT_CALL(N(LetterDelivery_Init), NPC_Kolorado, ANIM_Kolorado_Talk, ANIM_Kolorado_Idle, - ITEM_LETTER25, 0, + ITEM_LETTER25, ITEM_NONE, MSG_CH2_004A, MSG_CH2_004B, MSG_CH2_004C, MSG_CH2_004D, EVT_PTR(N(LetterList))) EVT_EXEC_WAIT(N(EVS_DoLetterDelivery)) @@ -37,12 +44,9 @@ EvtScript N(D_80242A8C_94203C) = { EVT_END }; -EvtScript N(D_80242ADC_94208C) = { +EvtScript N(EVS_DeliveryReward) = { EVT_IF_EQ(LVarC, 2) - EVT_SET(LVar0, 348) - EVT_SET(LVar1, 3) - EVT_EXEC_WAIT(N(Delivery_ShowGotStarPiece)) - EVT_CALL(AddStarPieces, 1) + EVT_GIVE_STAR_PIECE() EVT_END_IF EVT_RETURN EVT_END @@ -53,13 +57,10 @@ s32 N(ArtifactList)[] = { ITEM_NONE }; -EvtScript N(D_80242B48_9420F8) = { +EvtScript N(EVS_ArtifactPrompt) = { EVT_SET(GF_SBK_GaveArtifactToKolorado, TRUE) EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Kolorado_Talk, ANIM_Kolorado_Idle, 0, MSG_CH2_0044) - EVT_SET(LVar0, 348) - EVT_SET(LVar1, 3) - EVT_EXEC_WAIT(N(Delivery_ShowGotStarPiece)) - EVT_CALL(AddStarPieces, 1) + EVT_GIVE_STAR_PIECE() EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Kolorado_Talk, ANIM_Kolorado_Idle, 0, MSG_CH2_0045) EVT_RETURN EVT_END @@ -87,21 +88,17 @@ EvtScript N(EVS_NpcInteract_Kolorado) = { EVT_SET(GF_SBK_KeptArtifactFromKolorado, TRUE) EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Kolorado_Talk, ANIM_Kolorado_Idle, 0, MSG_CH2_0040) EVT_END_IF - EVT_SET(LVar0, EVT_PTR(N(ArtifactList))) - EVT_SET(LVar1, 0) - EVT_EXEC_WAIT(N(EVS_ShowChoiceWindow)) + EVT_CHOOSE_KEY_ITEM(N(ArtifactList)) EVT_SWITCH(LVar0) EVT_CASE_GE(1) - EVT_EXEC_WAIT(N(D_80242B48_9420F8)) + EVT_EXEC_WAIT(N(EVS_ArtifactPrompt)) EVT_GOTO(50) EVT_CASE_DEFAULT EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Kolorado_Talk, ANIM_Kolorado_Idle, 0, MSG_CH2_0041) - EVT_SET(LVar0, EVT_PTR(N(ArtifactList))) - EVT_SET(LVar1, 0) - EVT_EXEC_WAIT(N(EVS_ShowChoiceWindow)) + EVT_CHOOSE_KEY_ITEM(N(ArtifactList)) EVT_SWITCH(LVar0) EVT_CASE_GE(1) - EVT_EXEC_WAIT(N(D_80242B48_9420F8)) + EVT_EXEC_WAIT(N(EVS_ArtifactPrompt)) EVT_CASE_DEFAULT EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Kolorado_Talk, ANIM_Kolorado_Idle, 0, MSG_CH2_0042) EVT_GOTO(50) @@ -160,8 +157,8 @@ EvtScript N(EVS_NpcInteract_Kolorado) = { EVT_END_IF EVT_END_IF EVT_CALL(SetNpcAnimation, NPC_SELF, LVar9) - EVT_EXEC_WAIT(N(D_80242A8C_94203C)) - EVT_EXEC_WAIT(N(D_80242ADC_94208C)) + EVT_EXEC_WAIT(N(EVS_DeliveryPrompt)) + EVT_EXEC_WAIT(N(EVS_DeliveryReward)) EVT_IF_NE(LVarC, 0) EVT_RETURN EVT_END_IF diff --git a/src/world/area_sbk/sbk_30/sbk_30_3_foliage.c b/src/world/area_sbk/sbk_30/sbk_30_4_foliage.c similarity index 100% rename from src/world/area_sbk/sbk_30/sbk_30_3_foliage.c rename to src/world/area_sbk/sbk_30/sbk_30_4_foliage.c diff --git a/src/world/area_sbk/sbk_31/sbk_31_1_main.c b/src/world/area_sbk/sbk_31/sbk_31_1_main.c index abac474d24..a3876963fd 100644 --- a/src/world/area_sbk/sbk_31/sbk_31_1_main.c +++ b/src/world/area_sbk/sbk_31/sbk_31_1_main.c @@ -18,7 +18,7 @@ MapSettings N(settings) = { .tattle = { MSG_MapTattle_sbk_31 }, }; -#include "world/common/SpawnSunEffect.inc.c" +#include "world/common/todo/SpawnSunEffect.inc.c" EvtScript N(EVS_ExitWalk_sbk_30_1) = EVT_EXIT_WALK(60, sbk_31_ENTRY_0, "sbk_30", sbk_30_ENTRY_1); EvtScript N(EVS_ExitWalk_sbk_32_0) = EVT_EXIT_WALK(60, sbk_31_ENTRY_1, "sbk_32", sbk_32_ENTRY_0); diff --git a/src/world/area_sbk/sbk_32/sbk_32_1_main.c b/src/world/area_sbk/sbk_32/sbk_32_1_main.c index e6da1dc461..61bae26b5d 100644 --- a/src/world/area_sbk/sbk_32/sbk_32_1_main.c +++ b/src/world/area_sbk/sbk_32/sbk_32_1_main.c @@ -19,7 +19,7 @@ MapSettings N(settings) = { .tattle = { MSG_MapTattle_sbk_32 }, }; -#include "world/common/SpawnSunEffect.inc.c" +#include "world/common/todo/SpawnSunEffect.inc.c" EvtScript N(EVS_ExitWalk_sbk_31_1) = EVT_EXIT_WALK(60, sbk_32_ENTRY_0, "sbk_31", sbk_31_ENTRY_1); EvtScript N(EVS_ExitWalk_sbk_33_0) = EVT_EXIT_WALK(60, sbk_32_ENTRY_1, "sbk_33", sbk_33_ENTRY_0); diff --git a/src/world/area_sbk/sbk_33/sbk_33_2_main.c b/src/world/area_sbk/sbk_33/sbk_33_2_main.c index 324171df0c..ec118858fa 100644 --- a/src/world/area_sbk/sbk_33/sbk_33_2_main.c +++ b/src/world/area_sbk/sbk_33/sbk_33_2_main.c @@ -2,7 +2,7 @@ extern EvtScript N(EVS_MakeEntities); -#include "world/common/SpawnSunEffect.inc.c" +#include "world/common/todo/SpawnSunEffect.inc.c" EvtScript N(EVS_ExitWalk_sbk_32_1) = EVT_EXIT_WALK(60, sbk_33_ENTRY_0, "sbk_32", sbk_32_ENTRY_1); EvtScript N(EVS_ExitWalk_sbk_34_0) = EVT_EXIT_WALK(60, sbk_33_ENTRY_1, "sbk_34", sbk_34_ENTRY_0); diff --git a/src/world/area_sbk/sbk_34/sbk_34_1_main.c b/src/world/area_sbk/sbk_34/sbk_34_1_main.c index 8cb0a03956..cf7b1dfea8 100644 --- a/src/world/area_sbk/sbk_34/sbk_34_1_main.c +++ b/src/world/area_sbk/sbk_34/sbk_34_1_main.c @@ -19,7 +19,7 @@ MapSettings N(settings) = { .tattle = { MSG_MapTattle_sbk_34 }, }; -#include "world/common/SpawnSunEffect.inc.c" +#include "world/common/todo/SpawnSunEffect.inc.c" EvtScript N(EVS_ExitWalk_sbk_33_1) = EVT_EXIT_WALK(60, sbk_34_ENTRY_0, "sbk_33", sbk_33_ENTRY_1); EvtScript N(EVS_ExitWalk_sbk_35_0) = EVT_EXIT_WALK(60, sbk_34_ENTRY_1, "sbk_35", sbk_35_ENTRY_0); 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 aae8b5818e..876cc523c5 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 @@ -28,7 +28,7 @@ EvtScript N(EVS_Nomadimouse_LetterReward) = { EVT_IF_EQ(LVarC, 2) EVT_SET(LVar0, ITEM_STAR_PIECE) EVT_SET(LVar1, 3) - EVT_EXEC_WAIT(N(Delivery_ShowGotStarPiece)) + EVT_EXEC_WAIT(N(GiveKeyReward)) EVT_CALL(AddStarPieces, 1) EVT_END_IF EVT_RETURN diff --git a/src/world/area_sbk/sbk_35/sbk_35_1_main.c b/src/world/area_sbk/sbk_35/sbk_35_1_main.c index 10254d743d..c07adf1555 100644 --- a/src/world/area_sbk/sbk_35/sbk_35_1_main.c +++ b/src/world/area_sbk/sbk_35/sbk_35_1_main.c @@ -19,7 +19,7 @@ MapSettings N(settings) = { .tattle = { MSG_MapTattle_sbk_35 }, }; -#include "world/common/SpawnSunEffect.inc.c" +#include "world/common/todo/SpawnSunEffect.inc.c" EvtScript N(EVS_ExitWalk_sbk_34_1) = EVT_EXIT_WALK(60, sbk_35_ENTRY_0, "sbk_34", sbk_34_ENTRY_1); EvtScript N(EVS_ExitWalk_sbk_36_0) = EVT_EXIT_WALK(60, sbk_35_ENTRY_1, "sbk_36", sbk_36_ENTRY_0); diff --git a/src/world/area_sbk/sbk_36/sbk_36_1_main.c b/src/world/area_sbk/sbk_36/sbk_36_1_main.c index 7e2435a067..b288443de2 100644 --- a/src/world/area_sbk/sbk_36/sbk_36_1_main.c +++ b/src/world/area_sbk/sbk_36/sbk_36_1_main.c @@ -19,7 +19,7 @@ MapSettings N(settings) = { .tattle = { MSG_MapTattle_sbk_36 }, }; -#include "world/common/SpawnSunEffect.inc.c" +#include "world/common/todo/SpawnSunEffect.inc.c" EvtScript N(EVS_ExitWalk_sbk_35_1) = EVT_EXIT_WALK(60, sbk_36_ENTRY_0, "sbk_35", sbk_35_ENTRY_1); EvtScript N(EVS_ExitWalk_dro_01_0) = EVT_EXIT_WALK(60, sbk_36_ENTRY_1, "dro_01", dro_01_ENTRY_0); diff --git a/src/world/area_sbk/sbk_40/sbk_40_1_main.c b/src/world/area_sbk/sbk_40/sbk_40_1_main.c index 9c2ad862b7..8df53af034 100644 --- a/src/world/area_sbk/sbk_40/sbk_40_1_main.c +++ b/src/world/area_sbk/sbk_40/sbk_40_1_main.c @@ -19,7 +19,7 @@ MapSettings N(settings) = { .tattle = { MSG_MapTattle_sbk_40 }, }; -#include "world/common/SpawnSunEffect.inc.c" +#include "world/common/todo/SpawnSunEffect.inc.c" EvtScript N(EVS_ExitWalk_sbk_41_0) = EVT_EXIT_WALK(60, sbk_40_ENTRY_1, "sbk_41", sbk_41_ENTRY_0); EvtScript N(EVS_ExitWalk_sbk_30_3) = EVT_EXIT_WALK(60, sbk_40_ENTRY_2, "sbk_30", sbk_30_ENTRY_3); diff --git a/src/world/area_sbk/sbk_41/sbk_41_1_main.c b/src/world/area_sbk/sbk_41/sbk_41_1_main.c index 9bc2d218f2..0554f3dead 100644 --- a/src/world/area_sbk/sbk_41/sbk_41_1_main.c +++ b/src/world/area_sbk/sbk_41/sbk_41_1_main.c @@ -18,7 +18,7 @@ MapSettings N(settings) = { .tattle = { MSG_MapTattle_sbk_41 }, }; -#include "world/common/SpawnSunEffect.inc.c" +#include "world/common/todo/SpawnSunEffect.inc.c" EvtScript N(EVS_ExitWalk_sbk_40_1) = EVT_EXIT_WALK(60, sbk_41_ENTRY_0, "sbk_40", sbk_40_ENTRY_1); EvtScript N(EVS_ExitWalk_sbk_42_0) = EVT_EXIT_WALK(60, sbk_41_ENTRY_1, "sbk_42", sbk_42_ENTRY_0); diff --git a/src/world/area_sbk/sbk_42/sbk_42_1_main.c b/src/world/area_sbk/sbk_42/sbk_42_1_main.c index bb3e5894f8..a8ca2e4e92 100644 --- a/src/world/area_sbk/sbk_42/sbk_42_1_main.c +++ b/src/world/area_sbk/sbk_42/sbk_42_1_main.c @@ -18,7 +18,7 @@ MapSettings N(settings) = { .tattle = { MSG_MapTattle_sbk_42 }, }; -#include "world/common/SpawnSunEffect.inc.c" +#include "world/common/todo/SpawnSunEffect.inc.c" EvtScript N(EVS_ExitWalk_sbk_41_1) = EVT_EXIT_WALK(60, sbk_42_ENTRY_0, "sbk_41", sbk_41_ENTRY_1); EvtScript N(EVS_ExitWalk_sbk_43_0) = EVT_EXIT_WALK(60, sbk_42_ENTRY_1, "sbk_43", sbk_43_ENTRY_0); diff --git a/src/world/area_sbk/sbk_43/sbk_43_1_main.c b/src/world/area_sbk/sbk_43/sbk_43_1_main.c index 57e4c5319c..9f17fa8533 100644 --- a/src/world/area_sbk/sbk_43/sbk_43_1_main.c +++ b/src/world/area_sbk/sbk_43/sbk_43_1_main.c @@ -19,7 +19,7 @@ MapSettings N(settings) = { .tattle = { MSG_MapTattle_sbk_43 }, }; -#include "world/common/SpawnSunEffect.inc.c" +#include "world/common/todo/SpawnSunEffect.inc.c" EvtScript N(EVS_ExitWalk_sbk_42_1) = EVT_EXIT_WALK(60, sbk_43_ENTRY_0, "sbk_42", sbk_42_ENTRY_1); EvtScript N(EVS_ExitWalk_sbk_44_0) = EVT_EXIT_WALK(60, sbk_43_ENTRY_1, "sbk_44", sbk_44_ENTRY_0); diff --git a/src/world/area_sbk/sbk_44/sbk_44_1_main.c b/src/world/area_sbk/sbk_44/sbk_44_1_main.c index 506db0bff6..f877d5faee 100644 --- a/src/world/area_sbk/sbk_44/sbk_44_1_main.c +++ b/src/world/area_sbk/sbk_44/sbk_44_1_main.c @@ -18,7 +18,7 @@ MapSettings N(settings) = { .tattle = { MSG_MapTattle_sbk_44 }, }; -#include "world/common/SpawnSunEffect.inc.c" +#include "world/common/todo/SpawnSunEffect.inc.c" EvtScript N(EVS_ExitWalk_sbk_43_1) = EVT_EXIT_WALK(60, sbk_44_ENTRY_0, "sbk_43", sbk_43_ENTRY_1); EvtScript N(EVS_ExitWalk_sbk_45_0) = EVT_EXIT_WALK(60, sbk_44_ENTRY_1, "sbk_45", sbk_45_ENTRY_0); diff --git a/src/world/area_sbk/sbk_45/sbk_45_1_main.c b/src/world/area_sbk/sbk_45/sbk_45_1_main.c index 90a1a4b8f9..fe28af5cba 100644 --- a/src/world/area_sbk/sbk_45/sbk_45_1_main.c +++ b/src/world/area_sbk/sbk_45/sbk_45_1_main.c @@ -19,7 +19,7 @@ MapSettings N(settings) = { .tattle = { MSG_MapTattle_sbk_45 }, }; -#include "world/common/SpawnSunEffect.inc.c" +#include "world/common/todo/SpawnSunEffect.inc.c" EvtScript N(EVS_ExitWalk_sbk_44_1) = EVT_EXIT_WALK(60, sbk_45_ENTRY_0, "sbk_44", sbk_44_ENTRY_1); EvtScript N(EVS_ExitWalk_sbk_46_0) = EVT_EXIT_WALK(60, sbk_45_ENTRY_1, "sbk_46", sbk_46_ENTRY_0); diff --git a/src/world/area_sbk/sbk_46/sbk_46_1_main.c b/src/world/area_sbk/sbk_46/sbk_46_1_main.c index 1c12a76821..58f2aef039 100644 --- a/src/world/area_sbk/sbk_46/sbk_46_1_main.c +++ b/src/world/area_sbk/sbk_46/sbk_46_1_main.c @@ -20,7 +20,7 @@ MapSettings N(settings) = { .tattle = { MSG_MapTattle_sbk_46 }, }; -#include "world/common/SpawnSunEffect.inc.c" +#include "world/common/todo/SpawnSunEffect.inc.c" EvtScript N(EVS_ExitWalk_sbk_45_1) = EVT_EXIT_WALK(60, sbk_46_ENTRY_0, "sbk_45", sbk_45_ENTRY_1); EvtScript N(EVS_ExitWalk_sbk_36_3) = EVT_EXIT_WALK(60, sbk_46_ENTRY_2, "sbk_36", sbk_36_ENTRY_3); diff --git a/src/world/area_sbk/sbk_50/sbk_50_1_main.c b/src/world/area_sbk/sbk_50/sbk_50_1_main.c index 361adaedcb..6454ecf3ff 100644 --- a/src/world/area_sbk/sbk_50/sbk_50_1_main.c +++ b/src/world/area_sbk/sbk_50/sbk_50_1_main.c @@ -17,7 +17,7 @@ MapSettings N(settings) = { .tattle = { MSG_MapTattle_sbk_50 }, }; -#include "world/common/SpawnSunEffect.inc.c" +#include "world/common/todo/SpawnSunEffect.inc.c" EvtScript N(EVS_ExitWalk_sbk_51_0) = EVT_EXIT_WALK(60, sbk_50_ENTRY_1, "sbk_51", sbk_51_ENTRY_0); EvtScript N(EVS_ExitWalk_sbk_40_3) = EVT_EXIT_WALK(60, sbk_50_ENTRY_2, "sbk_40", sbk_40_ENTRY_3); diff --git a/src/world/area_sbk/sbk_51/sbk_51_1_main.c b/src/world/area_sbk/sbk_51/sbk_51_1_main.c index 612c03c746..4f1ca5fd6c 100644 --- a/src/world/area_sbk/sbk_51/sbk_51_1_main.c +++ b/src/world/area_sbk/sbk_51/sbk_51_1_main.c @@ -23,7 +23,7 @@ EvtScript N(EVS_ExitWalk_sbk_52_0) = EVT_EXIT_WALK(60, sbk_51_ENTRY_1, "sbk_52", EvtScript N(EVS_ExitWalk_sbk_41_3) = EVT_EXIT_WALK(60, sbk_51_ENTRY_2, "sbk_41", sbk_41_ENTRY_3); EvtScript N(EVS_ExitWalk_sbk_61_2) = EVT_EXIT_WALK(60, sbk_51_ENTRY_3, "sbk_61", sbk_61_ENTRY_2); -#include "world/common/SpawnSunEffect.inc.c" +#include "world/common/todo/SpawnSunEffect.inc.c" EvtScript N(EVS_BindExitTriggers) = { EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_sbk_50_1)), TRIGGER_FLOOR_ABOVE, COLLIDER_deiliw, 1, 0) diff --git a/src/world/area_sbk/sbk_52/sbk_52_1_main.c b/src/world/area_sbk/sbk_52/sbk_52_1_main.c index 6656cff97d..055583603c 100644 --- a/src/world/area_sbk/sbk_52/sbk_52_1_main.c +++ b/src/world/area_sbk/sbk_52/sbk_52_1_main.c @@ -18,7 +18,7 @@ MapSettings N(settings) = { .tattle = { MSG_MapTattle_sbk_52 }, }; -#include "world/common/SpawnSunEffect.inc.c" +#include "world/common/todo/SpawnSunEffect.inc.c" EvtScript N(EVS_ExitWalk_sbk_51_1) = EVT_EXIT_WALK(60, sbk_52_ENTRY_0, "sbk_51", sbk_51_ENTRY_1); EvtScript N(EVS_ExitWalk_sbk_53_0) = EVT_EXIT_WALK(60, sbk_52_ENTRY_1, "sbk_53", sbk_53_ENTRY_0); diff --git a/src/world/area_sbk/sbk_53/sbk_53_1_main.c b/src/world/area_sbk/sbk_53/sbk_53_1_main.c index 712ae685ef..64fa4b1cbf 100644 --- a/src/world/area_sbk/sbk_53/sbk_53_1_main.c +++ b/src/world/area_sbk/sbk_53/sbk_53_1_main.c @@ -18,7 +18,7 @@ MapSettings N(settings) = { .tattle = { MSG_MapTattle_sbk_53 }, }; -#include "world/common/SpawnSunEffect.inc.c" +#include "world/common/todo/SpawnSunEffect.inc.c" EvtScript N(EVS_ExitWalk_sbk_52_1) = EVT_EXIT_WALK(60, sbk_53_ENTRY_0, "sbk_52", sbk_52_ENTRY_1); EvtScript N(EVS_ExitWalk_sbk_54_0) = EVT_EXIT_WALK(60, sbk_53_ENTRY_1, "sbk_54", sbk_54_ENTRY_0); diff --git a/src/world/area_sbk/sbk_54/sbk_54_1_main.c b/src/world/area_sbk/sbk_54/sbk_54_1_main.c index 18521b63dd..4deafe1d8b 100644 --- a/src/world/area_sbk/sbk_54/sbk_54_1_main.c +++ b/src/world/area_sbk/sbk_54/sbk_54_1_main.c @@ -18,7 +18,7 @@ MapSettings N(settings) = { .tattle = { MSG_MapTattle_sbk_54 }, }; -#include "world/common/SpawnSunEffect.inc.c" +#include "world/common/todo/SpawnSunEffect.inc.c" EvtScript N(EVS_ExitWalk_sbk_53_1) = EVT_EXIT_WALK(60, sbk_54_ENTRY_0, "sbk_53", sbk_53_ENTRY_1); EvtScript N(EVS_ExitWalk_sbk_55_0) = EVT_EXIT_WALK(60, sbk_54_ENTRY_1, "sbk_55", sbk_55_ENTRY_0); diff --git a/src/world/area_sbk/sbk_55/sbk_55_1_main.c b/src/world/area_sbk/sbk_55/sbk_55_1_main.c index 2b00c80b50..4cb0502d97 100644 --- a/src/world/area_sbk/sbk_55/sbk_55_1_main.c +++ b/src/world/area_sbk/sbk_55/sbk_55_1_main.c @@ -20,7 +20,7 @@ MapSettings N(settings) = { .tattle = { MSG_MapTattle_sbk_55 }, }; -#include "world/common/SpawnSunEffect.inc.c" +#include "world/common/todo/SpawnSunEffect.inc.c" EvtScript N(EVS_ExitWalk_sbk_54_1) = EVT_EXIT_WALK(60, sbk_55_ENTRY_0, "sbk_54", sbk_54_ENTRY_1); EvtScript N(EVS_ExitWalk_sbk_56_0) = EVT_EXIT_WALK(60, sbk_55_ENTRY_1, "sbk_56", sbk_56_ENTRY_0); diff --git a/src/world/area_sbk/sbk_56/sbk_56_1_main.c b/src/world/area_sbk/sbk_56/sbk_56_1_main.c index af72722f7c..081e44869d 100644 --- a/src/world/area_sbk/sbk_56/sbk_56_1_main.c +++ b/src/world/area_sbk/sbk_56/sbk_56_1_main.c @@ -20,7 +20,7 @@ MapSettings N(settings) = { .tattle = { MSG_MapTattle_sbk_56 }, }; -#include "world/common/SpawnSunEffect.inc.c" +#include "world/common/todo/SpawnSunEffect.inc.c" ApiStatus N(StartOasisSongVariation)(void) { bgm_set_variation(0, 1); diff --git a/src/world/area_sbk/sbk_56/sbk_56_2_entity.c b/src/world/area_sbk/sbk_56/sbk_56_2_entity.c index c33e0d2b66..1b290f1e06 100644 --- a/src/world/area_sbk/sbk_56/sbk_56_2_entity.c +++ b/src/world/area_sbk/sbk_56/sbk_56_2_entity.c @@ -4,8 +4,8 @@ #define SUPER_BLOCK_MAPVAR MV_SuperBlock #define SUPER_BLOCK_GAMEFLAG GF_SBK56_SuperBlock -#include "world/common/atomic/SuperBlock.inc.c" -#include "world/common/atomic/SuperBlock.data.inc.c" +#include "world/common/entity/SuperBlock.inc.c" +#include "world/common/entity/SuperBlock.data.inc.c" EvtScript N(EVS_MakeEntities) = { EVT_CALL(MakeEntity, EVT_PTR(Entity_HeartBlock), 300, 60, 0, 0, MAKE_ENTITY_END) diff --git a/src/world/area_sbk/sbk_60/sbk_60_1_main.c b/src/world/area_sbk/sbk_60/sbk_60_1_main.c index b6b05f7079..917b8333ab 100644 --- a/src/world/area_sbk/sbk_60/sbk_60_1_main.c +++ b/src/world/area_sbk/sbk_60/sbk_60_1_main.c @@ -18,7 +18,7 @@ MapSettings N(settings) = { .tattle = { MSG_MapTattle_sbk_60 }, }; -#include "world/common/SpawnSunEffect.inc.c" +#include "world/common/todo/SpawnSunEffect.inc.c" EvtScript N(EVS_ExitWalk_sbk_61_0) = EVT_EXIT_WALK(60, sbk_60_ENTRY_1, "sbk_61", sbk_61_ENTRY_0); EvtScript N(EVS_ExitWalk_sbk_50_3) = EVT_EXIT_WALK(60, sbk_60_ENTRY_2, "sbk_50", sbk_50_ENTRY_3); diff --git a/src/world/area_sbk/sbk_61/sbk_61_1_main.c b/src/world/area_sbk/sbk_61/sbk_61_1_main.c index aaa2b263d1..222aaf489b 100644 --- a/src/world/area_sbk/sbk_61/sbk_61_1_main.c +++ b/src/world/area_sbk/sbk_61/sbk_61_1_main.c @@ -19,7 +19,7 @@ MapSettings N(settings) = { .tattle = { MSG_MapTattle_sbk_61 }, }; -#include "world/common/SpawnSunEffect.inc.c" +#include "world/common/todo/SpawnSunEffect.inc.c" EvtScript N(EVS_ExitWalk_sbk_60_1) = EVT_EXIT_WALK(60, sbk_61_ENTRY_0, "sbk_60", sbk_60_ENTRY_1); EvtScript N(EVS_ExitWalk_sbk_62_0) = EVT_EXIT_WALK(60, sbk_61_ENTRY_1, "sbk_62", sbk_62_ENTRY_0); diff --git a/src/world/area_sbk/sbk_62/sbk_62_1_main.c b/src/world/area_sbk/sbk_62/sbk_62_1_main.c index 5b8c3a256c..38b743b8d7 100644 --- a/src/world/area_sbk/sbk_62/sbk_62_1_main.c +++ b/src/world/area_sbk/sbk_62/sbk_62_1_main.c @@ -18,7 +18,7 @@ MapSettings N(settings) = { .tattle = { MSG_MapTattle_sbk_62 }, }; -#include "world/common/SpawnSunEffect.inc.c" +#include "world/common/todo/SpawnSunEffect.inc.c" EvtScript N(EVS_ExitWalk_sbk_61_1) = EVT_EXIT_WALK(60, sbk_62_ENTRY_0, "sbk_61", sbk_61_ENTRY_1); EvtScript N(EVS_ExitWalk_sbk_63_0) = EVT_EXIT_WALK(60, sbk_62_ENTRY_1, "sbk_63", sbk_63_ENTRY_0); diff --git a/src/world/area_sbk/sbk_63/sbk_63_1_main.c b/src/world/area_sbk/sbk_63/sbk_63_1_main.c index 798bbe0955..3d667cb0d7 100644 --- a/src/world/area_sbk/sbk_63/sbk_63_1_main.c +++ b/src/world/area_sbk/sbk_63/sbk_63_1_main.c @@ -18,7 +18,7 @@ MapSettings N(settings) = { .tattle = { MSG_MapTattle_sbk_63 }, }; -#include "world/common/SpawnSunEffect.inc.c" +#include "world/common/todo/SpawnSunEffect.inc.c" EvtScript N(EVS_ExitWalk_sbk_62_1) = EVT_EXIT_WALK(60, sbk_63_ENTRY_0, "sbk_62", sbk_62_ENTRY_1); EvtScript N(EVS_ExitWalk_sbk_64_0) = EVT_EXIT_WALK(60, sbk_63_ENTRY_1, "sbk_64", sbk_64_ENTRY_0); diff --git a/src/world/area_sbk/sbk_64/sbk_64_1_main.c b/src/world/area_sbk/sbk_64/sbk_64_1_main.c index 8222a358d3..6922373e61 100644 --- a/src/world/area_sbk/sbk_64/sbk_64_1_main.c +++ b/src/world/area_sbk/sbk_64/sbk_64_1_main.c @@ -18,7 +18,7 @@ MapSettings N(settings) = { .tattle = { MSG_MapTattle_sbk_64 }, }; -#include "world/common/SpawnSunEffect.inc.c" +#include "world/common/todo/SpawnSunEffect.inc.c" EvtScript N(EVS_ExitWalk_sbk_63_1) = EVT_EXIT_WALK(60, sbk_64_ENTRY_0, "sbk_63", sbk_63_ENTRY_1); EvtScript N(EVS_ExitWalk_sbk_65_0) = EVT_EXIT_WALK(60, sbk_64_ENTRY_1, "sbk_65", sbk_65_ENTRY_0); diff --git a/src/world/area_sbk/sbk_65/sbk_65_1_main.c b/src/world/area_sbk/sbk_65/sbk_65_1_main.c index 2810500a1d..237106410d 100644 --- a/src/world/area_sbk/sbk_65/sbk_65_1_main.c +++ b/src/world/area_sbk/sbk_65/sbk_65_1_main.c @@ -17,7 +17,7 @@ MapSettings N(settings) = { .tattle = { MSG_MapTattle_sbk_65 }, }; -#include "world/common/SpawnSunEffect.inc.c" +#include "world/common/todo/SpawnSunEffect.inc.c" EvtScript N(EVS_ExitWalk_sbk_64_1) = EVT_EXIT_WALK(60, sbk_65_ENTRY_0, "sbk_64", sbk_64_ENTRY_1); EvtScript N(EVS_ExitWalk_sbk_66_0) = EVT_EXIT_WALK(60, sbk_65_ENTRY_1, "sbk_66", sbk_66_ENTRY_0); diff --git a/src/world/area_sbk/sbk_66/sbk_66_1_main.c b/src/world/area_sbk/sbk_66/sbk_66_1_main.c index 5eda516c4a..a22f2633fa 100644 --- a/src/world/area_sbk/sbk_66/sbk_66_1_main.c +++ b/src/world/area_sbk/sbk_66/sbk_66_1_main.c @@ -20,7 +20,7 @@ MapSettings N(settings) = { .tattle = { MSG_MapTattle_sbk_66 }, }; -#include "world/common/SpawnSunEffect.inc.c" +#include "world/common/todo/SpawnSunEffect.inc.c" EvtScript N(EVS_ExitWalk_sbk_65_1) = EVT_EXIT_WALK(60, sbk_66_ENTRY_0, "sbk_65", sbk_65_ENTRY_1); EvtScript N(EVS_ExitWalk_sbk_56_3) = EVT_EXIT_WALK(60, sbk_66_ENTRY_2, "sbk_56", sbk_56_ENTRY_3); diff --git a/src/world/area_tik/tik_01/8694B0.c b/src/world/area_tik/tik_01/8694B0.c index 824c789ba7..9fccc8a9f0 100644 --- a/src/world/area_tik/tik_01/8694B0.c +++ b/src/world/area_tik/tik_01/8694B0.c @@ -9,4 +9,4 @@ static char* N(exit_str_5) = ""; #include "world/common/atomic/TexturePan.inc.c" -#include "world/common/atomic/Pipe.inc.c" +#include "world/common/entity/Pipe.inc.c" diff --git a/src/world/area_tik/tik_01/869AA0.c b/src/world/area_tik/tik_01/869AA0.c index 78975dba2a..8af880fb5c 100644 --- a/src/world/area_tik/tik_01/869AA0.c +++ b/src/world/area_tik/tik_01/869AA0.c @@ -1,5 +1,5 @@ #include "tik_01.h" -#include "world/common/UnkPosFunc2.inc.c" +#include "world/common/todo/UnkPosFunc2.inc.c" -#include "world/common/SetEntityPosition.inc.c" +#include "world/common/todo/SetEntityPosition.inc.c" diff --git a/src/world/area_tik/tik_02/86CA50.c b/src/world/area_tik/tik_02/86CA50.c index 1937ae2433..f72f27b9eb 100644 --- a/src/world/area_tik/tik_02/86CA50.c +++ b/src/world/area_tik/tik_02/86CA50.c @@ -1,9 +1,9 @@ #include "tik_02.h" -#include "world/common/StashVars.inc.c" +#include "world/common/todo/StashVars.inc.c" -#include "world/common/GetItemName.inc.c" +#include "world/common/todo/GetItemName.inc.c" -#include "world/common/SomeItemEntityFunc.inc.c" +#include "world/common/todo/SomeItemEntityFunc.inc.c" -#include "world/common/IsItemBadge.inc.c" +#include "world/common/todo/IsItemBadge.inc.c" diff --git a/src/world/area_tik/tik_02/86CD10.c b/src/world/area_tik/tik_02/86CD10.c index d6d17c8a98..94c8929b62 100644 --- a/src/world/area_tik/tik_02/86CD10.c +++ b/src/world/area_tik/tik_02/86CD10.c @@ -1,6 +1,6 @@ #include "tik_02.h" -#include "world/common/UnkPosFunc2.inc.c" +#include "world/common/todo/UnkPosFunc2.inc.c" extern s16 D_80241BAE_86E2EE[0][2]; // length unk diff --git a/src/world/area_tik/tik_03/86EB00.c b/src/world/area_tik/tik_03/86EB00.c index 4c88bebc78..fcd3f98956 100644 --- a/src/world/area_tik/tik_03/86EB00.c +++ b/src/world/area_tik/tik_03/86EB00.c @@ -5,7 +5,7 @@ static char* N(exit_str_1) = "tik_04"; static char* N(exit_str_2) = "tik_03"; static char* N(exit_str_3) = ""; -#include "world/common/atomic/Pipe.inc.c" +#include "world/common/entity/Pipe.inc.c" #include "world/common/atomic/TexturePan.inc.c" diff --git a/src/world/area_tik/tik_03/86F0F0.c b/src/world/area_tik/tik_03/86F0F0.c index e306dd9c9b..89a3ea6950 100644 --- a/src/world/area_tik/tik_03/86F0F0.c +++ b/src/world/area_tik/tik_03/86F0F0.c @@ -1,7 +1,7 @@ #include "tik_03.h" #include "world/partners.h" -#include "world/common/UnkPosFunc2.inc.c" +#include "world/common/todo/UnkPosFunc2.inc.c" extern s32 D_80242EBC_8719BC; extern s32 D_80242930_871430[4]; diff --git a/src/world/area_tik/tik_04/871A30.c b/src/world/area_tik/tik_04/871A30.c index 95bb131b08..165d409473 100644 --- a/src/world/area_tik/tik_04/871A30.c +++ b/src/world/area_tik/tik_04/871A30.c @@ -7,4 +7,4 @@ static char* N(exit_str_3) = "tik_12"; #include "world/common/atomic/TexturePan.inc.c" -#include "world/common/atomic/Pipe.inc.c" +#include "world/common/entity/Pipe.inc.c" diff --git a/src/world/area_tik/tik_04/872020.c b/src/world/area_tik/tik_04/872020.c index c9dd3b4e73..c9905b1643 100644 --- a/src/world/area_tik/tik_04/872020.c +++ b/src/world/area_tik/tik_04/872020.c @@ -1,6 +1,6 @@ #include "tik_04.h" -#include "world/common/UnkPosFunc2.inc.c" +#include "world/common/todo/UnkPosFunc2.inc.c" ApiStatus func_80240960_872390(Evt* script, s32 isInitialCall) { Model* model1; @@ -57,7 +57,7 @@ ApiStatus func_80240A00_872430(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -#include "world/common/GetFloorCollider.inc.c" +#include "world/common/todo/GetFloorCollider.inc.c" ApiStatus func_80240C20_872650(Evt* script, s32 isInitialCall) { PlayerStatus* player = &gPlayerStatus; diff --git a/src/world/area_tik/tik_05/8750D0.c b/src/world/area_tik/tik_05/8750D0.c index 755c157dea..58b317cfc3 100644 --- a/src/world/area_tik/tik_05/8750D0.c +++ b/src/world/area_tik/tik_05/8750D0.c @@ -3,15 +3,15 @@ #include "effects.h" #include "functions.h" -#include "world/common/UnkPosFunc2.inc.c" +#include "world/common/todo/UnkPosFunc2.inc.c" -#include "world/common/StashVars.inc.c" +#include "world/common/todo/StashVars.inc.c" -#include "world/common/GetItemName.inc.c" +#include "world/common/todo/GetItemName.inc.c" -#include "world/common/SomeItemEntityFunc.inc.c" +#include "world/common/todo/SomeItemEntityFunc.inc.c" -#include "world/common/IsItemBadge.inc.c" +#include "world/common/todo/IsItemBadge.inc.c" extern s16 Entity_ScriptSpring_AnimLaunch[]; @@ -27,4 +27,4 @@ ApiStatus func_8024093C_8756FC(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -#include "world/common/SetEntityPosition.inc.c" +#include "world/common/todo/SetEntityPosition.inc.c" diff --git a/src/world/area_tik/tik_06/876EE0.c b/src/world/area_tik/tik_06/876EE0.c index 496a3cbfb3..82d6e4731c 100644 --- a/src/world/area_tik/tik_06/876EE0.c +++ b/src/world/area_tik/tik_06/876EE0.c @@ -7,7 +7,7 @@ static char* N(exit_str_3) = "tik_08"; static char* N(exit_str_4) = "tik_08\0"; static char* N(exit_str_5) = ""; -#include "world/common/atomic/Pipe.inc.c" +#include "world/common/entity/Pipe.inc.c" #include "world/common/atomic/TexturePan.inc.c" diff --git a/src/world/area_tik/tik_06/8774D0.c b/src/world/area_tik/tik_06/8774D0.c index 1df19a0d26..c709026436 100644 --- a/src/world/area_tik/tik_06/8774D0.c +++ b/src/world/area_tik/tik_06/8774D0.c @@ -1,3 +1,3 @@ #include "tik_06.h" -#include "world/common/UnkPosFunc2.inc.c" +#include "world/common/todo/UnkPosFunc2.inc.c" diff --git a/src/world/area_tik/tik_07/879BE0.c b/src/world/area_tik/tik_07/879BE0.c index 1c723c2b1c..f5631460c6 100644 --- a/src/world/area_tik/tik_07/879BE0.c +++ b/src/world/area_tik/tik_07/879BE0.c @@ -3,6 +3,6 @@ static char* N(exit_str_0) = "tik_04"; static char* N(exit_str_1) = "tik_07"; -#include "world/common/atomic/Pipe.inc.c" +#include "world/common/entity/Pipe.inc.c" -#include "world/common/atomic/SuperBlock.inc.c" +#include "world/common/entity/SuperBlock.inc.c" diff --git a/src/world/area_tik/tik_07/87AC00.c b/src/world/area_tik/tik_07/87AC00.c index a4aeb96a84..5fda5b719c 100644 --- a/src/world/area_tik/tik_07/87AC00.c +++ b/src/world/area_tik/tik_07/87AC00.c @@ -1,6 +1,6 @@ #include "tik_07.h" -#include "world/common/UnkPosFunc2.inc.c" +#include "world/common/todo/UnkPosFunc2.inc.c" extern s32 D_802449B0_87E590[4]; @@ -19,4 +19,4 @@ ApiStatus func_80241390_87AF70(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -#include "world/common/enemy/FlyingAI.inc.c" +#include "world/common/enemy/ai/FlyingAI.inc.c" diff --git a/src/world/area_tik/tik_08/87EDF0.c b/src/world/area_tik/tik_08/87EDF0.c index 77e4e130c4..a897859af9 100644 --- a/src/world/area_tik/tik_08/87EDF0.c +++ b/src/world/area_tik/tik_08/87EDF0.c @@ -5,7 +5,7 @@ static char* N(exit_str_1) = "tik_20"; static char* N(exit_str_2) = "tik_06"; static char* N(exit_str_3) = "jan_03"; -#include "world/common/atomic/Pipe.inc.c" +#include "world/common/entity/Pipe.inc.c" #include "world/common/atomic/TexturePan.inc.c" diff --git a/src/world/area_tik/tik_08/87F3E0.c b/src/world/area_tik/tik_08/87F3E0.c index dd9b55c530..aba097ce47 100644 --- a/src/world/area_tik/tik_08/87F3E0.c +++ b/src/world/area_tik/tik_08/87F3E0.c @@ -1,5 +1,5 @@ #include "tik_08.h" -#include "world/common/UnkPosFunc2.inc.c" +#include "world/common/todo/UnkPosFunc2.inc.c" -#include "world/common/SetEntityPosition.inc.c" +#include "world/common/todo/SetEntityPosition.inc.c" diff --git a/src/world/area_tik/tik_08/87F820.c b/src/world/area_tik/tik_08/87F820.c index b384751c85..0a104ebdc2 100644 --- a/src/world/area_tik/tik_08/87F820.c +++ b/src/world/area_tik/tik_08/87F820.c @@ -1,6 +1,6 @@ #include "tik_08.h" -#include "world/common/GetFloorCollider.inc.c" +#include "world/common/todo/GetFloorCollider.inc.c" extern s16 D_80242C0E_8819FE[0][2]; diff --git a/src/world/area_tik/tik_09/8821C0.c b/src/world/area_tik/tik_09/8821C0.c index 9d701db61f..2bcce9e795 100644 --- a/src/world/area_tik/tik_09/8821C0.c +++ b/src/world/area_tik/tik_09/8821C0.c @@ -5,7 +5,7 @@ static char* N(exit_str_1) = "tik_08"; static char* N(exit_str_2) = "mim_11"; static char* N(exit_str_3) = ""; -#include "world/common/atomic/Pipe.inc.c" +#include "world/common/entity/Pipe.inc.c" #include "world/common/atomic/TexturePan.inc.c" diff --git a/src/world/area_tik/tik_09/8827B0.c b/src/world/area_tik/tik_09/8827B0.c index cced7a1694..1ba4300780 100644 --- a/src/world/area_tik/tik_09/8827B0.c +++ b/src/world/area_tik/tik_09/8827B0.c @@ -1,5 +1,5 @@ #include "tik_09.h" -#include "world/common/UnkPosFunc2.inc.c" +#include "world/common/todo/UnkPosFunc2.inc.c" -#include "world/common/SetEntityPosition.inc.c" +#include "world/common/todo/SetEntityPosition.inc.c" diff --git a/src/world/area_tik/tik_09/882BF0.c b/src/world/area_tik/tik_09/882BF0.c index bb97193f61..1ae7bb7bc9 100644 --- a/src/world/area_tik/tik_09/882BF0.c +++ b/src/world/area_tik/tik_09/882BF0.c @@ -1,5 +1,5 @@ #include "tik_09.h" -#include "world/common/enemy/TackleAI.inc.c" +#include "world/common/enemy/ai/TackleAI.inc.c" #include "world/common/util/GetDefeatedEnemyCount.inc.c" diff --git a/src/world/area_tik/tik_10/8866D0.c b/src/world/area_tik/tik_10/8866D0.c index c4d202e5f2..b6fa876ed5 100644 --- a/src/world/area_tik/tik_10/8866D0.c +++ b/src/world/area_tik/tik_10/8866D0.c @@ -1,5 +1,5 @@ #include "tik_10.h" -#include "world/common/UnkPosFunc2.inc.c" +#include "world/common/todo/UnkPosFunc2.inc.c" -#include "world/common/atomic/SuperBlock.inc.c" +#include "world/common/entity/SuperBlock.inc.c" diff --git a/src/world/area_tik/tik_12/888BD0.c b/src/world/area_tik/tik_12/888BD0.c index 4b4ad4465c..56f979ed1e 100644 --- a/src/world/area_tik/tik_12/888BD0.c +++ b/src/world/area_tik/tik_12/888BD0.c @@ -3,7 +3,7 @@ static char* N(exit_str_0) = "tik_04"; static char* N(exit_str_1) = ""; -#include "world/common/atomic/Pipe.inc.c" +#include "world/common/entity/Pipe.inc.c" #include "world/common/atomic/TexturePan.inc.c" diff --git a/src/world/area_tik/tik_12/8891C0.c b/src/world/area_tik/tik_12/8891C0.c index 303e2b0fa6..530825bbd4 100644 --- a/src/world/area_tik/tik_12/8891C0.c +++ b/src/world/area_tik/tik_12/8891C0.c @@ -1,13 +1,13 @@ #include "tik_12.h" -#include "world/common/UnkPosFunc2.inc.c" +#include "world/common/todo/UnkPosFunc2.inc.c" -#include "world/common/StashVars.inc.c" +#include "world/common/todo/StashVars.inc.c" -#include "world/common/GetItemName.inc.c" +#include "world/common/todo/GetItemName.inc.c" -#include "world/common/SomeItemEntityFunc.inc.c" +#include "world/common/todo/SomeItemEntityFunc.inc.c" -#include "world/common/IsItemBadge.inc.c" +#include "world/common/todo/IsItemBadge.inc.c" -#include "world/common/atomic/SuperBlock.inc.c" +#include "world/common/entity/SuperBlock.inc.c" diff --git a/src/world/area_tik/tik_12/88A530.c b/src/world/area_tik/tik_12/88A530.c index 69c3f7d112..a49d908c24 100644 --- a/src/world/area_tik/tik_12/88A530.c +++ b/src/world/area_tik/tik_12/88A530.c @@ -1,5 +1,5 @@ #include "tik_12.h" -#include "world/common/enemy/TackleAI.inc.c" +#include "world/common/enemy/ai/TackleAI.inc.c" -#include "world/common/AwaitPlayerNearNpc.inc.c" +#include "world/common/todo/AwaitPlayerNearNpc.inc.c" diff --git a/src/world/area_tik/tik_14/88D600.c b/src/world/area_tik/tik_14/88D600.c index ee13d4205d..664458bba4 100644 --- a/src/world/area_tik/tik_14/88D600.c +++ b/src/world/area_tik/tik_14/88D600.c @@ -3,7 +3,7 @@ static char* N(exit_str_0) = "tik_15"; static char* N(exit_str_1) = "tik_21"; -#include "world/common/atomic/Pipe.inc.c" +#include "world/common/entity/Pipe.inc.c" #include "world/common/atomic/TexturePan.inc.c" diff --git a/src/world/area_tik/tik_14/88DBF0.c b/src/world/area_tik/tik_14/88DBF0.c index 12baea21b9..86e53d79d1 100644 --- a/src/world/area_tik/tik_14/88DBF0.c +++ b/src/world/area_tik/tik_14/88DBF0.c @@ -1,3 +1,3 @@ #include "tik_14.h" -#include "world/common/UnkPosFunc2.inc.c" +#include "world/common/todo/UnkPosFunc2.inc.c" diff --git a/src/world/area_tik/tik_15/88FBA0.c b/src/world/area_tik/tik_15/88FBA0.c index e35a0862e6..755d6b89e1 100644 --- a/src/world/area_tik/tik_15/88FBA0.c +++ b/src/world/area_tik/tik_15/88FBA0.c @@ -3,7 +3,7 @@ static char* N(exit_str_0) = "tik_14"; static char* N(exit_str_1) = "mac_02"; -#include "world/common/atomic/Pipe.inc.c" +#include "world/common/entity/Pipe.inc.c" #include "world/common/atomic/TexturePan.inc.c" diff --git a/src/world/area_tik/tik_15/890190.c b/src/world/area_tik/tik_15/890190.c index 3f041f10aa..0414ad994d 100644 --- a/src/world/area_tik/tik_15/890190.c +++ b/src/world/area_tik/tik_15/890190.c @@ -1,10 +1,10 @@ #include "tik_15.h" -#include "world/common/UnkPosFunc2.inc.c" +#include "world/common/todo/UnkPosFunc2.inc.c" -#include "world/common/StashVars.inc.c" +#include "world/common/todo/StashVars.inc.c" -#include "world/common/GetItemName.inc.c" +#include "world/common/todo/GetItemName.inc.c" extern s32 D_802427BC_89235C[13][2]; diff --git a/src/world/area_tik/tik_17/892A50.c b/src/world/area_tik/tik_17/892A50.c index d26467ca44..c2ed3d4c51 100644 --- a/src/world/area_tik/tik_17/892A50.c +++ b/src/world/area_tik/tik_17/892A50.c @@ -1,3 +1,3 @@ #include "tik_17.h" -#include "world/common/atomic/SuperBlock.inc.c" +#include "world/common/entity/SuperBlock.inc.c" diff --git a/src/world/area_tik/tik_17/893790.c b/src/world/area_tik/tik_17/893790.c index 683d775b3a..e075667d3c 100644 --- a/src/world/area_tik/tik_17/893790.c +++ b/src/world/area_tik/tik_17/893790.c @@ -1,6 +1,6 @@ #include "tik_17.h" -#include "world/common/atomic/Pipe.inc.c" +#include "world/common/entity/Pipe.inc.c" #include "world/common/atomic/TexturePan.inc.c" diff --git a/src/world/area_tik/tik_18/8959F0.c b/src/world/area_tik/tik_18/8959F0.c index 6d6943fa5e..0e6432c1f2 100644 --- a/src/world/area_tik/tik_18/8959F0.c +++ b/src/world/area_tik/tik_18/8959F0.c @@ -1,6 +1,6 @@ #include "tik_18.h" -#include "world/common/UnkPosFunc2.inc.c" +#include "world/common/todo/UnkPosFunc2.inc.c" ApiStatus func_80240680_895D60(Evt* script, s32 isInitialCall) { Enemy* enemy = get_enemy_safe(1); diff --git a/src/world/area_tik/tik_19/8975E0.c b/src/world/area_tik/tik_19/8975E0.c index 640c6cb06e..5c56a1ff88 100644 --- a/src/world/area_tik/tik_19/8975E0.c +++ b/src/world/area_tik/tik_19/8975E0.c @@ -3,7 +3,7 @@ static char* N(exit_str_0) = "mac_00"; static char* N(exit_str_1) = ""; -#include "world/common/atomic/Pipe.inc.c" +#include "world/common/entity/Pipe.inc.c" #include "world/common/atomic/TexturePan.inc.c" diff --git a/src/world/area_tik/tik_19/897BD0.c b/src/world/area_tik/tik_19/897BD0.c index 5f53dd6897..0777437611 100644 --- a/src/world/area_tik/tik_19/897BD0.c +++ b/src/world/area_tik/tik_19/897BD0.c @@ -1,3 +1,3 @@ #include "tik_19.h" -#include "world/common/atomic/SuperBlock.inc.c" +#include "world/common/entity/SuperBlock.inc.c" diff --git a/src/world/area_tik/tik_20/89A350.c b/src/world/area_tik/tik_20/89A350.c index ce48705285..6c9b6f1e5c 100644 --- a/src/world/area_tik/tik_20/89A350.c +++ b/src/world/area_tik/tik_20/89A350.c @@ -7,6 +7,6 @@ static char* N(exit_str_3) = ""; #include "world/common/atomic/TexturePan.inc.c" -#include "world/common/atomic/Pipe.inc.c" +#include "world/common/entity/Pipe.inc.c" -#include "world/common/UnkPosFunc2.inc.c" +#include "world/common/todo/UnkPosFunc2.inc.c" diff --git a/src/world/area_tik/tik_20/89ACB0.c b/src/world/area_tik/tik_20/89ACB0.c index 3eb22add0e..5931f2a3e6 100644 --- a/src/world/area_tik/tik_20/89ACB0.c +++ b/src/world/area_tik/tik_20/89ACB0.c @@ -1,3 +1,3 @@ #include "tik_20.h" -#include "world/common/enemy/TackleAI.inc.c" +#include "world/common/enemy/ai/TackleAI.inc.c" diff --git a/src/world/area_tik/tik_21/89D7A0.c b/src/world/area_tik/tik_21/89D7A0.c index 9521c9d4b3..a242fe260b 100644 --- a/src/world/area_tik/tik_21/89D7A0.c +++ b/src/world/area_tik/tik_21/89D7A0.c @@ -7,6 +7,6 @@ static char* N(exit_str_3) = ""; #include "world/common/atomic/TexturePan.inc.c" -#include "world/common/atomic/Pipe.inc.c" +#include "world/common/entity/Pipe.inc.c" -#include "world/common/UnkPosFunc2.inc.c" +#include "world/common/todo/UnkPosFunc2.inc.c" diff --git a/src/world/area_tik/tik_22/89FEF0.c b/src/world/area_tik/tik_22/89FEF0.c index ec85b6071e..de129fc754 100644 --- a/src/world/area_tik/tik_22/89FEF0.c +++ b/src/world/area_tik/tik_22/89FEF0.c @@ -2,7 +2,7 @@ #include "world/common/atomic/TexturePan.inc.c" -#include "world/common/atomic/Pipe.inc.c" +#include "world/common/entity/Pipe.inc.c" s32 bgm_clear_track_volumes(s32, s16); @@ -11,4 +11,4 @@ ApiStatus func_8024061C_8A04DC(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -#include "world/common/UnkPosFunc2.inc.c" +#include "world/common/todo/UnkPosFunc2.inc.c" diff --git a/src/world/area_tik/tik_23/8A23D0.c b/src/world/area_tik/tik_23/8A23D0.c index 9ace1ff747..b2c3f3bd64 100644 --- a/src/world/area_tik/tik_23/8A23D0.c +++ b/src/world/area_tik/tik_23/8A23D0.c @@ -3,8 +3,8 @@ static char* N(exit_str_0) = "tik_24"; static char* N(exit_str_1) = "tik_20"; -#include "world/common/atomic/Pipe.inc.c" +#include "world/common/entity/Pipe.inc.c" #include "world/common/atomic/TexturePan.inc.c" -#include "world/common/UnkPosFunc2.inc.c" +#include "world/common/todo/UnkPosFunc2.inc.c" diff --git a/src/world/area_tik/tik_23/8A2D30.c b/src/world/area_tik/tik_23/8A2D30.c index 682f2def7b..d08ddd868e 100644 --- a/src/world/area_tik/tik_23/8A2D30.c +++ b/src/world/area_tik/tik_23/8A2D30.c @@ -1,3 +1,3 @@ #include "tik_23.h" -#include "world/common/enemy/TackleAI.inc.c" +#include "world/common/enemy/ai/TackleAI.inc.c" diff --git a/src/world/area_tik/tik_24/8A5DE0.c b/src/world/area_tik/tik_24/8A5DE0.c index 1f46cf03e8..c58e4d648b 100644 --- a/src/world/area_tik/tik_24/8A5DE0.c +++ b/src/world/area_tik/tik_24/8A5DE0.c @@ -1,5 +1,5 @@ #include "tik_24.h" -#include "world/common/UnkPosFunc2.inc.c" +#include "world/common/todo/UnkPosFunc2.inc.c" -#include "world/common/enemy/TackleAI.inc.c" +#include "world/common/enemy/ai/TackleAI.inc.c" diff --git a/src/world/area_tik/tik_25/8A7F80.c b/src/world/area_tik/tik_25/8A7F80.c index 03a7e77f06..cd42e3a55e 100644 --- a/src/world/area_tik/tik_25/8A7F80.c +++ b/src/world/area_tik/tik_25/8A7F80.c @@ -5,4 +5,4 @@ static char* N(exit_str_1) = ""; #include "world/common/atomic/TexturePan.inc.c" -#include "world/common/UnkPosFunc2.inc.c" +#include "world/common/todo/UnkPosFunc2.inc.c" diff --git a/src/world/area_tik/tik_25/8A8600.c b/src/world/area_tik/tik_25/8A8600.c index c706eb4983..5cf2d3e8af 100644 --- a/src/world/area_tik/tik_25/8A8600.c +++ b/src/world/area_tik/tik_25/8A8600.c @@ -6,7 +6,7 @@ ApiStatus func_80240680_8A8600(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -#include "world/common/SetEntityPosition.inc.c" +#include "world/common/todo/SetEntityPosition.inc.c" // linker sym needed #ifdef NON_MATCHING 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 371ade01e6..aeeef47700 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 @@ -104,12 +104,12 @@ EvtScript N(EVS_EnterMap) = { EvtScript N(EVS_TexPan_WaterEdge) = { EVT_SET_GROUP(EVT_GROUP_00) - EVT_CALL(SetTexPanner, MODEL_ue, 1) + EVT_CALL(SetTexPanner, MODEL_ue, TEX_PANNER_1) EVT_SET(LVar0, 0) EVT_SET(LVar1, 0) EVT_LABEL(10) - EVT_CALL(SetTexPanOffset, 1, 0, LVar0, 0) - EVT_CALL(SetTexPanOffset, 1, 1, LVar1, 0) + EVT_CALL(SetTexPanOffset, TEX_PANNER_1, TEX_PANNER_MAIN, LVar0, 0) + EVT_CALL(SetTexPanOffset, TEX_PANNER_1, TEX_PANNER_AUX, LVar1, 0) EVT_ADD(LVar0, 100) EVT_SUB(LVar1, 100) EVT_WAIT(1) 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 6bb6671047..fee328ba55 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 @@ -13,7 +13,7 @@ API_CALLABLE(N(UpgradeStarPower)) { return ApiStatus_DONE2; } -#include "world/common/SyncStatusMenu.inc.c" +#include "world/common/todo/SyncStatusMenu.inc.c" NpcSettings N(NpcSettings_KoopaBros) = { .height = 34, 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 9561ad00d2..6355be7370 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 @@ -59,7 +59,7 @@ EvtScript N(EVS_Scene_RaiseStairs) = { EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) EVT_WAIT(10) - EVT_CALL(ModifyColliderFlags, 0, COLLIDER_o162, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o162, COLLIDER_FLAGS_UPPER_MASK) EVT_CALL(SetGroupEnabled, MODEL_move_saku, 0) EVT_CALL(PlaySound, SOUND_80000006) EVT_CHILD_THREAD @@ -325,7 +325,7 @@ EvtScript N(EVS_Main) = { EVT_CALL(UpdateColliderTransform, COLLIDER_o158) EVT_BIND_TRIGGER(EVT_PTR(N(EVS_Scene_RaiseStairs)), TRIGGER_AREA_FLAG_SET, AF_TRD01_RaiseStairs, 0, 0) EVT_ELSE - EVT_CALL(ModifyColliderFlags, 0, COLLIDER_o162, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o162, COLLIDER_FLAGS_UPPER_MASK) EVT_CALL(SetGroupEnabled, MODEL_move_saku, 0) EVT_END_IF EVT_CALL(EnableModel, MODEL_sui1, FALSE) diff --git a/src/world/area_trd/trd_01/trd_01_2_entity.c b/src/world/area_trd/trd_01/trd_01_2_entity.c index 8f3a5da8bb..58d331fe83 100644 --- a/src/world/area_trd/trd_01/trd_01_2_entity.c +++ b/src/world/area_trd/trd_01/trd_01_2_entity.c @@ -23,8 +23,8 @@ EvtScript N(EVS_FocusCamOnLock) = { EVT_END }; -#include "world/common/RemovePadlock.inc.c" -#include "world/common/GetEntityPosition.inc.c" +#include "world/common/todo/RemovePadlock.inc.c" +#include "world/common/todo/GetEntityPosition.inc.c" EvtScript N(EVS_UnlockDoors) = { EVT_SET_GROUP(EVT_GROUP_00) diff --git a/src/world/area_trd/trd_02/trd_02_1_main.c b/src/world/area_trd/trd_02/trd_02_1_main.c index 2a5009193e..3fdc26d6a8 100644 --- a/src/world/area_trd/trd_02/trd_02_1_main.c +++ b/src/world/area_trd/trd_02/trd_02_1_main.c @@ -134,7 +134,7 @@ EvtScript N(D_8024241C_9A33FC) = { EVT_CALL(SetGroupEnabled, MODEL_g14, 0) EVT_WAIT(1) EVT_END_LOOP - EVT_CALL(ModifyColliderFlags, 0, COLLIDER_tta, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_tta, COLLIDER_FLAGS_UPPER_MASK) EVT_SET(GF_TRD02_BombedWall, TRUE) EVT_RESUME_GROUP(1) EVT_UNBIND @@ -166,7 +166,7 @@ EvtScript N(EVS_Main) = { EVT_BIND_TRIGGER(EVT_PTR(N(D_8024241C_9A33FC)), TRIGGER_POINT_BOMB, EVT_PTR(N(D_8024240C_9A33EC)), 1, 0) EVT_ELSE EVT_CALL(SetGroupEnabled, MODEL_g14, 0) - EVT_CALL(ModifyColliderFlags, 0, COLLIDER_tta, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_tta, COLLIDER_FLAGS_UPPER_MASK) EVT_END_IF EVT_EXEC(N(EVS_SetupMusic)) EVT_SET(AF_TRD02_LowerStairs, FALSE) diff --git a/src/world/area_trd/trd_02/trd_02_2_entity.c b/src/world/area_trd/trd_02/trd_02_2_entity.c index 88d0420deb..75536b2755 100644 --- a/src/world/area_trd/trd_02/trd_02_2_entity.c +++ b/src/world/area_trd/trd_02/trd_02_2_entity.c @@ -3,8 +3,8 @@ extern EvtScript N(EVS_ExitDoors_trd_01_2); -#include "world/common/RemovePadlock.inc.c" -#include "world/common/GetEntityPosition.inc.c" +#include "world/common/todo/RemovePadlock.inc.c" +#include "world/common/todo/GetEntityPosition.inc.c" EvtScript N(D_80242890_9A3870) = { EVT_SET_GROUP(EVT_GROUP_00) diff --git a/src/world/area_trd/trd_03/trd_03_1_main.c b/src/world/area_trd/trd_03/trd_03_1_main.c index 9c1a572dbd..d57fcb55f8 100644 --- a/src/world/area_trd/trd_03/trd_03_1_main.c +++ b/src/world/area_trd/trd_03/trd_03_1_main.c @@ -93,8 +93,8 @@ EvtScript N(EVS_BombWall_MiddleCell) = { EVT_CALL(SetGroupEnabled, MODEL_ana2, 0) EVT_WAIT(1) EVT_END_LOOP - EVT_CALL(ModifyColliderFlags, 0, COLLIDER_deilit2, COLLIDER_FLAGS_UPPER_MASK) - EVT_CALL(ModifyColliderFlags, 0, COLLIDER_tt2, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_deilit2, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_tt2, COLLIDER_FLAGS_UPPER_MASK) EVT_SET(GF_TRD03_BombedCenterCell, TRUE) EVT_UNBIND EVT_RETURN @@ -110,8 +110,8 @@ EvtScript N(EVS_BombWall_RightCell) = { EVT_CALL(SetGroupEnabled, MODEL_ana3, 0) EVT_WAIT(1) EVT_END_LOOP - EVT_CALL(ModifyColliderFlags, 0, COLLIDER_deilit3, COLLIDER_FLAGS_UPPER_MASK) - EVT_CALL(ModifyColliderFlags, 0, COLLIDER_tt3, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_deilit3, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_tt3, COLLIDER_FLAGS_UPPER_MASK) EVT_SET(GF_TRD03_BombedRightCell, TRUE) EVT_UNBIND EVT_RETURN @@ -211,24 +211,24 @@ EvtScript N(EVS_Main) = { EVT_CALL(EnableModel, MODEL_nk1, FALSE) EVT_ELSE EVT_CALL(SetGroupEnabled, MODEL_ana1, 0) - EVT_CALL(ModifyColliderFlags, 0, COLLIDER_deilit1, COLLIDER_FLAGS_UPPER_MASK) - EVT_CALL(ModifyColliderFlags, 0, COLLIDER_tt1, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_deilit1, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_tt1, COLLIDER_FLAGS_UPPER_MASK) EVT_END_IF EVT_IF_EQ(GF_TRD03_BombedCenterCell, FALSE) EVT_CALL(EnableModel, MODEL_nk2, FALSE) EVT_BIND_TRIGGER(EVT_PTR(N(EVS_BombWall_MiddleCell)), TRIGGER_POINT_BOMB, EVT_PTR(N(BombPos_MiddleCell)), 1, 0) EVT_ELSE EVT_CALL(SetGroupEnabled, MODEL_ana2, 0) - EVT_CALL(ModifyColliderFlags, 0, COLLIDER_deilit2, COLLIDER_FLAGS_UPPER_MASK) - EVT_CALL(ModifyColliderFlags, 0, COLLIDER_tt2, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_deilit2, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_tt2, COLLIDER_FLAGS_UPPER_MASK) EVT_END_IF EVT_IF_EQ(GF_TRD03_BombedRightCell, FALSE) EVT_CALL(EnableModel, MODEL_nk3, FALSE) EVT_BIND_TRIGGER(EVT_PTR(N(EVS_BombWall_RightCell)), TRIGGER_POINT_BOMB, EVT_PTR(N(BombPos_RightCell)), 1, 0) EVT_ELSE EVT_CALL(SetGroupEnabled, MODEL_ana3, 0) - EVT_CALL(ModifyColliderFlags, 0, COLLIDER_deilit3, COLLIDER_FLAGS_UPPER_MASK) - EVT_CALL(ModifyColliderFlags, 0, COLLIDER_tt3, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_deilit3, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_tt3, COLLIDER_FLAGS_UPPER_MASK) EVT_END_IF EVT_EXEC(N(EVS_SetupMusic)) EVT_IF_LT(GB_StoryProgress, STORY_CH1_KOOPA_BROS_HID_KEY) diff --git a/src/world/area_trd/trd_03/trd_03_4_puzzle.c b/src/world/area_trd/trd_03/trd_03_4_puzzle.c index 45ffa28920..bf6906f713 100644 --- a/src/world/area_trd/trd_03/trd_03_4_puzzle.c +++ b/src/world/area_trd/trd_03/trd_03_4_puzzle.c @@ -45,7 +45,7 @@ EvtScript N(EVS_RetractPlatform) = { EVT_IF_EQ(LVar1, 1) EVT_GOTO(0) EVT_END_IF - EVT_CALL(ModifyColliderFlags, 0, LVar7, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, LVar7, COLLIDER_FLAGS_UPPER_MASK) EVT_CALL(PlaySound, SOUND_26) EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 2, EVT_FLOAT(0.3)) EVT_RETURN 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 aea70c5069..aaa9a504cf 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 @@ -219,7 +219,7 @@ EvtScript N(EVS_Scene_LowerStairs) = { EvtScript N(EVS_TexPan_Water) = { EVT_SET_GROUP(EVT_GROUP_00) - EVT_CALL(SetTexPanner, MODEL_suimen, 1) + EVT_CALL(SetTexPanner, MODEL_suimen, TEX_PANNER_1) EVT_SET(LVar0, 0) EVT_SET(LVar1, 0) EVT_LABEL(10) @@ -257,10 +257,10 @@ EvtScript N(EVS_Main) = { EVT_BIND_TRIGGER(EVT_PTR(N(EVS_Scene_LowerStairs)), TRIGGER_AREA_FLAG_SET, AF_TRD04_LowerStairs, 1, 0) EVT_END_IF EVT_EXEC(N(EVS_TexPan_Water)) - EVT_CALL(ModifyColliderFlags, 0, COLLIDER_ttw, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_ttw, COLLIDER_FLAGS_UPPER_MASK) EVT_CALL(EnableModel, MODEL_o34, FALSE) EVT_CALL(EnableModel, MODEL_dai, FALSE) - EVT_CALL(ModifyColliderFlags, 0, COLLIDER_dai, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_dai, COLLIDER_FLAGS_UPPER_MASK) EVT_EXEC(N(EVS_EnterMap)) EVT_WAIT(1) EVT_CALL(EnableTexPanning, MODEL_suimen, TRUE) diff --git a/src/world/area_trd/trd_04/trd_04_2_entity.c b/src/world/area_trd/trd_04/trd_04_2_entity.c index 9658d642ff..4a3d1ff36f 100644 --- a/src/world/area_trd/trd_04/trd_04_2_entity.c +++ b/src/world/area_trd/trd_04/trd_04_2_entity.c @@ -4,11 +4,11 @@ extern EvtScript N(EVS_ExitDoors_trd_05_0); extern EvtScript N(EVS_ExitDoors_trd_03_3); -#include "world/common/RemovePadlock.inc.c" +#include "world/common/todo/RemovePadlock.inc.c" -#include "world/common/SetEntityPosition.inc.c" +#include "world/common/todo/SetEntityPosition.inc.c" -#include "world/common/GetEntityPosition.inc.c" +#include "world/common/todo/GetEntityPosition.inc.c" s32 N(missing_80244D70_4D70)[] = { 0x00000000, 0x00010101, 0x01010101, 0x01010101, diff --git a/src/world/area_trd/trd_05/trd_05_1_main.c b/src/world/area_trd/trd_05/trd_05_1_main.c index 20d5a3e2b8..2bc86f1f76 100644 --- a/src/world/area_trd/trd_05/trd_05_1_main.c +++ b/src/world/area_trd/trd_05/trd_05_1_main.c @@ -70,7 +70,7 @@ EvtScript N(EVS_BombWall) = { EVT_CALL(SetGroupEnabled, MODEL_ana3, 0) EVT_WAIT(1) EVT_END_LOOP - EVT_CALL(ModifyColliderFlags, 0, COLLIDER_tte, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_tte, COLLIDER_FLAGS_UPPER_MASK) EVT_SET(GF_TRD05_BombedWall, TRUE) EVT_RESUME_GROUP(EVT_GROUP_01) EVT_UNBIND @@ -80,12 +80,12 @@ EvtScript N(EVS_BombWall) = { EvtScript N(EVS_TexPan_Water) = { EVT_SET_GROUP(EVT_GROUP_00) - EVT_CALL(SetTexPanner, MODEL_suimen, 1) + EVT_CALL(SetTexPanner, MODEL_suimen, TEX_PANNER_1) EVT_SET(LVar0, 0) EVT_SET(LVar1, 0) EVT_LABEL(10) - EVT_CALL(SetTexPanOffset, 1, 0, LVar0, 0) - EVT_CALL(SetTexPanOffset, 1, 1, LVar1, 0) + EVT_CALL(SetTexPanOffset, TEX_PANNER_1, TEX_PANNER_MAIN, LVar0, 0) + EVT_CALL(SetTexPanOffset, TEX_PANNER_1, TEX_PANNER_AUX, LVar1, 0) EVT_ADD(LVar0, 100) EVT_SUB(LVar1, 100) EVT_WAIT(1) @@ -105,14 +105,14 @@ EvtScript N(EVS_Main) = { EVT_BIND_TRIGGER(EVT_PTR(N(EVS_BombWall)), TRIGGER_POINT_BOMB, EVT_PTR(N(BombPos_Wall)), 1, 0) EVT_ELSE EVT_CALL(SetGroupEnabled, MODEL_ana3, 0) - EVT_CALL(ModifyColliderFlags, 0, COLLIDER_tte, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_tte, COLLIDER_FLAGS_UPPER_MASK) EVT_END_IF EVT_EXEC(N(EVS_SetupMusic)) EVT_EXEC(N(EVS_TexPan_Water)) EVT_CALL(EnableModel, MODEL_o95, FALSE) EVT_CALL(EnableModel, MODEL_o96, FALSE) EVT_CALL(SetGroupEnabled, MODEL_kesu, 0) - EVT_CALL(ModifyColliderFlags, 0, COLLIDER_o103, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o103, COLLIDER_FLAGS_UPPER_MASK) EVT_IF_LT(GB_StoryProgress, STORY_CH1_KOOPA_BROS_SET_TRAP) EVT_WAIT(10) EVT_CALL(N(SetMapChangeFadeRate)) diff --git a/src/world/area_trd/trd_05/trd_05_3_trap.c b/src/world/area_trd/trd_05/trd_05_3_trap.c index 180658eaf3..dcc365459b 100644 --- a/src/world/area_trd/trd_05/trd_05_3_trap.c +++ b/src/world/area_trd/trd_05/trd_05_3_trap.c @@ -328,7 +328,7 @@ EvtScript N(EVS_OnHitTrapTrigger) = { EVT_WAIT(10) EVT_EXEC_WAIT(N(EVS_PartnerFalling)) EVT_END_THREAD - EVT_CALL(ModifyColliderFlags, 0, COLLIDER_o82, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o82, COLLIDER_FLAGS_UPPER_MASK) EVT_CALL(UseSettingsFrom, CAM_DEFAULT, LVar2, LVar3, LVar4) EVT_SET(LVar5, LVar3) EVT_SUB(LVar5, 200) 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 717cd58bc0..f131c2ad67 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 @@ -55,8 +55,8 @@ EvtScript N(EVS_BombWall_Cell) = { EVT_CALL(SetGroupEnabled, MODEL_ana2, 0) EVT_WAIT(1) EVT_END_LOOP - EVT_CALL(ModifyColliderFlags, 0, COLLIDER_deilitse, COLLIDER_FLAGS_UPPER_MASK) - EVT_CALL(ModifyColliderFlags, 0, COLLIDER_ttse, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_deilitse, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_ttse, COLLIDER_FLAGS_UPPER_MASK) EVT_CALL(WaitForPlayerInputEnabled) EVT_CALL(DisablePlayerInput, TRUE) EVT_SET(GF_TRD06_BombedWall, TRUE) @@ -136,7 +136,7 @@ EvtScript N(EVS_Main) = { EVT_CASE_LT(STORY_CH1_DEFEATED_KOOPA_BROS) EVT_CALL(EnableModel, MODEL_o97, FALSE) EVT_CALL(EnableModel, MODEL_o98, FALSE) - EVT_CALL(ModifyColliderFlags, 0, COLLIDER_o109, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o109, COLLIDER_FLAGS_UPPER_MASK) EVT_END_SWITCH EVT_IF_GE(GB_StoryProgress, STORY_CH1_DEFEATED_DUNGEON_GUARDS) EVT_SET(GF_TRD06_BombedWall, TRUE) @@ -159,8 +159,8 @@ EvtScript N(EVS_Main) = { EVT_CALL(SetGroupEnabled, MODEL_ana, 0) EVT_ELSE EVT_CALL(SetGroupEnabled, MODEL_ana2, 0) - EVT_CALL(ModifyColliderFlags, 0, COLLIDER_deilitse, COLLIDER_FLAGS_UPPER_MASK) - EVT_CALL(ModifyColliderFlags, 0, COLLIDER_ttse, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_deilitse, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_ttse, COLLIDER_FLAGS_UPPER_MASK) EVT_END_IF EVT_ELSE EVT_CALL(SetGroupEnabled, MODEL_ana, 0) diff --git a/src/world/area_trd/trd_06/trd_06_6_party_image.c b/src/world/area_trd/trd_06/trd_06_6_party_image.c index c38da7336b..7a67b436af 100644 --- a/src/world/area_trd/trd_06/trd_06_6_party_image.c +++ b/src/world/area_trd/trd_06/trd_06_6_party_image.c @@ -1,4 +1,4 @@ #include "trd_06.h" #define PARTY_IMAGE "party_pinki" -#include "world/common/LoadPartyImage.inc.c" +#include "world/common/todo/LoadPartyImage.inc.c" 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 3891573de8..80d1c6974c 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 @@ -39,7 +39,7 @@ EvtScript N(EVS_Main) = { EVT_EXEC_WAIT(N(EVS_MakeEntities)) EVT_EXEC(N(EVS_SetupMusic)) EVT_EXEC(N(EVS_TexPan_Water)) - EVT_CALL(ModifyColliderFlags, 0, COLLIDER_tte, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_tte, COLLIDER_FLAGS_UPPER_MASK) EVT_CALL(EnableModel, MODEL_o36, FALSE) EVT_SET(LVar0, EVT_PTR(N(EVS_BindExitTriggers))) EVT_EXEC(EnterWalk) 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 b985acf0af..53e9755b9e 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 @@ -1,7 +1,7 @@ #include "trd_08.h" #include "effects.h" -#include "world/common/enemy/FireBarAI.inc.c" +#include "world/common/enemy/ai/FireBarAI.inc.c" s32 N(FireBar_Sounds)[] = { SOUND_FIRE_BAR_0, SOUND_FIRE_BAR_1, SOUND_FIRE_BAR_2, SOUND_FIRE_BAR_3, 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 3639e366e8..7bca6ee8e0 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,7 +5,7 @@ extern EvtScript N(EVS_InitFakeBowser); extern EvtScript N(EVS_SetupFakeBowser); extern NpcGroupList N(DefaultNPCs); -#include "world/common/StarSpiritEffectFunc.inc.c" +#include "world/common/todo/StarSpiritEffectFunc.inc.c" API_CALLABLE(N(SetMapChangeFadeRate)) { set_map_change_fade_rate(10); diff --git a/src/world/area_tst/tst_03/tst_03_1_main.c b/src/world/area_tst/tst_03/tst_03_1_main.c index 5e20d78ac4..2e5f44504f 100644 --- a/src/world/area_tst/tst_03/tst_03_1_main.c +++ b/src/world/area_tst/tst_03/tst_03_1_main.c @@ -46,8 +46,8 @@ EvtScript N(EVS_Main) = { EVT_BIND_TRIGGER(EVT_PTR(N(EVS_GotoMap_tst_04_0)), TRIGGER_WALL_PUSH, COLLIDER_deilite, 1, 0) EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_SURFACE, COLLIDER_puku, SURFACE_TYPE_DOCK_WALL) EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_SURFACE, COLLIDER_pukut, SURFACE_TYPE_DOCK_WALL) - EVT_CALL(ModifyColliderFlags, 0, COLLIDER_puku, COLLIDER_FLAGS_80000) - EVT_CALL(ModifyColliderFlags, 0, COLLIDER_pukut, COLLIDER_FLAGS_80000) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_puku, COLLIDER_FLAGS_80000) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_pukut, COLLIDER_FLAGS_80000) EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_SURFACE, COLLIDER_o264, SURFACE_TYPE_WATER) EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_SURFACE, COLLIDER_o265, SURFACE_TYPE_SPIKES) EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_SURFACE, COLLIDER_o236, SURFACE_TYPE_LAVA) 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 364d539052..8b8956c724 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 @@ -32,7 +32,7 @@ API_CALLABLE(N(func_80240000_B1D760)) { return ApiStatus_DONE2; } -#include "world/common/UnkDistFunc2.inc.c" +#include "world/common/todo/UnkDistFunc2.inc.c" void N(func_8024013C_B1D89C)(void) { Matrix4f sp10; @@ -102,7 +102,7 @@ EvtScript N(D_80240510_B1DC70) = { EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_CLEAR_BITS, ArrayVar(0), COLLIDER_FLAGS_UPPER_MASK) EVT_CALL(EnableModel, ArrayVar(1), TRUE) EVT_WAIT(1) - EVT_CALL(ModifyColliderFlags, 0, ArrayVar(0), COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, ArrayVar(0), COLLIDER_FLAGS_UPPER_MASK) EVT_CALL(EnableModel, ArrayVar(1), FALSE) EVT_WAIT(1) EVT_END_LOOP diff --git a/src/world/common/atomic/Chest.inc.c b/src/world/common/atomic/Chest.inc.c index 96317d841a..baa3d92eee 100644 --- a/src/world/common/atomic/Chest.inc.c +++ b/src/world/common/atomic/Chest.inc.c @@ -1,12 +1,12 @@ #include "common.h" -#include "world/common/StashVars.inc.c" +#include "world/common/todo/StashVars.inc.c" -#include "world/common/GetItemName.inc.c" +#include "world/common/todo/GetItemName.inc.c" -#include "world/common/SomeItemEntityFunc.inc.c" +#include "world/common/todo/SomeItemEntityFunc.inc.c" -#include "world/common/IsItemBadge.inc.c" +#include "world/common/todo/IsItemBadge.inc.c" s32** N(varStash) = NULL; diff --git a/src/world/common/atomic/Chest.old.inc.c b/src/world/common/atomic/Chest.old.inc.c index 2f85ae2380..e98094dfa6 100644 --- a/src/world/common/atomic/Chest.old.inc.c +++ b/src/world/common/atomic/Chest.old.inc.c @@ -28,11 +28,11 @@ ApiStatus N(StashVars)(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -#include "world/common/GetItemName.inc.c" +#include "world/common/todo/GetItemName.inc.c" -#include "world/common/SomeItemEntityFunc.inc.c" +#include "world/common/todo/SomeItemEntityFunc.inc.c" -#include "world/common/IsItemBadge.inc.c" +#include "world/common/todo/IsItemBadge.inc.c" EvtScript N(EVS_Chest_ShowGotItem) = { EVT_SET_GROUP(EVT_GROUP_00) diff --git a/src/world/common/atomic/DarkRoom.data.inc.c b/src/world/common/atomic/CreateDarkness.data.inc.c similarity index 100% rename from src/world/common/atomic/DarkRoom.data.inc.c rename to src/world/common/atomic/CreateDarkness.data.inc.c diff --git a/src/world/common/atomic/DarkRoom.inc.c b/src/world/common/atomic/CreateDarkness.inc.c similarity index 100% rename from src/world/common/atomic/DarkRoom.inc.c rename to src/world/common/atomic/CreateDarkness.inc.c diff --git a/src/world/common/atomic/ItemChoice_PartA.inc.c b/src/world/common/atomic/ItemChoice_PartA.inc.c index f73449c29c..fded06761b 100644 --- a/src/world/common/atomic/ItemChoice_PartA.inc.c +++ b/src/world/common/atomic/ItemChoice_PartA.inc.c @@ -1,8 +1,8 @@ #include "common.h" -#include "world/common/GetNpcCollisionHeight.inc.c" +#include "world/common/todo/GetNpcCollisionHeight.inc.c" -#include "world/common/AddPlayerHandsOffset.inc.c" +#include "world/common/todo/AddPlayerHandsOffset.inc.c" ApiStatus N(ItemChoice_WaitForSelection)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; diff --git a/src/world/common/atomic/LetterChoice.inc.c b/src/world/common/atomic/LetterChoice.inc.c index 6429f0fc0a..4402e03b5c 100644 --- a/src/world/common/atomic/LetterChoice.inc.c +++ b/src/world/common/atomic/LetterChoice.inc.c @@ -3,99 +3,9 @@ //TODO remove extern s32 N(LetterDelivery_SavedNpcAnim); -s32** N(varStash) = NULL; +#include "world/common/complete/GiveReward.inc.c" -//TODO temporarily moved from #include "world/common/StashVars.inc.c" to suppresse warnings -ApiStatus N(StashVars)(Evt* script, s32 isInitialCall) { - //static s32** varTable = NULL; - s32 i; - - if (N(varStash) == NULL) { - N(varStash) = heap_malloc(sizeof(script->varTable)); - - for (i = 0; i < ARRAY_COUNT(script->varTable); i++) { - N(varStash)[i] = (s32*) script->varTable[i]; - } - } else { - for (i = 0; i < ARRAY_COUNT(script->varTable); i++) { - script->varTable[i] = (s32) N(varStash)[i]; - } - - heap_free(N(varStash)); - N(varStash) = NULL; - } - - return ApiStatus_DONE2; -} - -EvtScript N(Delivery_ShowGotStarPiece) = { - EVT_CALL(ShowGotItem, LVar0, TRUE, 0) - EVT_RETURN - EVT_RETURN - EVT_END -}; - -EvtScript N(EVS_80244A44) = { - EVT_CALL(ShowGotItem, LVar0, TRUE, 0x10) - EVT_RETURN - EVT_RETURN - EVT_END -}; - -static s32 N(KeyItemChoiceList)[ITEM_NUM_KEYS + 2]; -//static s32 N(LetterDelivery_SavedNpcAnim); - -#include "world/common/GetItemName.inc.c" - -#include "world/common/GetNpcCollisionHeight.inc.c" - -#include "world/common/AddPlayerHandsOffset.inc.c" - -s32 N(HasLetterChoiceResult) = FALSE; -s32 N(LetterChoiceResult) = ITEM_NONE; - -ApiStatus N(AwaitLetterChoiceResult)(Evt* script, s32 isInitialCall) { - Bytecode* args = script->ptrReadPos; - - if (isInitialCall) { - N(HasLetterChoiceResult) = FALSE; - } - - if (N(HasLetterChoiceResult)) { - N(HasLetterChoiceResult) = FALSE; - evt_set_variable(script, *args++, N(LetterChoiceResult)); - return ApiStatus_DONE2; - } - - return ApiStatus_BLOCK; -} - -ApiStatus N(SetLetterChoiceResult)(Evt* script, s32 isInitialCall) { - Bytecode* args = script->ptrReadPos; - - N(LetterChoiceResult) = evt_get_variable(script, *args++); - N(HasLetterChoiceResult) = TRUE; - return ApiStatus_DONE2; -} - -ApiStatus N(BuildKeyItemChoiceList)(Evt* script, s32 isInitialCall) { - Bytecode* args = script->ptrReadPos; - s32* allowedItemList = (s32*)evt_get_variable(script, *args++); - s32 i; - - if (allowedItemList != NULL) { - for (i = 0; allowedItemList[i] != ITEM_NONE; i++) { - N(KeyItemChoiceList)[i] = allowedItemList[i]; - } - N(KeyItemChoiceList)[i] = ITEM_NONE; - } else { - for (i = 0; i < ITEM_NUM_KEYS; i++) { - N(KeyItemChoiceList)[i] = ITEM_FIRST_KEY + i; - N(KeyItemChoiceList)[ITEM_NUM_KEYS] = ITEM_NONE; // vanilla oddity -- should be after the loop! - } - } - return ApiStatus_DONE2; -} +#include "world/common/complete/KeyItemChoice.inc.c" ApiStatus N(LetterDelivery_Init)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; @@ -149,39 +59,6 @@ ApiStatus N(LetterDelivery_RestoreNpcAnim)(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -EvtScript N(D_802452BC_C7BF9C) = { - EVT_SET(LVar9, LVar1) - EVT_CALL(ShowKeyChoicePopup) - EVT_SET(LVarA, LVar0) - EVT_SWITCH(LVar0) - EVT_CASE_EQ(0) - EVT_CASE_EQ(-1) - EVT_CASE_DEFAULT - EVT_CALL(RemoveKeyItemAt, LVar1) - EVT_CALL(GetPlayerPos, LVar3, LVar4, LVar5) - EVT_CALL(N(AddPlayerHandsOffset), LVar3, LVar4, LVar5) - EVT_BITWISE_OR_CONST(LVar0, 0x00050000) - EVT_CALL(MakeItemEntity, LVar0, LVar3, LVar4, LVar5, ITEM_SPAWN_MODE_DECORATION, 0) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_60005) - EVT_WAIT(30) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) - EVT_CALL(RemoveItemEntity, LVar0) - EVT_END_SWITCH - EVT_CALL(N(SetLetterChoiceResult), LVarA) - EVT_CALL(CloseChoicePopup) - EVT_UNBIND - EVT_RETURN - EVT_END -}; - -EvtScript N(EVS_ShowChoiceWindow) = { - EVT_CALL(N(BuildKeyItemChoiceList), LVar0) - EVT_BIND_PADLOCK(N(D_802452BC_C7BF9C), TRIGGER_FORCE_ACTIVATE, 0, EVT_PTR(N(KeyItemChoiceList)), 0, 1) - EVT_CALL(N(AwaitLetterChoiceResult), LVar0) - EVT_RETURN - EVT_END -}; - EvtScript N(D_80245450_C7C130) = { EVT_LOOP(0) EVT_CALL(GetNpcPos, NPC_PARTNER, LVar3, LVar4, LVar5) @@ -236,7 +113,7 @@ EvtScript N(D_802454D0_C7C1B0) = { EVT_CALL(EnablePartnerAI) EVT_WAIT(5) EVT_END_SWITCH - EVT_CALL(N(SetLetterChoiceResult), LVarA) + EVT_CALL(N(ItemChoice_SaveSelected), LVarA) EVT_CALL(CloseChoicePopup) EVT_UNBIND EVT_RETURN @@ -248,7 +125,7 @@ EvtScript N(EVS_ShowLetterChoice) = { EVT_SET(LVar1, LVar2) EVT_CALL(N(BuildKeyItemChoiceList), LVar0) EVT_BIND_PADLOCK(N(D_802454D0_C7C1B0), TRIGGER_FORCE_ACTIVATE, 0, EVT_PTR(N(KeyItemChoiceList)), 0, 1) - EVT_CALL(N(AwaitLetterChoiceResult), LVar0) + EVT_CALL(N(ItemChoice_WaitForSelection), LVar0) EVT_RETURN EVT_END }; @@ -292,7 +169,7 @@ EvtScript N(EVS_DoLetterDelivery) = { EVT_IF_NE(LVar6, 0) EVT_SET(LVar0, LVar6) EVT_SET(LVar1, ITEM_TYPE_KEY) - EVT_EXEC_WAIT(N(Delivery_ShowGotStarPiece)) + EVT_EXEC_WAIT(N(GiveKeyReward)) EVT_CALL(AddKeyItem, LVar6) EVT_END_IF EVT_SET(LVarC, 2) diff --git a/src/world/common/atomic/WhaleAnim.inc.c b/src/world/common/atomic/WhaleAnim.inc.c index db4ce5161e..8e6e3d19a2 100644 --- a/src/world/common/atomic/WhaleAnim.inc.c +++ b/src/world/common/atomic/WhaleAnim.inc.c @@ -137,4 +137,4 @@ void N(unkAngleFunc003)(void) { } } -#include "world/common/UnkFloatFunc001.inc.c" +#include "world/common/todo/UnkFloatFunc001.inc.c" diff --git a/src/world/common/atomic/kzn_SpinyTromp.inc.c b/src/world/common/atomic/kzn_SpinyTromp.inc.c index d2e3ea3b13..f3a540087f 100644 --- a/src/world/common/atomic/kzn_SpinyTromp.inc.c +++ b/src/world/common/atomic/kzn_SpinyTromp.inc.c @@ -15,17 +15,17 @@ ApiStatus N(SpinyTromp_GetActingPartner)(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -#include "world/common/UnkFunc46.inc.c" +#include "world/common/todo/UnkFunc46.inc.c" -#include "world/common/SpinyTromp_CheckDist.inc.c" +#include "world/common/todo/SpinyTromp_CheckDist.inc.c" -#include "world/common/UnkFunc48.inc.c" +#include "world/common/todo/UnkFunc48.inc.c" -#include "world/common/UnkFunc49.inc.c" +#include "world/common/todo/UnkFunc49.inc.c" -#include "world/common/UnkFunc50.inc.c" +#include "world/common/todo/UnkFunc50.inc.c" -#include "world/common/UnkFunc51.inc.c" +#include "world/common/todo/UnkFunc51.inc.c" EvtScript N(D_80240D10_C7EE90) = { EVT_CALL(DisablePlayerInput, TRUE) diff --git a/src/world/common/complete/GiveReward.inc.c b/src/world/common/complete/GiveReward.inc.c index 3168edbd40..f3b59799c8 100644 --- a/src/world/common/complete/GiveReward.inc.c +++ b/src/world/common/complete/GiveReward.inc.c @@ -5,8 +5,30 @@ static s32** N(varStash) = NULL; -#include "world/common/StashVars.inc.c" -#include "world/common/GetItemName.inc.c" +// TODO extracted from world/common/todo/StashVars to reduce warnings (for now) +ApiStatus N(StashVars)(Evt* script, s32 isInitialCall) { + //static s32** varTable = NULL; + s32 i; + + if (N(varStash) == NULL) { + N(varStash) = heap_malloc(sizeof(script->varTable)); + + for (i = 0; i < ARRAY_COUNT(script->varTable); i++) { + N(varStash)[i] = (s32*) script->varTable[i]; + } + } else { + for (i = 0; i < ARRAY_COUNT(script->varTable); i++) { + script->varTable[i] = (s32) N(varStash)[i]; + } + + heap_free(N(varStash)); + N(varStash) = NULL; + } + + return ApiStatus_DONE2; +} + +#include "world/common/todo/GetItemName.inc.c" EvtScript N(GiveKeyReward) = { EVT_CALL(ShowGotItem, LVar0, ITEM_TYPE_KEY, 0) @@ -28,4 +50,16 @@ EvtScript N(GiveCoinReward) = { EVT_EXEC_WAIT(N(GiveKeyReward)) \ EVT_CALL(AddKeyItem, itemID) +#define EVT_GIVE_CONSUMABLE_REWARD(itemID) \ + EVT_SET(LVar0, itemID) \ + EVT_SET(LVar1, ITEM_TYPE_CONSUMABLE) \ + EVT_EXEC_WAIT(N(GiveKeyReward)) \ + EVT_CALL(AddItem, LVar0, LVar1) + +#define EVT_GIVE_STAR_PIECE() \ + EVT_SET(LVar0, ITEM_STAR_PIECE) \ + EVT_SET(LVar1, ITEM_TYPE_STAR_PIECE) \ + EVT_EXEC_WAIT(N(GiveKeyReward)) \ + EVT_CALL(AddStarPieces, 1) + #endif diff --git a/src/world/common/complete/KeyItemChoice.inc.c b/src/world/common/complete/KeyItemChoice.inc.c index 308888aa2b..3aff8196be 100644 --- a/src/world/common/complete/KeyItemChoice.inc.c +++ b/src/world/common/complete/KeyItemChoice.inc.c @@ -1,20 +1,48 @@ +#ifndef _COMMON_KEY_CHOICE_ +#define _COMMON_KEY_CHOICE_ + #include "common.h" -static s32 N(KeyItemChoiceList)[112]; +static s32 N(KeyItemChoiceList)[ITEM_NUM_KEYS]; + +#ifndef _CHOICE_SUPPORT_ +#define _CHOICE_SUPPORT_ s32 N(ItemChoice_HasSelectedItem) = 0; - s32 N(ItemChoice_SelectedItemID) = 0; -#include "world/common/atomic/ItemChoice_PartA.inc.c" +#include "world/common/todo/GetNpcCollisionHeight.inc.c" +#include "world/common/todo/AddPlayerHandsOffset.inc.c" + +ApiStatus N(ItemChoice_WaitForSelection)(Evt* script, s32 isInitialCall) { + Bytecode* args = script->ptrReadPos; + + if (isInitialCall) { + N(ItemChoice_HasSelectedItem) = FALSE; + } + + if (N(ItemChoice_HasSelectedItem)) { + N(ItemChoice_HasSelectedItem) = FALSE; + evt_set_variable(script, *args, N(ItemChoice_SelectedItemID)); + return ApiStatus_DONE2; + } + + return ApiStatus_BLOCK; +} + +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; +} + +#endif #include "world/common/atomic/MakeKeyChoice.inc.c" -// ItemChoice_WaitForSelection -// ItemChoice_SaveSelected -// BuildKeyItemChoiceList - -EvtScript N(EVS_ItemChoicePopup) = { +EvtScript N(EVS_KeyItemChoicePopup) = { EVT_SET(LVar9, LVar1) EVT_CALL(ShowKeyChoicePopup) EVT_SET(LVarA, LVar0) @@ -41,8 +69,20 @@ EvtScript N(EVS_ItemChoicePopup) = { EvtScript N(EVS_ChooseKeyItem) = { EVT_CALL(N(BuildKeyItemChoiceList), LVar0) - EVT_BIND_PADLOCK(EVT_PTR(N(EVS_ItemChoicePopup)), TRIGGER_FORCE_ACTIVATE, 0, EVT_PTR(N(KeyItemChoiceList)), 0, 1) + EVT_BIND_PADLOCK(EVT_PTR(N(EVS_KeyItemChoicePopup)), TRIGGER_FORCE_ACTIVATE, 0, EVT_PTR(N(KeyItemChoiceList)), 0, 1) EVT_CALL(N(ItemChoice_WaitForSelection), LVar0) EVT_RETURN EVT_END }; + +#define EVT_CHOOSE_ANY_KEY_ITEM() \ + EVT_SET(LVar0, 0) \ + EVT_SET(LVar1, 0) \ + EVT_EXEC_WAIT(N(EVS_ChooseKeyItem)) + +#define EVT_CHOOSE_KEY_ITEM(itemList) \ + EVT_SET(LVar0, EVT_PTR(itemList)) \ + EVT_SET(LVar1, 0) \ + EVT_EXEC_WAIT(N(EVS_ChooseKeyItem)) + +#endif diff --git a/src/world/common/complete/NormalItemChoice.inc.c b/src/world/common/complete/NormalItemChoice.inc.c new file mode 100644 index 0000000000..db841b3834 --- /dev/null +++ b/src/world/common/complete/NormalItemChoice.inc.c @@ -0,0 +1,104 @@ +#ifndef _COMMON_CONSUMABLE_CHOICE_ +#define _COMMON_CONSUMABLE_CHOICE_ + +#include "common.h" + +static s32 N(ItemChoice_List)[ITEM_NUM_CONSUMABLES]; + +#ifndef _CHOICE_SUPPORT_ +#define _CHOICE_SUPPORT_ + +s32 N(ItemChoice_HasSelectedItem) = 0; +s32 N(ItemChoice_SelectedItemID) = 0; + +#include "world/common/todo/GetNpcCollisionHeight.inc.c" +#include "world/common/todo/AddPlayerHandsOffset.inc.c" + +API_CALLABLE(N(ItemChoice_WaitForSelection)) { + Bytecode* args = script->ptrReadPos; + + if (isInitialCall) { + N(ItemChoice_HasSelectedItem) = FALSE; + } + + if (N(ItemChoice_HasSelectedItem)) { + N(ItemChoice_HasSelectedItem) = FALSE; + evt_set_variable(script, *args, N(ItemChoice_SelectedItemID)); + return ApiStatus_DONE2; + } + + return ApiStatus_BLOCK; +} + +API_CALLABLE(N(ItemChoice_SaveSelected)) { + Bytecode* args = script->ptrReadPos; + + N(ItemChoice_SelectedItemID) = evt_get_variable(script, *args); + N(ItemChoice_HasSelectedItem) = TRUE; + return ApiStatus_DONE2; +} + +#endif + +API_CALLABLE(N(BuildItemChoiceList)) { + Bytecode* args = script->ptrReadPos; + s32* allowedItemList = (s32*)evt_get_variable(script, *args++); + s32 i; + + if (allowedItemList != NULL) { + for (i = 0; allowedItemList[i] != ITEM_NONE; i++) { + N(ItemChoice_List)[i] = allowedItemList[i]; + } + N(ItemChoice_List)[i] = ITEM_NONE; + } else { + for (i = 0; i < ITEM_NUM_CONSUMABLES; i++) { + N(ItemChoice_List)[i] = ITEM_FIRST_CONSUMABLE + i; + N(ItemChoice_List)[ITEM_NUM_CONSUMABLES] = ITEM_NONE; // oddity -- should be after the loop! + } + } + return ApiStatus_DONE2; +} + +EvtScript N(EVS_ItemChoicePopup) = { + EVT_SET(LVar9, LVar1) + EVT_CALL(ShowConsumableChoicePopup) + EVT_SET(LVarA, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_EQ(0) + EVT_CASE_EQ(-1) + EVT_CASE_DEFAULT + EVT_CALL(RemoveItemAt, LVar1) + EVT_CALL(GetPlayerPos, LVar3, LVar4, LVar5) + EVT_CALL(N(AddPlayerHandsOffset), LVar3, LVar4, LVar5) + EVT_CALL(MakeItemEntity, LVar0, LVar3, LVar4, LVar5, ITEM_SPAWN_MODE_DECORATION, 0) + EVT_CALL(SetPlayerAnimation, ANIM_Mario_60005) + EVT_WAIT(30) + EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_CALL(RemoveItemEntity, LVar0) + EVT_END_SWITCH + EVT_CALL(N(ItemChoice_SaveSelected), LVarA) + EVT_CALL(CloseChoicePopup) + EVT_UNBIND + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_ChooseItem) = { + EVT_CALL(N(BuildItemChoiceList), LVar0) + EVT_BIND_PADLOCK(EVT_PTR(N(EVS_ItemChoicePopup)), TRIGGER_FORCE_ACTIVATE, 0, EVT_PTR(N(ItemChoice_List)), 0, 1) + EVT_CALL(N(ItemChoice_WaitForSelection), LVar0) + EVT_RETURN + EVT_END +}; + +#define EVT_CHOOSE_ANY_CONSUMABLE() \ + EVT_SET(LVar0, 0) \ + EVT_SET(LVar1, 2) \ + EVT_EXEC_WAIT(N(EVS_ChooseItem)) + +#define EVT_CHOOSE_CONSUMABLE(itemList) \ + EVT_SET(LVar0, EVT_PTR(itemList)) \ + EVT_SET(LVar1, 2) \ + EVT_EXEC_WAIT(N(EVS_ChooseItem)) + +#endif diff --git a/src/world/common/enemy/BulletBillAI.inc.c b/src/world/common/enemy/ai/BulletBillAI.inc.c similarity index 100% rename from src/world/common/enemy/BulletBillAI.inc.c rename to src/world/common/enemy/ai/BulletBillAI.inc.c diff --git a/src/world/common/enemy/CleftAI.inc.c b/src/world/common/enemy/ai/CleftAI.inc.c similarity index 100% rename from src/world/common/enemy/CleftAI.inc.c rename to src/world/common/enemy/ai/CleftAI.inc.c diff --git a/src/world/common/enemy/ClubbaNappingAI.inc.c b/src/world/common/enemy/ai/ClubbaNappingAI.inc.c similarity index 99% rename from src/world/common/enemy/ClubbaNappingAI.inc.c rename to src/world/common/enemy/ai/ClubbaNappingAI.inc.c index f87ba94fdb..9574548c7f 100644 --- a/src/world/common/enemy/ClubbaNappingAI.inc.c +++ b/src/world/common/enemy/ai/ClubbaNappingAI.inc.c @@ -2,7 +2,7 @@ #include "world/partners.h" // prerequisites -#include "world/common/enemy/MeleeHitbox.inc.c" +#include "world/common/enemy/ai/MeleeHitbox.inc.c" enum AiStateNappingClubba { AI_STATE_NAPPING_CLUBBA_INIT = 0, diff --git a/src/world/common/enemy/ClubbaPatrolAI.inc.c b/src/world/common/enemy/ai/ClubbaPatrolAI.inc.c similarity index 97% rename from src/world/common/enemy/ClubbaPatrolAI.inc.c rename to src/world/common/enemy/ai/ClubbaPatrolAI.inc.c index 9e4d387843..b84ae7473c 100644 --- a/src/world/common/enemy/ClubbaPatrolAI.inc.c +++ b/src/world/common/enemy/ai/ClubbaPatrolAI.inc.c @@ -2,8 +2,8 @@ #include "world/partners.h" // prerequisites -#include "world/common/enemy/MeleeHitbox.inc.c" -#include "world/common/enemy/States_PatrolAI.inc.c" +#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) { Enemy* enemy = script->owner1.enemy; diff --git a/src/world/common/enemy/FireBarAI.inc.c b/src/world/common/enemy/ai/FireBarAI.inc.c similarity index 100% rename from src/world/common/enemy/FireBarAI.inc.c rename to src/world/common/enemy/ai/FireBarAI.inc.c diff --git a/src/world/common/enemy/FlyingAI.inc.c b/src/world/common/enemy/ai/FlyingAI.inc.c similarity index 100% rename from src/world/common/enemy/FlyingAI.inc.c rename to src/world/common/enemy/ai/FlyingAI.inc.c diff --git a/src/world/common/enemy/FlyingMagikoopaAI.inc.c b/src/world/common/enemy/ai/FlyingMagikoopaAI.inc.c similarity index 99% rename from src/world/common/enemy/FlyingMagikoopaAI.inc.c rename to src/world/common/enemy/ai/FlyingMagikoopaAI.inc.c index f295b443e3..2934a1aa71 100644 --- a/src/world/common/enemy/FlyingMagikoopaAI.inc.c +++ b/src/world/common/enemy/ai/FlyingMagikoopaAI.inc.c @@ -1,7 +1,7 @@ #include "common.h" #include "npc.h" -#include "world/common/enemy/MagikoopaSpellAI.inc.c" +#include "world/common/enemy/ai/MagikoopaSpellAI.inc.c" void N(FlyingMagikoopaAI_10)(Evt* script, MobileAISettings* arg1, EnemyDetectVolume* arg2) { Enemy* enemy = script->owner1.enemy; diff --git a/src/world/common/enemy/FlyingNoAttackAI.inc.c b/src/world/common/enemy/ai/FlyingNoAttackAI.inc.c similarity index 100% rename from src/world/common/enemy/FlyingNoAttackAI.inc.c rename to src/world/common/enemy/ai/FlyingNoAttackAI.inc.c diff --git a/src/world/common/enemy/GrooveGuyAI.inc.c b/src/world/common/enemy/ai/GrooveGuyAI.inc.c similarity index 100% rename from src/world/common/enemy/GrooveGuyAI.inc.c rename to src/world/common/enemy/ai/GrooveGuyAI.inc.c diff --git a/src/world/common/enemy/HoppingAI.inc.c b/src/world/common/enemy/ai/HoppingAI.inc.c similarity index 100% rename from src/world/common/enemy/HoppingAI.inc.c rename to src/world/common/enemy/ai/HoppingAI.inc.c diff --git a/src/world/common/enemy/KoopaPatrolAI.inc.c b/src/world/common/enemy/ai/KoopaPatrolAI.inc.c similarity index 96% rename from src/world/common/enemy/KoopaPatrolAI.inc.c rename to src/world/common/enemy/ai/KoopaPatrolAI.inc.c index 3a3ed3f129..c894ea072f 100644 --- a/src/world/common/enemy/KoopaPatrolAI.inc.c +++ b/src/world/common/enemy/ai/KoopaPatrolAI.inc.c @@ -2,9 +2,9 @@ #include "npc.h" #include "effects.h" -#include "world/common/enemy/PatrolNoAttackAI.inc.c" +#include "world/common/enemy/ai/PatrolNoAttackAI.inc.c" -#include "world/common/enemy/States_TackleAI.inc.c" +#include "world/common/enemy/ai/States_TackleAI.inc.c" ApiStatus N(KoopaPatrolAI_Main)(Evt* script, s32 isInitialCall) { Enemy* enemy = script->owner1.enemy; diff --git a/src/world/common/enemy/LakituAI.inc.c b/src/world/common/enemy/ai/LakituAI.inc.c similarity index 99% rename from src/world/common/enemy/LakituAI.inc.c rename to src/world/common/enemy/ai/LakituAI.inc.c index 625f3ef7ad..d2c30126c5 100644 --- a/src/world/common/enemy/LakituAI.inc.c +++ b/src/world/common/enemy/ai/LakituAI.inc.c @@ -13,7 +13,7 @@ #endif // prerequisites -#include "world/common/enemy/FlyingAI.inc.c" +#include "world/common/enemy/ai/FlyingAI.inc.c" s32 N(LakituAI_GetAvailableSpiny)(void) { s32 npcID; diff --git a/src/world/common/enemy/MagikoopaAI.inc.c b/src/world/common/enemy/ai/MagikoopaAI.inc.c similarity index 99% rename from src/world/common/enemy/MagikoopaAI.inc.c rename to src/world/common/enemy/ai/MagikoopaAI.inc.c index 3bf2f10273..5919516d31 100644 --- a/src/world/common/enemy/MagikoopaAI.inc.c +++ b/src/world/common/enemy/ai/MagikoopaAI.inc.c @@ -13,7 +13,7 @@ typedef struct MagikoopaTeleportAnim { extern MagikoopaTeleportAnim N(MagikoopaAI_TeleportAnim)[]; -#include "world/common/enemy/MagikoopaSpellAI.inc.c" +#include "world/common/enemy/ai/MagikoopaSpellAI.inc.c" void N(MagikoopaAI_00)(Evt* script, MobileAISettings* aiSettings, EnemyDetectVolume* territory) { Enemy* enemy = script->owner1.enemy; diff --git a/src/world/common/enemy/MagikoopaSpellAI.inc.c b/src/world/common/enemy/ai/MagikoopaSpellAI.inc.c similarity index 100% rename from src/world/common/enemy/MagikoopaSpellAI.inc.c rename to src/world/common/enemy/ai/MagikoopaSpellAI.inc.c diff --git a/src/world/common/enemy/MeleeHitbox.inc.c b/src/world/common/enemy/ai/MeleeHitbox.inc.c similarity index 100% rename from src/world/common/enemy/MeleeHitbox.inc.c rename to src/world/common/enemy/ai/MeleeHitbox.inc.c diff --git a/src/world/common/enemy/MontyMoleAI.inc.c b/src/world/common/enemy/ai/MontyMoleAI.inc.c similarity index 99% rename from src/world/common/enemy/MontyMoleAI.inc.c rename to src/world/common/enemy/ai/MontyMoleAI.inc.c index f07826080d..e4fb0c2d47 100644 --- a/src/world/common/enemy/MontyMoleAI.inc.c +++ b/src/world/common/enemy/ai/MontyMoleAI.inc.c @@ -3,7 +3,7 @@ #include "sprite/npc/MontyMole.h" // prerequisites -#include "world/common/enemy/ProjectileHitbox.inc.c" +#include "world/common/enemy/ai/ProjectileHitbox.inc.c" // ensure state handlers conform to expected signature static AIStateHandler N(MontyMoleAI_Init); diff --git a/src/world/common/enemy/ParatroopaAI.inc.c b/src/world/common/enemy/ai/ParatroopaAI.inc.c similarity index 99% rename from src/world/common/enemy/ParatroopaAI.inc.c rename to src/world/common/enemy/ai/ParatroopaAI.inc.c index 4041fd0a79..bc4767517c 100644 --- a/src/world/common/enemy/ParatroopaAI.inc.c +++ b/src/world/common/enemy/ai/ParatroopaAI.inc.c @@ -1,7 +1,7 @@ #include "common.h" // prerequisites -#include "world/common/enemy/FlyingAI.inc.c" +#include "world/common/enemy/ai/FlyingAI.inc.c" // ai-specific states enum AiStateParatroopa { diff --git a/src/world/common/enemy/PatrolNoAttackAI.inc.c b/src/world/common/enemy/ai/PatrolNoAttackAI.inc.c similarity index 98% rename from src/world/common/enemy/PatrolNoAttackAI.inc.c rename to src/world/common/enemy/ai/PatrolNoAttackAI.inc.c index 831356418e..8b6df4ebc2 100644 --- a/src/world/common/enemy/PatrolNoAttackAI.inc.c +++ b/src/world/common/enemy/ai/PatrolNoAttackAI.inc.c @@ -6,7 +6,7 @@ #endif // prerequisites -#include "world/common/enemy/States_PatrolAI.inc.c" +#include "world/common/enemy/ai/States_PatrolAI.inc.c" ApiStatus N(PatrolNoAttackAI_Main)(Evt* script, s32 isInitialCall) { #ifdef _DEAD_H_ diff --git a/src/world/common/enemy/PiranhaPlantAI.inc.c b/src/world/common/enemy/ai/PiranhaPlantAI.inc.c similarity index 90% rename from src/world/common/enemy/PiranhaPlantAI.inc.c rename to src/world/common/enemy/ai/PiranhaPlantAI.inc.c index 458b6bf685..abd06643d3 100644 --- a/src/world/common/enemy/PiranhaPlantAI.inc.c +++ b/src/world/common/enemy/ai/PiranhaPlantAI.inc.c @@ -1,5 +1,5 @@ // hitbox enemy -#include "world/common/enemy/WanderMeleeAI.inc.c" +#include "world/common/enemy/ai/WanderMeleeAI.inc.c" // visual enemy #include "world/common/enemy/wip/PiranhaPlantAI_00.inc.c" diff --git a/src/world/common/enemy/ProjectileHitbox.inc.c b/src/world/common/enemy/ai/ProjectileHitbox.inc.c similarity index 100% rename from src/world/common/enemy/ProjectileHitbox.inc.c rename to src/world/common/enemy/ai/ProjectileHitbox.inc.c diff --git a/src/world/common/enemy/RangedAttackAI.inc.c b/src/world/common/enemy/ai/RangedAttackAI.inc.c similarity index 98% rename from src/world/common/enemy/RangedAttackAI.inc.c rename to src/world/common/enemy/ai/RangedAttackAI.inc.c index 0907a7bef0..b39a76b3ef 100644 --- a/src/world/common/enemy/RangedAttackAI.inc.c +++ b/src/world/common/enemy/ai/RangedAttackAI.inc.c @@ -9,7 +9,7 @@ #include "effects.h" // prerequisites -#include "world/common/enemy/ProjectileHitbox.inc.c" +#include "world/common/enemy/ai/ProjectileHitbox.inc.c" ApiStatus N(RangedAttackAI_Main)(Evt* script, s32 isInitialCall) { EnemyDetectVolume territory; diff --git a/src/world/common/enemy/SentinelAI.inc.c b/src/world/common/enemy/ai/SentinelAI.inc.c similarity index 99% rename from src/world/common/enemy/SentinelAI.inc.c rename to src/world/common/enemy/ai/SentinelAI.inc.c index 654dce3b74..3d3fd42653 100644 --- a/src/world/common/enemy/SentinelAI.inc.c +++ b/src/world/common/enemy/ai/SentinelAI.inc.c @@ -14,7 +14,7 @@ #endif // prerequisites -#include "world/common/enemy/FlyingAI.inc.c" +#include "world/common/enemy/ai/FlyingAI.inc.c" enum AiStateSentinel { AI_STATE_SENTINEL_WANDER_INIT = 0, diff --git a/src/world/common/enemy/ShyGuyPatrolAI.inc.c b/src/world/common/enemy/ai/ShyGuyPatrolAI.inc.c similarity index 98% rename from src/world/common/enemy/ShyGuyPatrolAI.inc.c rename to src/world/common/enemy/ai/ShyGuyPatrolAI.inc.c index 114d0bea39..5a16be28d2 100644 --- a/src/world/common/enemy/ShyGuyPatrolAI.inc.c +++ b/src/world/common/enemy/ai/ShyGuyPatrolAI.inc.c @@ -1,7 +1,7 @@ #include "common.h" #include "npc.h" -#include "world/common/enemy/PatrolNoAttackAI.inc.c" +#include "world/common/enemy/ai/PatrolNoAttackAI.inc.c" void N(ShyGuyPatrolAI_14)(Evt* script, MobileAISettings* aiSettings, EnemyDetectVolume* territoryPtr) { Enemy* enemy = script->owner1.enemy; diff --git a/src/world/common/enemy/ShyGuyWanderAI.inc.c b/src/world/common/enemy/ai/ShyGuyWanderAI.inc.c similarity index 100% rename from src/world/common/enemy/ShyGuyWanderAI.inc.c rename to src/world/common/enemy/ai/ShyGuyWanderAI.inc.c diff --git a/src/world/common/enemy/SpearGuyAI.inc.c b/src/world/common/enemy/ai/SpearGuyAI.inc.c similarity index 99% rename from src/world/common/enemy/SpearGuyAI.inc.c rename to src/world/common/enemy/ai/SpearGuyAI.inc.c index 363003d62c..fa4f61c726 100644 --- a/src/world/common/enemy/SpearGuyAI.inc.c +++ b/src/world/common/enemy/ai/SpearGuyAI.inc.c @@ -78,7 +78,7 @@ void N(SpearGuyAI_Loiter)(Evt *script, MobileAISettings* aiSettings, EnemyDetect } // prerequisites -#include "world/common/enemy/WanderMeleeAI.inc.c" +#include "world/common/enemy/ai/WanderMeleeAI.inc.c" ApiStatus N(SpearGuyAI_Main)(Evt *script, s32 isInitialCall) { Enemy* enemy = script->owner1.enemy; diff --git a/src/world/common/enemy/SpinyAI.inc.c b/src/world/common/enemy/ai/SpinyAI.inc.c similarity index 99% rename from src/world/common/enemy/SpinyAI.inc.c rename to src/world/common/enemy/ai/SpinyAI.inc.c index 4d61e48eaf..80d32fd115 100644 --- a/src/world/common/enemy/SpinyAI.inc.c +++ b/src/world/common/enemy/ai/SpinyAI.inc.c @@ -6,7 +6,7 @@ #include "sprite/npc/Spiny.h" // prerequisites -#include "world/common/enemy/TackleAI.inc.c" +#include "world/common/enemy/ai/TackleAI.inc.c" ApiStatus N(SpinyAI_Main)(Evt* script, s32 isInitialCall) { #ifdef _DEAD_H_ diff --git a/src/world/common/enemy/States_PatrolAI.inc.c b/src/world/common/enemy/ai/States_PatrolAI.inc.c similarity index 100% rename from src/world/common/enemy/States_PatrolAI.inc.c rename to src/world/common/enemy/ai/States_PatrolAI.inc.c diff --git a/src/world/common/enemy/States_TackleAI.inc.c b/src/world/common/enemy/ai/States_TackleAI.inc.c similarity index 100% rename from src/world/common/enemy/States_TackleAI.inc.c rename to src/world/common/enemy/ai/States_TackleAI.inc.c diff --git a/src/world/common/enemy/StationaryAI.inc.c b/src/world/common/enemy/ai/StationaryAI.inc.c similarity index 100% rename from src/world/common/enemy/StationaryAI.inc.c rename to src/world/common/enemy/ai/StationaryAI.inc.c diff --git a/src/world/common/enemy/StoneChompAI.inc.c b/src/world/common/enemy/ai/StoneChompAI.inc.c similarity index 98% rename from src/world/common/enemy/StoneChompAI.inc.c rename to src/world/common/enemy/ai/StoneChompAI.inc.c index 535b5c3cda..a0c7e520af 100644 --- a/src/world/common/enemy/StoneChompAI.inc.c +++ b/src/world/common/enemy/ai/StoneChompAI.inc.c @@ -1,4 +1,4 @@ -#include "world/common/enemy/HoppingAI.inc.c" +#include "world/common/enemy/ai/HoppingAI.inc.c" void N(StoneChompAI_HopInit)(Evt* script, MobileAISettings* aiSettings, EnemyDetectVolume* territory) { Npc* npc = get_npc_unsafe(script->owner1.enemy->npcID); diff --git a/src/world/common/enemy/TackleAI.inc.c b/src/world/common/enemy/ai/TackleAI.inc.c similarity index 98% rename from src/world/common/enemy/TackleAI.inc.c rename to src/world/common/enemy/ai/TackleAI.inc.c index 4e23e4559e..d6b266091b 100644 --- a/src/world/common/enemy/TackleAI.inc.c +++ b/src/world/common/enemy/ai/TackleAI.inc.c @@ -7,7 +7,7 @@ #include "sprite/npc/BonyBeetle.h" // prerequisites -#include "world/common/enemy/States_TackleAI.inc.c" +#include "world/common/enemy/ai/States_TackleAI.inc.c" ApiStatus N(TackleAI_Main)(Evt* script, s32 isInitialCall) { #ifdef _DEAD_H_ diff --git a/src/world/common/enemy/UnkFloAI.inc.c b/src/world/common/enemy/ai/UnkFloAI.inc.c similarity index 100% rename from src/world/common/enemy/UnkFloAI.inc.c rename to src/world/common/enemy/ai/UnkFloAI.inc.c diff --git a/src/world/common/enemy/WanderMeleeAI.inc.c b/src/world/common/enemy/ai/WanderMeleeAI.inc.c similarity index 98% rename from src/world/common/enemy/WanderMeleeAI.inc.c rename to src/world/common/enemy/ai/WanderMeleeAI.inc.c index cc14dd0394..94464a2c56 100644 --- a/src/world/common/enemy/WanderMeleeAI.inc.c +++ b/src/world/common/enemy/ai/WanderMeleeAI.inc.c @@ -8,7 +8,7 @@ #include "npc.h" // prerequisites -#include "world/common/enemy/MeleeHitbox.inc.c" +#include "world/common/enemy/ai/MeleeHitbox.inc.c" ApiStatus N(WanderMeleeAI_Main)(Evt *script, s32 isInitialCall) { #ifdef _DEAD_H_ diff --git a/src/world/common/enemy/complete/Bobomb_Stationary.inc.c b/src/world/common/enemy/complete/Bobomb_Stationary.inc.c index e0ba2897f3..5d34d8d6b1 100644 --- a/src/world/common/enemy/complete/Bobomb_Stationary.inc.c +++ b/src/world/common/enemy/complete/Bobomb_Stationary.inc.c @@ -1,7 +1,7 @@ #include "common.h" #include "Bobomb.h" -#include "world/common/enemy/StationaryAI.inc.c" +#include "world/common/enemy/ai/StationaryAI.inc.c" StationaryAISettings N(AISettings_Bobomb_Stationary) = { .unk_00 = 110.0f, diff --git a/src/world/common/enemy/complete/Bzzap.inc.c b/src/world/common/enemy/complete/Bzzap.inc.c index 29de4d0792..d63fad6ee4 100644 --- a/src/world/common/enemy/complete/Bzzap.inc.c +++ b/src/world/common/enemy/complete/Bzzap.inc.c @@ -1,6 +1,6 @@ #include "Bzzap.h" -#include "world/common/enemy/FlyingAI.inc.c" +#include "world/common/enemy/ai/FlyingAI.inc.c" f32 N(FlyingAI_JumpVels)[] = { 4.5, 3.5, 2.6, 2.0, 1.5, 20.0, diff --git a/src/world/common/enemy/complete/Cleft.inc.c b/src/world/common/enemy/complete/Cleft.inc.c index 0a9ce45b7a..9a77fd3fbb 100644 --- a/src/world/common/enemy/complete/Cleft.inc.c +++ b/src/world/common/enemy/complete/Cleft.inc.c @@ -1,7 +1,7 @@ #include "Cleft.h" -#include "world/common/enemy/CleftAI.inc.c" +#include "world/common/enemy/ai/CleftAI.inc.c" MobileAISettings N(AISettings_Cleft) = { .moveSpeed = 1.0f, diff --git a/src/world/common/enemy/complete/ForestFuzzy.inc copy.c b/src/world/common/enemy/complete/ForestFuzzy.inc copy.c index fa150dc79b..8aab41d3ca 100644 --- a/src/world/common/enemy/complete/ForestFuzzy.inc copy.c +++ b/src/world/common/enemy/complete/ForestFuzzy.inc copy.c @@ -1,6 +1,6 @@ #include "ForestFuzzy.h" -#include "world/common/enemy/HoppingAI.inc.c" +#include "world/common/enemy/ai/HoppingAI.inc.c" MobileAISettings N(AISettings_ForestFuzzy) = { .moveSpeed = 1.0f, diff --git a/src/world/common/enemy/complete/ForestFuzzy.inc.c b/src/world/common/enemy/complete/ForestFuzzy.inc.c index fa150dc79b..8aab41d3ca 100644 --- a/src/world/common/enemy/complete/ForestFuzzy.inc.c +++ b/src/world/common/enemy/complete/ForestFuzzy.inc.c @@ -1,6 +1,6 @@ #include "ForestFuzzy.h" -#include "world/common/enemy/HoppingAI.inc.c" +#include "world/common/enemy/ai/HoppingAI.inc.c" MobileAISettings N(AISettings_ForestFuzzy) = { .moveSpeed = 1.0f, diff --git a/src/world/common/enemy/complete/HyperCleft.inc.c b/src/world/common/enemy/complete/HyperCleft.inc.c index cb1a04b694..4ca2031178 100644 --- a/src/world/common/enemy/complete/HyperCleft.inc.c +++ b/src/world/common/enemy/complete/HyperCleft.inc.c @@ -1,6 +1,6 @@ #include "HyperCleft.h" -#include "world/common/enemy/CleftAI.inc.c" +#include "world/common/enemy/ai/CleftAI.inc.c" MobileAISettings N(AISettings_HyperCleft) = { .moveSpeed = 1.0f, diff --git a/src/world/common/enemy/complete/HyperGoomba_Patrol.inc.c b/src/world/common/enemy/complete/HyperGoomba_Patrol.inc.c index d4b5e5a7f8..8497431f5e 100644 --- a/src/world/common/enemy/complete/HyperGoomba_Patrol.inc.c +++ b/src/world/common/enemy/complete/HyperGoomba_Patrol.inc.c @@ -2,7 +2,7 @@ #include "common.h" #include "HyperGoomba.h" -#include "world/common/enemy/PatrolNoAttackAI.inc.c" +#include "world/common/enemy/ai/PatrolNoAttackAI.inc.c" MobileAISettings N(AISettings_HyperGoomba_Patrol) = { .moveSpeed = 1.5f, diff --git a/src/world/common/enemy/complete/HyperParagoomba.inc.c b/src/world/common/enemy/complete/HyperParagoomba.inc.c index 59c1bb1a9f..7823af2709 100644 --- a/src/world/common/enemy/complete/HyperParagoomba.inc.c +++ b/src/world/common/enemy/complete/HyperParagoomba.inc.c @@ -4,7 +4,7 @@ f32 N(FlyingAI_JumpVels)[] = { 4.5, 3.5, 2.6, 2.0, 1.5, 20.0, }; -#include "world/common/enemy/FlyingAI.inc.c" +#include "world/common/enemy/ai/FlyingAI.inc.c" MobileAISettings N(AISettings_HyperParagoomba) = { .moveSpeed = 1.8f, diff --git a/src/world/common/enemy/complete/KoopaTroopa_Patrol.inc.c b/src/world/common/enemy/complete/KoopaTroopa_Patrol.inc.c index d6b5f73de7..4f6a734c4a 100644 --- a/src/world/common/enemy/complete/KoopaTroopa_Patrol.inc.c +++ b/src/world/common/enemy/complete/KoopaTroopa_Patrol.inc.c @@ -1,7 +1,7 @@ #include "common.h" #include "KoopaTroopa.h" -#include "world/common/enemy/KoopaPatrolAI.inc.c" +#include "world/common/enemy/ai/KoopaPatrolAI.inc.c" MobileAISettings N(AISettings_KoopaTroopa_Patrol) = { .moveSpeed = 1.5f, diff --git a/src/world/common/enemy/complete/KoopaTroopa_Wander.inc.c b/src/world/common/enemy/complete/KoopaTroopa_Wander.inc.c index c43c5486a4..94daa6aa8f 100644 --- a/src/world/common/enemy/complete/KoopaTroopa_Wander.inc.c +++ b/src/world/common/enemy/complete/KoopaTroopa_Wander.inc.c @@ -1,7 +1,7 @@ #include "common.h" #include "KoopaTroopa.h" -#include "world/common/enemy/TackleAI.inc.c" +#include "world/common/enemy/ai/TackleAI.inc.c" MobileAISettings N(AISettings_KoopaTroopa_Wander) = { .moveSpeed = 1.5f, diff --git a/src/world/common/enemy/complete/LavaBubble.inc.c b/src/world/common/enemy/complete/LavaBubble.inc.c index 4ff1d6448c..0dee27051b 100644 --- a/src/world/common/enemy/complete/LavaBubble.inc.c +++ b/src/world/common/enemy/complete/LavaBubble.inc.c @@ -4,9 +4,9 @@ f32 N(FlyingAI_JumpVels)[] = { 4.5, 3.5, 2.6, 2.0, 1.5, 20.0, }; -#include "world/common/enemy/FlyingAI.inc.c" +#include "world/common/enemy/ai/FlyingAI.inc.c" -#include "world/common/enemy/FlyingNoAttackAI.inc.c" +#include "world/common/enemy/ai/FlyingNoAttackAI.inc.c" MobileAISettings N(AISettings_LavaBubble) = { .moveSpeed = 0.8f, diff --git a/src/world/common/enemy/complete/MontyMole_StoneThrower.inc.c b/src/world/common/enemy/complete/MontyMole_StoneThrower.inc.c index 332e7ec5a9..08863652f1 100644 --- a/src/world/common/enemy/complete/MontyMole_StoneThrower.inc.c +++ b/src/world/common/enemy/complete/MontyMole_StoneThrower.inc.c @@ -1,10 +1,10 @@ #include "MontyMole.h" -#include "world/common/enemy/MontyMoleAI.inc.c" +#include "world/common/enemy/ai/MontyMoleAI.inc.c" -#include "world/common/enemy/RangedAttackAI.inc.c" +#include "world/common/enemy/ai/RangedAttackAI.inc.c" -#include "world/common/GetEncounterEnemyIsOwner.inc.c" +#include "world/common/todo/GetEncounterEnemyIsOwner.inc.c" EvtScript N(EVS_NpcDefeat_MontyMole_Stone) = { EVT_CALL(GetBattleOutcome, LVar0) diff --git a/src/world/common/enemy/complete/Paratroopa.inc.c b/src/world/common/enemy/complete/Paratroopa.inc.c index f0e26593d4..594a53fbf0 100644 --- a/src/world/common/enemy/complete/Paratroopa.inc.c +++ b/src/world/common/enemy/complete/Paratroopa.inc.c @@ -1,6 +1,6 @@ #include "Paratroopa.h" -#include "world/common/enemy/ParatroopaAI.inc.c" +#include "world/common/enemy/ai/ParatroopaAI.inc.c" f32 N(FlyingAI_JumpVels)[] = { 4.5, 3.5, 2.6, 2.0, 1.5, 20.0, diff --git a/src/world/common/enemy/complete/PiranhaPlant.inc.c b/src/world/common/enemy/complete/PiranhaPlant.inc.c index 30e2895e97..85edbb20e8 100644 --- a/src/world/common/enemy/complete/PiranhaPlant.inc.c +++ b/src/world/common/enemy/complete/PiranhaPlant.inc.c @@ -1,6 +1,6 @@ #include "PiranhaPlant.h" -#include "world/common/enemy/PiranhaPlantAI.inc.c" +#include "world/common/enemy/ai/PiranhaPlantAI.inc.c" EvtScript N(EVS_NpcDefeat_PiranhaPlant_Hitbox) = { EVT_CALL(GetBattleOutcome, LVar0) diff --git a/src/world/common/enemy/complete/Pokey.inc.c b/src/world/common/enemy/complete/Pokey.inc.c index ea343dffd4..c23aee3ff0 100644 --- a/src/world/common/enemy/complete/Pokey.inc.c +++ b/src/world/common/enemy/complete/Pokey.inc.c @@ -1,6 +1,6 @@ #include "Pokey.h" -#include "world/common/SetNpcB5_3.inc.c" +#include "world/common/todo/SetNpcB5_3.inc.c" MobileAISettings N(AISettings_Pokey) = { .moveSpeed = 1.8f, diff --git a/src/world/common/enemy/complete/PutridPiranha.inc.c b/src/world/common/enemy/complete/PutridPiranha.inc.c index 2a30a3b43c..419303cdf6 100644 --- a/src/world/common/enemy/complete/PutridPiranha.inc.c +++ b/src/world/common/enemy/complete/PutridPiranha.inc.c @@ -1,6 +1,6 @@ #include "PutridPiranha.h" -#include "world/common/enemy/PiranhaPlantAI.inc.c" +#include "world/common/enemy/ai/PiranhaPlantAI.inc.c" EvtScript N(EVS_NpcDefeat_PutridPiranha_Hitbox) = { EVT_CALL(GetBattleOutcome, LVar0) diff --git a/src/world/common/enemy/complete/SpikeTop.inc.c b/src/world/common/enemy/complete/SpikeTop.inc.c index 72df2e128f..757c20760c 100644 --- a/src/world/common/enemy/complete/SpikeTop.inc.c +++ b/src/world/common/enemy/complete/SpikeTop.inc.c @@ -1,8 +1,8 @@ #include "SpikeTop.h" -#include "world/common/enemy/TackleAI.inc.c" +#include "world/common/enemy/ai/TackleAI.inc.c" -#include "world/common/AwaitPlayerNearNpc.inc.c" +#include "world/common/todo/AwaitPlayerNearNpc.inc.c" MobileAISettings N(D_80243AA0_C647B0) = { .moveSpeed = 1.0f, diff --git a/src/world/common/atomic/Pipe.data.inc.c b/src/world/common/entity/Pipe.data.inc.c similarity index 98% rename from src/world/common/atomic/Pipe.data.inc.c rename to src/world/common/entity/Pipe.data.inc.c index 30613b1c3e..843700d129 100644 --- a/src/world/common/atomic/Pipe.data.inc.c +++ b/src/world/common/entity/Pipe.data.inc.c @@ -62,7 +62,7 @@ EvtScript N(EVS_Pipe_EnterHorizontal) = { EVT_CALL(DisablePlayerInput, TRUE) EVT_CALL(DisablePlayerPhysics, TRUE) EVT_CALL(HidePlayerShadow, TRUE) - EVT_CALL(ModifyColliderFlags, 0, LVarB, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, LVarB, COLLIDER_FLAGS_UPPER_MASK) EVT_CALL(GetEntryID, LVar0) EVT_CALL(N(Pipe_GetEntryPos)) EVT_SET(LVar5, LVar1) diff --git a/src/world/common/atomic/Pipe.inc.c b/src/world/common/entity/Pipe.inc.c similarity index 86% rename from src/world/common/atomic/Pipe.inc.c rename to src/world/common/entity/Pipe.inc.c index b4ac2ed385..91cf624529 100644 --- a/src/world/common/atomic/Pipe.inc.c +++ b/src/world/common/entity/Pipe.inc.c @@ -1,17 +1,17 @@ #include "common.h" #include "npc.h" -ApiStatus N(Pipe_SetAnimFlag)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(Pipe_SetAnimFlag)) { gPlayerStatusPtr->animFlags |= PA_FLAGS_100000; return ApiStatus_DONE2; } -ApiStatus N(Pipe_GetCurrentFloor)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(Pipe_GetCurrentFloor)) { script->varTable[0] = gCollisionStatus.currentFloor; return ApiStatus_DONE2; } -ApiStatus N(Pipe_AwaitDownInput)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(Pipe_AwaitDownInput)) { CollisionStatus* collisionStatus = &gCollisionStatus; s32 stickX, stickY; @@ -33,7 +33,7 @@ ApiStatus N(Pipe_AwaitDownInput)(Evt* script, s32 isInitialCall) { return ApiStatus_BLOCK; } -ApiStatus N(Pipe_GetEntryPos)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(Pipe_GetEntryPos)) { MapSettings* mapSettings = get_current_map_settings(); s32 index = evt_get_variable(script, LVar0); @@ -49,7 +49,7 @@ ApiStatus N(Pipe_GetEntryPos)(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -ApiStatus N(Pipe_GetCameraYaw)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(Pipe_GetCameraYaw)) { script->varTable[0] = clamp_angle(gCameras[gCurrentCameraID].currentYaw + 180.0f); return ApiStatus_DONE2; } diff --git a/src/world/common/atomic/Pipe.inc.h b/src/world/common/entity/Pipe.inc.h similarity index 100% rename from src/world/common/atomic/Pipe.inc.h rename to src/world/common/entity/Pipe.inc.h diff --git a/src/world/common/atomic/PipeData.inc.c b/src/world/common/entity/PipeData.inc.c similarity index 97% rename from src/world/common/atomic/PipeData.inc.c rename to src/world/common/entity/PipeData.inc.c index 82fcc32bfe..7c06cfad9b 100644 --- a/src/world/common/atomic/PipeData.inc.c +++ b/src/world/common/entity/PipeData.inc.c @@ -61,7 +61,7 @@ EvtScript N(Pipe_EnterHorizontal) = { EVT_CALL(DisablePlayerInput, TRUE) EVT_CALL(DisablePlayerPhysics, TRUE) EVT_CALL(HidePlayerShadow, TRUE) - EVT_CALL(ModifyColliderFlags, 0, LVarB, 0x7FFFFE00) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, LVarB, 0x7FFFFE00) EVT_CALL(GetEntryID, LVar0) EVT_CALL(N(Pipe_GetEntryPos)) EVT_SET(LVar5, LVar1) @@ -200,7 +200,7 @@ EvtScript N(Pipe_ExitHorizontal) = { EVT_SET_GROUP(EVT_GROUP_1B) EVT_CALL(N(Pipe_SetAnimFlag)) EVT_CALL(DisablePlayerPhysics, TRUE) - EVT_CALL(ModifyColliderFlags, 0, LVarB, 0x7FFFFE00) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, LVarB, 0x7FFFFE00) EVT_SET(LVar0, LVarA) EVT_CALL(N(Pipe_GetEntryPos)) EVT_SET(LVar5, LVar1) diff --git a/src/world/common/atomic/SuperBlock.data.inc.c b/src/world/common/entity/SuperBlock.data.inc.c similarity index 100% rename from src/world/common/atomic/SuperBlock.data.inc.c rename to src/world/common/entity/SuperBlock.data.inc.c diff --git a/src/world/common/atomic/SuperBlock.inc.c b/src/world/common/entity/SuperBlock.inc.c similarity index 90% rename from src/world/common/atomic/SuperBlock.inc.c rename to src/world/common/entity/SuperBlock.inc.c index 9880cc8bac..da9b83e7d0 100644 --- a/src/world/common/atomic/SuperBlock.inc.c +++ b/src/world/common/entity/SuperBlock.inc.c @@ -4,22 +4,22 @@ #include "SuperBlock.inc.h" #include "hud_element.h" -ApiStatus N(SuperBlock_SetOverride40)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(SuperBlock_SetOverride40)) { gOverrideFlags |= GLOBAL_OVERRIDES_40; return ApiStatus_DONE2; } -ApiStatus N(SuperBlock_ClearOverride40)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(SuperBlock_ClearOverride40)) { gOverrideFlags &= ~GLOBAL_OVERRIDES_40; return ApiStatus_DONE2; } -ApiStatus N(SuperBlock_HideBlockContent)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(SuperBlock_HideBlockContent)) { entity_upgrade_block_hide_content(evt_get_variable(script, *script->ptrReadPos)); return ApiStatus_DONE2; } -ApiStatus N(SuperBlock_GetPartnerRank)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(SuperBlock_GetPartnerRank)) { PlayerData* playerData = &gPlayerData; Bytecode* args = script->ptrReadPos; s32 partnerIdx = evt_get_variable(script, *args++); @@ -43,7 +43,7 @@ s32 N(SuperBlock_get_partner_rank)(s32 idx, s16 maxLevel) { return -1; } -ApiStatus N(SuperBlock_CountEligiblePartners)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(SuperBlock_CountEligiblePartners)) { PlayerData* playerData = &gPlayerData; s16 var = script->varTable[12] >= 0; s32 i; @@ -60,7 +60,7 @@ ApiStatus N(SuperBlock_CountEligiblePartners)(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -ApiStatus N(SuperBlock_ShowSelectPartnerMenu)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(SuperBlock_ShowSelectPartnerMenu)) { PlayerData* playerData = &gPlayerData; PopupMenu* popupMenu; s32 partnerID; @@ -132,17 +132,17 @@ ApiStatus N(SuperBlock_ShowSelectPartnerMenu)(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -ApiStatus N(SuperBlock_SwitchToPartner)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(SuperBlock_SwitchToPartner)) { switch_to_partner(evt_get_variable(script, *script->ptrReadPos)); return ApiStatus_DONE2; } -ApiStatus N(SuperBlock_LoadCurrentPartnerName)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(SuperBlock_LoadCurrentPartnerName)) { set_message_msg(gPartnerPopupProperties[gPlayerData.currentPartner][0], 0); return ApiStatus_DONE2; } -ApiStatus N(SuperBlock_StartGlowEffect)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(SuperBlock_StartGlowEffect)) { Bytecode* args = script->ptrReadPos; s32 entityIdx = evt_get_variable(script, *args++); Entity* entity = get_entity_by_index(entityIdx); @@ -153,21 +153,21 @@ ApiStatus N(SuperBlock_StartGlowEffect)(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -ApiStatus N(SuperBlock_EndGlowEffect)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(SuperBlock_EndGlowEffect)) { EffectInstance* effect = (EffectInstance*)evt_get_variable(script, *script->ptrReadPos); effect->flags |= EFFECT_INSTANCE_FLAGS_10; return ApiStatus_DONE2; } -ApiStatus N(SuperBlock_GatherEnergyFX)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(SuperBlock_GatherEnergyFX)) { Entity* entity = get_entity_by_index(evt_get_variable(script, *script->ptrReadPos)); fx_radial_shimmer(4, entity->position.x, entity->position.y + 12.5f, entity->position.z, 1.0f, 75); return ApiStatus_DONE2; } -ApiStatus N(SuperBlock_RadiateFaintEnergyFX)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(SuperBlock_RadiateFaintEnergyFX)) { Npc* npc = get_npc_safe(NPC_PARTNER); fx_radial_shimmer(9, npc->pos.x, npc->pos.y + 12.5f, npc->pos.z, 1.0f, 30); @@ -189,7 +189,7 @@ typedef struct EnergyOrbSet { s32 gatherStateTime; } EnergyOrbSet; -ApiStatus N(SuperBlock_AnimateEnergyOrbs)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(SuperBlock_AnimateEnergyOrbs)) { Bytecode* args = script->ptrReadPos; Npc* partner = get_npc_safe(NPC_PARTNER); EnergyOrbSet* userData; @@ -310,9 +310,9 @@ ApiStatus N(SuperBlock_AnimateEnergyOrbs)(Evt* script, s32 isInitialCall) { return ApiStatus_BLOCK; } -s32 N(SuperBlock_WhiteScreenFlash)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(SuperBlock_WhiteScreenFlash)) { Bytecode* args = script->ptrReadPos; - s32 ret = 0; + s32 ret = ApiStatus_BLOCK; if (isInitialCall) { script->varTable[0] = evt_get_variable(script, *args++); @@ -343,7 +343,7 @@ s32 N(SuperBlock_WhiteScreenFlash)(Evt* script, s32 isInitialCall) { case 2: if (script->functionTemp[1] == 0) { - ret = 1; + ret = ApiStatus_DONE1; } script->functionTemp[1] -= script->varTable[1]; if (script->functionTemp[1] < 0) { @@ -357,19 +357,19 @@ s32 N(SuperBlock_WhiteScreenFlash)(Evt* script, s32 isInitialCall) { return ret; } -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); return ApiStatus_DONE2; } -ApiStatus N(SuperBlock_WaitForPlayerToLand)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(SuperBlock_WaitForPlayerToLand)) { script->varTable[0] = FALSE; if ((gPartnerActionStatus.partnerActionState != PARTNER_ACTION_NONE) && (gPartnerActionStatus.actingPartner == PARTNER_BOMBETTE)) { script->varTable[0] = TRUE; diff --git a/src/world/common/atomic/SuperBlock.inc.h b/src/world/common/entity/SuperBlock.inc.h similarity index 100% rename from src/world/common/atomic/SuperBlock.inc.h rename to src/world/common/entity/SuperBlock.inc.h diff --git a/src/world/common/npc/Boo_Patrol.inc.c b/src/world/common/npc/Boo_Patrol.inc.c index 4b8a69ac6b..4b6aa50c39 100644 --- a/src/world/common/npc/Boo_Patrol.inc.c +++ b/src/world/common/npc/Boo_Patrol.inc.c @@ -1,7 +1,7 @@ #include "common.h" #include "Boo.h" -#include "world/common/enemy/PatrolNoAttackAI.inc.c" +#include "world/common/enemy/ai/PatrolNoAttackAI.inc.c" void N(BooPatrolAI_Move)(Evt* script, MobileAISettings* aiSettings, EnemyDetectVolume* territory) { Enemy* enemy = script->owner1.enemy; diff --git a/src/world/common/AddPlayerHandsOffset.inc.c b/src/world/common/todo/AddPlayerHandsOffset.inc.c similarity index 100% rename from src/world/common/AddPlayerHandsOffset.inc.c rename to src/world/common/todo/AddPlayerHandsOffset.inc.c diff --git a/src/world/common/AwaitPlayerNearNpc.inc.c b/src/world/common/todo/AwaitPlayerNearNpc.inc.c similarity index 100% rename from src/world/common/AwaitPlayerNearNpc.inc.c rename to src/world/common/todo/AwaitPlayerNearNpc.inc.c diff --git a/src/world/common/CheckPartnerFlags1000.inc.c b/src/world/common/todo/CheckPartnerFlags1000.inc.c similarity index 100% rename from src/world/common/CheckPartnerFlags1000.inc.c rename to src/world/common/todo/CheckPartnerFlags1000.inc.c diff --git a/src/world/common/DeadUnkFunc1.inc.c b/src/world/common/todo/DeadUnkFunc1.inc.c similarity index 100% rename from src/world/common/DeadUnkFunc1.inc.c rename to src/world/common/todo/DeadUnkFunc1.inc.c diff --git a/src/world/common/GetEncounterEnemyIsOwner.inc.c b/src/world/common/todo/GetEncounterEnemyIsOwner.inc.c similarity index 100% rename from src/world/common/GetEncounterEnemyIsOwner.inc.c rename to src/world/common/todo/GetEncounterEnemyIsOwner.inc.c diff --git a/src/world/common/GetEntityPosition.inc.c b/src/world/common/todo/GetEntityPosition.inc.c similarity index 100% rename from src/world/common/GetEntityPosition.inc.c rename to src/world/common/todo/GetEntityPosition.inc.c diff --git a/src/world/common/GetFloorCollider.inc.c b/src/world/common/todo/GetFloorCollider.inc.c similarity index 100% rename from src/world/common/GetFloorCollider.inc.c rename to src/world/common/todo/GetFloorCollider.inc.c diff --git a/src/world/common/GetItemEmptyCount.inc.c b/src/world/common/todo/GetItemEmptyCount.inc.c similarity index 100% rename from src/world/common/GetItemEmptyCount.inc.c rename to src/world/common/todo/GetItemEmptyCount.inc.c diff --git a/src/world/common/GetItemName.inc.c b/src/world/common/todo/GetItemName.inc.c similarity index 100% rename from src/world/common/GetItemName.inc.c rename to src/world/common/todo/GetItemName.inc.c diff --git a/src/world/common/GetLeftRightPoints.inc.c b/src/world/common/todo/GetLeftRightPoints.inc.c similarity index 100% rename from src/world/common/GetLeftRightPoints.inc.c rename to src/world/common/todo/GetLeftRightPoints.inc.c diff --git a/src/world/common/GetNpcCollisionHeight.inc.c b/src/world/common/todo/GetNpcCollisionHeight.inc.c similarity index 100% rename from src/world/common/GetNpcCollisionHeight.inc.c rename to src/world/common/todo/GetNpcCollisionHeight.inc.c diff --git a/src/world/common/GetPeachDisguise.inc.c b/src/world/common/todo/GetPeachDisguise.inc.c similarity index 100% rename from src/world/common/GetPeachDisguise.inc.c rename to src/world/common/todo/GetPeachDisguise.inc.c diff --git a/src/world/common/GetPlayerCoins.inc.c b/src/world/common/todo/GetPlayerCoins.inc.c similarity index 100% rename from src/world/common/GetPlayerCoins.inc.c rename to src/world/common/todo/GetPlayerCoins.inc.c diff --git a/src/world/common/HeartPlant_SpawnHeart.inc.c b/src/world/common/todo/HeartPlant_SpawnHeart.inc.c similarity index 100% rename from src/world/common/HeartPlant_SpawnHeart.inc.c rename to src/world/common/todo/HeartPlant_SpawnHeart.inc.c diff --git a/src/world/common/IsBerserkerEquipped.inc.c b/src/world/common/todo/IsBerserkerEquipped.inc.c similarity index 100% rename from src/world/common/IsBerserkerEquipped.inc.c rename to src/world/common/todo/IsBerserkerEquipped.inc.c diff --git a/src/world/common/IsHammerMaxCharged.inc.c b/src/world/common/todo/IsHammerMaxCharged.inc.c similarity index 100% rename from src/world/common/IsHammerMaxCharged.inc.c rename to src/world/common/todo/IsHammerMaxCharged.inc.c diff --git a/src/world/common/IsItemBadge.inc.c b/src/world/common/todo/IsItemBadge.inc.c similarity index 100% rename from src/world/common/IsItemBadge.inc.c rename to src/world/common/todo/IsItemBadge.inc.c diff --git a/src/world/common/IsJumpMaxCharged.inc.c b/src/world/common/todo/IsJumpMaxCharged.inc.c similarity index 100% rename from src/world/common/IsJumpMaxCharged.inc.c rename to src/world/common/todo/IsJumpMaxCharged.inc.c diff --git a/src/world/common/IsRightOnEquipped.inc.c b/src/world/common/todo/IsRightOnEquipped.inc.c similarity index 100% rename from src/world/common/IsRightOnEquipped.inc.c rename to src/world/common/todo/IsRightOnEquipped.inc.c diff --git a/src/world/common/LetterDelivery.inc.c b/src/world/common/todo/LetterDelivery.inc.c similarity index 100% rename from src/world/common/LetterDelivery.inc.c rename to src/world/common/todo/LetterDelivery.inc.c diff --git a/src/world/common/LoadPartyImage.inc.c b/src/world/common/todo/LoadPartyImage.inc.c similarity index 100% rename from src/world/common/LoadPartyImage.inc.c rename to src/world/common/todo/LoadPartyImage.inc.c diff --git a/src/world/common/PullVine.inc.c b/src/world/common/todo/PullVine.inc.c similarity index 100% rename from src/world/common/PullVine.inc.c rename to src/world/common/todo/PullVine.inc.c diff --git a/src/world/common/RemovePadlock.inc.c b/src/world/common/todo/RemovePadlock.inc.c similarity index 100% rename from src/world/common/RemovePadlock.inc.c rename to src/world/common/todo/RemovePadlock.inc.c diff --git a/src/world/common/Set80151310_0.inc.c b/src/world/common/todo/Set80151310_0.inc.c similarity index 100% rename from src/world/common/Set80151310_0.inc.c rename to src/world/common/todo/Set80151310_0.inc.c diff --git a/src/world/common/SetCamera0Flag1000.inc.c b/src/world/common/todo/SetCamera0Flag1000.inc.c similarity index 100% rename from src/world/common/SetCamera0Flag1000.inc.c rename to src/world/common/todo/SetCamera0Flag1000.inc.c diff --git a/src/world/common/SetCamera0MoveFlag1.inc.c b/src/world/common/todo/SetCamera0MoveFlag1.inc.c similarity index 100% rename from src/world/common/SetCamera0MoveFlag1.inc.c rename to src/world/common/todo/SetCamera0MoveFlag1.inc.c diff --git a/src/world/common/SetEntityPosition.inc.c b/src/world/common/todo/SetEntityPosition.inc.c similarity index 100% rename from src/world/common/SetEntityPosition.inc.c rename to src/world/common/todo/SetEntityPosition.inc.c diff --git a/src/world/common/SetEntityPositionF.inc.c b/src/world/common/todo/SetEntityPositionF.inc.c similarity index 100% rename from src/world/common/SetEntityPositionF.inc.c rename to src/world/common/todo/SetEntityPositionF.inc.c diff --git a/src/world/common/SetForeverForestFog.inc.c b/src/world/common/todo/SetForeverForestFog.inc.c similarity index 100% rename from src/world/common/SetForeverForestFog.inc.c rename to src/world/common/todo/SetForeverForestFog.inc.c diff --git a/src/world/common/SetGameStatusUnk84_1.inc.c b/src/world/common/todo/SetGameStatusUnk84_1.inc.c similarity index 100% rename from src/world/common/SetGameStatusUnk84_1.inc.c rename to src/world/common/todo/SetGameStatusUnk84_1.inc.c diff --git a/src/world/common/SetNpcB5_3.inc.c b/src/world/common/todo/SetNpcB5_3.inc.c similarity index 100% rename from src/world/common/SetNpcB5_3.inc.c rename to src/world/common/todo/SetNpcB5_3.inc.c diff --git a/src/world/common/SetPlayerSpriteSet2.inc.c b/src/world/common/todo/SetPlayerSpriteSet2.inc.c similarity index 100% rename from src/world/common/SetPlayerSpriteSet2.inc.c rename to src/world/common/todo/SetPlayerSpriteSet2.inc.c diff --git a/src/world/common/SomeItemEntityFunc.inc.c b/src/world/common/todo/SomeItemEntityFunc.inc.c similarity index 100% rename from src/world/common/SomeItemEntityFunc.inc.c rename to src/world/common/todo/SomeItemEntityFunc.inc.c diff --git a/src/world/common/SpawnSunEffect.inc.c b/src/world/common/todo/SpawnSunEffect.inc.c similarity index 100% rename from src/world/common/SpawnSunEffect.inc.c rename to src/world/common/todo/SpawnSunEffect.inc.c diff --git a/src/world/common/SpinyTromp_CheckDist.inc.c b/src/world/common/todo/SpinyTromp_CheckDist.inc.c similarity index 100% rename from src/world/common/SpinyTromp_CheckDist.inc.c rename to src/world/common/todo/SpinyTromp_CheckDist.inc.c diff --git a/src/world/common/StarSpiritEffectFunc.inc.c b/src/world/common/todo/StarSpiritEffectFunc.inc.c similarity index 100% rename from src/world/common/StarSpiritEffectFunc.inc.c rename to src/world/common/todo/StarSpiritEffectFunc.inc.c diff --git a/src/world/common/StashVars.inc.c b/src/world/common/todo/StashVars.inc.c similarity index 100% rename from src/world/common/StashVars.inc.c rename to src/world/common/todo/StashVars.inc.c diff --git a/src/world/common/SwitchToPartner.inc.c b/src/world/common/todo/SwitchToPartner.inc.c similarity index 100% rename from src/world/common/SwitchToPartner.inc.c rename to src/world/common/todo/SwitchToPartner.inc.c diff --git a/src/world/common/SyncStatusMenu.inc.c b/src/world/common/todo/SyncStatusMenu.inc.c similarity index 100% rename from src/world/common/SyncStatusMenu.inc.c rename to src/world/common/todo/SyncStatusMenu.inc.c diff --git a/src/world/common/UnkAngleFunc004.inc.c b/src/world/common/todo/UnkAngleFunc004.inc.c similarity index 100% rename from src/world/common/UnkAngleFunc004.inc.c rename to src/world/common/todo/UnkAngleFunc004.inc.c diff --git a/src/world/common/UnkAngleFunc005.inc.c b/src/world/common/todo/UnkAngleFunc005.inc.c similarity index 100% rename from src/world/common/UnkAngleFunc005.inc.c rename to src/world/common/todo/UnkAngleFunc005.inc.c diff --git a/src/world/common/UnkDistFunc2.inc.c b/src/world/common/todo/UnkDistFunc2.inc.c similarity index 100% rename from src/world/common/UnkDistFunc2.inc.c rename to src/world/common/todo/UnkDistFunc2.inc.c diff --git a/src/world/common/UnkFloatFunc001.inc.c b/src/world/common/todo/UnkFloatFunc001.inc.c similarity index 100% rename from src/world/common/UnkFloatFunc001.inc.c rename to src/world/common/todo/UnkFloatFunc001.inc.c diff --git a/src/world/common/UnkFloatFuncAbs.inc.c b/src/world/common/todo/UnkFloatFuncAbs.inc.c similarity index 100% rename from src/world/common/UnkFloatFuncAbs.inc.c rename to src/world/common/todo/UnkFloatFuncAbs.inc.c diff --git a/src/world/common/UnkFoldFunc.inc.c b/src/world/common/todo/UnkFoldFunc.inc.c similarity index 100% rename from src/world/common/UnkFoldFunc.inc.c rename to src/world/common/todo/UnkFoldFunc.inc.c diff --git a/src/world/common/UnkFunc001.inc.c b/src/world/common/todo/UnkFunc001.inc.c similarity index 100% rename from src/world/common/UnkFunc001.inc.c rename to src/world/common/todo/UnkFunc001.inc.c diff --git a/src/world/common/UnkFunc1.inc.c b/src/world/common/todo/UnkFunc1.inc.c similarity index 100% rename from src/world/common/UnkFunc1.inc.c rename to src/world/common/todo/UnkFunc1.inc.c diff --git a/src/world/common/UnkFunc11.inc.c b/src/world/common/todo/UnkFunc11.inc.c similarity index 100% rename from src/world/common/UnkFunc11.inc.c rename to src/world/common/todo/UnkFunc11.inc.c diff --git a/src/world/common/UnkFunc12.inc.c b/src/world/common/todo/UnkFunc12.inc.c similarity index 100% rename from src/world/common/UnkFunc12.inc.c rename to src/world/common/todo/UnkFunc12.inc.c diff --git a/src/world/common/UnkFunc42.inc.c b/src/world/common/todo/UnkFunc42.inc.c similarity index 100% rename from src/world/common/UnkFunc42.inc.c rename to src/world/common/todo/UnkFunc42.inc.c diff --git a/src/world/common/UnkFunc43.inc.c b/src/world/common/todo/UnkFunc43.inc.c similarity index 100% rename from src/world/common/UnkFunc43.inc.c rename to src/world/common/todo/UnkFunc43.inc.c diff --git a/src/world/common/UnkFunc44.inc.c b/src/world/common/todo/UnkFunc44.inc.c similarity index 100% rename from src/world/common/UnkFunc44.inc.c rename to src/world/common/todo/UnkFunc44.inc.c diff --git a/src/world/common/UnkFunc46.inc.c b/src/world/common/todo/UnkFunc46.inc.c similarity index 100% rename from src/world/common/UnkFunc46.inc.c rename to src/world/common/todo/UnkFunc46.inc.c diff --git a/src/world/common/UnkFunc48.inc.c b/src/world/common/todo/UnkFunc48.inc.c similarity index 100% rename from src/world/common/UnkFunc48.inc.c rename to src/world/common/todo/UnkFunc48.inc.c diff --git a/src/world/common/UnkFunc49.inc.c b/src/world/common/todo/UnkFunc49.inc.c similarity index 100% rename from src/world/common/UnkFunc49.inc.c rename to src/world/common/todo/UnkFunc49.inc.c diff --git a/src/world/common/UnkFunc50.inc.c b/src/world/common/todo/UnkFunc50.inc.c similarity index 100% rename from src/world/common/UnkFunc50.inc.c rename to src/world/common/todo/UnkFunc50.inc.c diff --git a/src/world/common/UnkFunc51.inc.c b/src/world/common/todo/UnkFunc51.inc.c similarity index 100% rename from src/world/common/UnkFunc51.inc.c rename to src/world/common/todo/UnkFunc51.inc.c diff --git a/src/world/common/UnkFunc52.inc.c b/src/world/common/todo/UnkFunc52.inc.c similarity index 100% rename from src/world/common/UnkFunc52.inc.c rename to src/world/common/todo/UnkFunc52.inc.c diff --git a/src/world/common/UnkFunc56.inc.c b/src/world/common/todo/UnkFunc56.inc.c similarity index 100% rename from src/world/common/UnkFunc56.inc.c rename to src/world/common/todo/UnkFunc56.inc.c diff --git a/src/world/common/UnkFunc62.inc.c b/src/world/common/todo/UnkFunc62.inc.c similarity index 100% rename from src/world/common/UnkFunc62.inc.c rename to src/world/common/todo/UnkFunc62.inc.c diff --git a/src/world/common/UnkGooberFunc.inc.c b/src/world/common/todo/UnkGooberFunc.inc.c similarity index 100% rename from src/world/common/UnkGooberFunc.inc.c rename to src/world/common/todo/UnkGooberFunc.inc.c diff --git a/src/world/common/UnkGooberFunc50.inc.c b/src/world/common/todo/UnkGooberFunc50.inc.c similarity index 100% rename from src/world/common/UnkGooberFunc50.inc.c rename to src/world/common/todo/UnkGooberFunc50.inc.c diff --git a/src/world/common/UnkMachiFunc.inc.c b/src/world/common/todo/UnkMachiFunc.inc.c similarity index 100% rename from src/world/common/UnkMachiFunc.inc.c rename to src/world/common/todo/UnkMachiFunc.inc.c diff --git a/src/world/common/UnkMoveFunc1.inc.c b/src/world/common/todo/UnkMoveFunc1.inc.c similarity index 100% rename from src/world/common/UnkMoveFunc1.inc.c rename to src/world/common/todo/UnkMoveFunc1.inc.c diff --git a/src/world/common/UnkMoveFunc2.inc.c b/src/world/common/todo/UnkMoveFunc2.inc.c similarity index 100% rename from src/world/common/UnkMoveFunc2.inc.c rename to src/world/common/todo/UnkMoveFunc2.inc.c diff --git a/src/world/common/UnkMoveFunc3.inc.c b/src/world/common/todo/UnkMoveFunc3.inc.c similarity index 100% rename from src/world/common/UnkMoveFunc3.inc.c rename to src/world/common/todo/UnkMoveFunc3.inc.c diff --git a/src/world/common/UnkNpcPosFunc.inc.c b/src/world/common/todo/UnkNpcPosFunc.inc.c similarity index 100% rename from src/world/common/UnkNpcPosFunc.inc.c rename to src/world/common/todo/UnkNpcPosFunc.inc.c diff --git a/src/world/common/UnkPartnerPosFuncs.inc.c b/src/world/common/todo/UnkPartnerPosFuncs.inc.c similarity index 100% rename from src/world/common/UnkPartnerPosFuncs.inc.c rename to src/world/common/todo/UnkPartnerPosFuncs.inc.c diff --git a/src/world/common/UnkPosFunc2.inc.c b/src/world/common/todo/UnkPosFunc2.inc.c similarity index 100% rename from src/world/common/UnkPosFunc2.inc.c rename to src/world/common/todo/UnkPosFunc2.inc.c diff --git a/src/world/common/UnkPositionFunc.inc.c b/src/world/common/todo/UnkPositionFunc.inc.c similarity index 100% rename from src/world/common/UnkPositionFunc.inc.c rename to src/world/common/todo/UnkPositionFunc.inc.c diff --git a/src/world/common/UnkShadowFunc001.inc.c b/src/world/common/todo/UnkShadowFunc001.inc.c similarity index 100% rename from src/world/common/UnkShadowFunc001.inc.c rename to src/world/common/todo/UnkShadowFunc001.inc.c diff --git a/src/world/common/UnkVtxFunc.inc.c b/src/world/common/todo/UnkVtxFunc.inc.c similarity index 100% rename from src/world/common/UnkVtxFunc.inc.c rename to src/world/common/todo/UnkVtxFunc.inc.c diff --git a/src/world/common/UnsetCamera0Flag1000.inc.c b/src/world/common/todo/UnsetCamera0Flag1000.inc.c similarity index 100% rename from src/world/common/UnsetCamera0Flag1000.inc.c rename to src/world/common/todo/UnsetCamera0Flag1000.inc.c diff --git a/src/world/common/UnsetCamera0MoveFlag1.inc.c b/src/world/common/todo/UnsetCamera0MoveFlag1.inc.c similarity index 100% rename from src/world/common/UnsetCamera0MoveFlag1.inc.c rename to src/world/common/todo/UnsetCamera0MoveFlag1.inc.c diff --git a/src/world/common/WaitForPlayerToLand.inc.c b/src/world/common/todo/WaitForPlayerToLand.inc.c similarity index 100% rename from src/world/common/WaitForPlayerToLand.inc.c rename to src/world/common/todo/WaitForPlayerToLand.inc.c diff --git a/src/world/common/clouds.inc.c b/src/world/common/todo/clouds.inc.c similarity index 100% rename from src/world/common/clouds.inc.c rename to src/world/common/todo/clouds.inc.c diff --git a/src/world/world.c b/src/world/world.c index 7e2079852c..b04a0fe80c 100644 --- a/src/world/world.c +++ b/src/world/world.c @@ -362,7 +362,7 @@ MapConfig dro_maps[] = { MapConfig sbk_maps[] = { { MAP(sbk_00), .bgName = "sbk_bg" }, { MAP(sbk_01), .bgName = "sbk_bg" }, - { MAP_UNSPLIT(sbk_02, 0x80240C80), .bgName = "sbk_bg" }, + { MAP(sbk_02), .bgName = "sbk_bg" }, { MAP(sbk_03), .bgName = "sbk_bg" }, { MAP(sbk_04), .bgName = "sbk_bg" }, { MAP(sbk_05), .bgName = "sbk_bg" }, @@ -381,7 +381,7 @@ MapConfig sbk_maps[] = { { MAP(sbk_24), .bgName = "sbk_bg" }, { MAP(sbk_25), .bgName = "sbk_bg" }, { MAP(sbk_26), .bgName = "sbk_bg" }, - { MAP_UNSPLIT(sbk_30, 0x80241870), .bgName = "sbk_bg" }, + { MAP(sbk_30), .bgName = "sbk_bg" }, { MAP(sbk_31), .bgName = "sbk_bg" }, { MAP(sbk_32), .bgName = "sbk_bg" }, { MAP(sbk_33), .bgName = "sbk_bg" }, @@ -595,19 +595,20 @@ MapConfig jan_maps[] = { }; /// Forever Forest +#include "area_mim/mim.h" MapConfig mim_maps[] = { - { MAP_UNSPLIT(mim_01, 0x80241EF0), .bgName = "obk_bg", .unk_1C = { .bytes = { .songVariation = 1, .flags = 2 } } }, - { MAP_UNSPLIT(mim_02, 0x80241220), .bgName = "obk_bg", .unk_1C = { .bytes = { .songVariation = 1, .flags = 2 } } }, - { MAP_UNSPLIT(mim_03, 0x80240570), .bgName = "obk_bg", .unk_1C = { .bytes = { .songVariation = 1, .flags = 2 } } }, - { MAP_UNSPLIT(mim_04, 0x80241170), .bgName = "obk_bg", .unk_1C = { .bytes = { .songVariation = 1, .flags = 2 } } }, - { MAP_UNSPLIT(mim_05, 0x80241A60), .bgName = "obk_bg", .unk_1C = { .bytes = { .songVariation = 1, .flags = 2 } } }, - { MAP_UNSPLIT(mim_06, 0x80242D70), .bgName = "obk_bg", .unk_1C = { .bytes = { .songVariation = 1, .flags = 2 } } }, - { MAP_UNSPLIT(mim_07, 0x802410D0), .bgName = "obk_bg", .unk_1C = { .bytes = { .songVariation = 1, .flags = 2 } } }, - { MAP_UNSPLIT(mim_08, 0x80242F80), .bgName = "obk_bg", .unk_1C = { .bytes = { .songVariation = 1, .flags = 2 } } }, - { MAP_UNSPLIT(mim_09, 0x80240F00), .bgName = "obk_bg", .unk_1C = { .bytes = { .songVariation = 1, .flags = 2 } } }, - { MAP_UNSPLIT(mim_10, 0x802401B0), .bgName = "nok_bg" }, - { MAP_UNSPLIT(mim_11, 0x80240C20), .bgName = "obk_bg", .unk_1C = { .bytes = { .songVariation = 1, .flags = 2 } } }, - { MAP_UNSPLIT(mim_12, 0x80240600), .bgName = "arn_bg", .unk_1C = { .bytes = { .songVariation = 1, .flags = 2 } } }, + { MAP(mim_01), .bgName = "obk_bg", .unk_1C = { .bytes = { .songVariation = 1, .flags = 2 } } }, + { MAP(mim_02), .bgName = "obk_bg", .unk_1C = { .bytes = { .songVariation = 1, .flags = 2 } } }, + { MAP(mim_03), .bgName = "obk_bg", .unk_1C = { .bytes = { .songVariation = 1, .flags = 2 } } }, + { MAP(mim_04), .bgName = "obk_bg", .unk_1C = { .bytes = { .songVariation = 1, .flags = 2 } } }, + { MAP(mim_05), .bgName = "obk_bg", .unk_1C = { .bytes = { .songVariation = 1, .flags = 2 } } }, + { MAP(mim_06), .bgName = "obk_bg", .unk_1C = { .bytes = { .songVariation = 1, .flags = 2 } } }, + { MAP(mim_07), .bgName = "obk_bg", .unk_1C = { .bytes = { .songVariation = 1, .flags = 2 } } }, + { MAP(mim_08), .bgName = "obk_bg", .unk_1C = { .bytes = { .songVariation = 1, .flags = 2 } } }, + { MAP(mim_09), .bgName = "obk_bg", .unk_1C = { .bytes = { .songVariation = 1, .flags = 2 } } }, + { MAP(mim_10), .bgName = "nok_bg" }, + { MAP(mim_11), .bgName = "obk_bg", .unk_1C = { .bytes = { .songVariation = 1, .flags = 2 } } }, + { MAP(mim_12), .bgName = "arn_bg", .unk_1C = { .bytes = { .songVariation = 1, .flags = 2 } } }, }; /// Boo's Mansion diff --git a/ver/us/asm/data/world/area_sbk/sbk_02/92AEB0.data.s b/ver/us/asm/data/world/area_sbk/sbk_02/92AEB0.data.s deleted file mode 100644 index abb6f22e10..0000000000 --- a/ver/us/asm/data/world/area_sbk/sbk_02/92AEB0.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240C00_92AEB0 -.word 0xC3ED8000, 0x00000000, 0x00000000, 0x42B40000, 0x43ED8000, 0x00000000, 0x00000000, 0x43870000, 0x00000000, 0x00000000, 0xC3ED8000, 0x43340000, 0x00000000, 0x00000000, 0x43ED8000, 0x00000000, 0x00000000, 0x42A00000, 0xC3430000, 0x43340000, 0x41A00000, 0x00000000, 0x42DC0000, 0x43870000, 0xC2A00000, 0x00000000, 0x42A00000, 0x43340000, 0x42A00000, 0x00000000, 0x42A00000, 0x42B40000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80240FCC, D_80240C00_92AEB0, 0x00000008, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, func_80200000, sbk_02_get_tattle, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x0000001D, 0x00000001, 0x00000006, 0x0000001D, 0x00000001, 0x00000007, 0x0000001C, 0x00000000, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000017, 0x00000000, 0x00000008, 0x00000020, 0x00000000, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_sbk/sbk_02/92AFF0.data.s b/ver/us/asm/data/world/area_sbk/sbk_02/92AFF0.data.s deleted file mode 100644 index c5c54c9b58..0000000000 --- a/ver/us/asm/data/world/area_sbk/sbk_02/92AFF0.data.s +++ /dev/null @@ -1,21 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240D40_92AFF0 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x802455D0, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240D9C_92B04C -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000001, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x802455D8, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240DF8_92B0A8 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000003, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x802455E0, 0x00000002, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240E54_92B104 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000004, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x802455E8, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240EB0_92B160 -.word 0x00000047, 0x00000005, D_80240D40_92AFF0, 0x00080000, 0x00000003, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80240D9C_92B04C, 0x00080000, 0x00000007, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80240DF8_92B0A8, 0x00080000, 0x00000005, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80240E54_92B104, 0x00080000, 0x00000009, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240F30_92B1E0 -.word 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000005, 0x00000044, 0x00000001, D_80240EB0_92B160, 0x0000001D, 0x00000001, 0x00000006, 0x0000001D, 0x00000001, 0x00000007, 0x00000044, 0x00000001, D_80240EB0_92B160, 0x00000020, 0x00000000, 0x0000001C, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_80240EB0_92B160, 0x00000044, 0x00000001, EnterWalk, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0329, 0x0000000A, 0x00000043, 0x00000002, SetSpriteShading, 0xFFFFFFFF, 0x0000000A, 0x00000002, 0xF5DE0180, 0xFFFFFFC1, 0x00000043, 0x00000002, DisablePulseStone, 0x00000000, 0x00000013, 0x00000000, 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, 0x80245558, 0x00000046, 0x00000001, 0x80245580, 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFFC2, 0x00000043, 0x0000000F, PlayEffect, 0x00000082, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C8F, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF5DE0180, 0xFFFFFFCA, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000078, 0x00000001, 0x00000008, 0x00000012, 0x00000000, 0x00000044, 0x00000001, 0x80240CC0, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x0000001D, 0x00000001, 0x00000006, 0x0000001D, 0x00000001, 0x00000007, 0x00000020, 0x00000000, 0x0000001C, 0x00000000, 0x00000046, 0x00000001, 0x80243A00, 0x00000023, 0x00000000, 0x00000044, 0x00000001, D_80240F30_92B1E0, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000005, 0x00000008, 0x00000001, 0x00000041, 0x0000001D, 0x00000001, 0x00000006, 0x0000001D, 0x00000001, 0x00000007, 0x00000044, 0x00000001, 0x80243B38, 0x00000008, 0x00000001, 0x00000003, 0x00000020, 0x00000000, 0x0000001C, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_sbk/sbk_02/92B500.data.s b/ver/us/asm/data/world/area_sbk/sbk_02/92B500.data.s deleted file mode 100644 index 9549117c76..0000000000 --- a/ver/us/asm/data/world/area_sbk/sbk_02/92B500.data.s +++ /dev/null @@ -1,66 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80241250_92B500 -.word 0x00000012, 0x00000000 - -dlabel D_80241258_92B508 -.word 0x00000043, 0x0000000F, PlayEffect, 0x0000001D, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000014, 0x0000000A, 0x00000000, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000015, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x0000000D, 0x0000005F, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0xFFFFFFCE, 0x00000032, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateModel, 0x00000082, 0xFE363C82, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000082, 0x00000000, 0xFE363C80, 0x00000000, 0x00000028, 0x00000002, 0xFE363C82, 0x0000000A, 0x0000002C, 0x00000002, 0xFE363C83, 0xF24A7B4D, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x0000000D, 0x7FFFFE00, 0x00000043, 0x00000003, EnableModel, 0x00000082, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x8000005F, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241418_92B6C8 -.word 0x00000072, 0x0000007D, 0x0000FFFF - -dlabel D_80241424_92B6D4 -.word 0x0000007E, 0x00000080, 0x0000FFFF - -dlabel D_80241430_92B6E0 -.word 0x00000043, 0x00000004, sbk_02_UnkFunc27, 0x00000002, 0x00000000, 0x00000003, 0x00000043, 0x00000004, sbk_02_UnkFunc27, 0x00000001, 0xFFFFFFFF, 0x00000003, 0x00000043, 0x00000004, sbk_02_UnkFunc27, 0x00000001, D_80241418_92B6C8, 0x00000000, 0x00000043, 0x00000004, sbk_02_UnkFunc27, 0x00000000, D_80241424_92B6D4, 0x00000000, 0x00000043, 0x00000008, func_80240364_92A614, 0x000000FF, 0x000000FF, 0x000000FF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000008, func_80240364_92A614, 0x0000002C, 0x00000020, 0x000000B1, 0x00000000, 0x00000000, 0x00000000, 0x0000003C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802414FC_92B7AC -.word 0x00000043, 0x00000003, SetRenderMode, 0x00000080, 0x00000016, 0x00000043, 0x00000003, EnableTexPanning, 0x00000080, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x00002710, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, SetTexPanOffset, 0x00000003, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, SetTexPanOffset, 0x00000003, 0x00000001, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00001770, 0x00000027, 0x00000002, 0xFE363C81, 0x00001388, 0x00000027, 0x00000002, 0xFE363C82, 0x00000FA0, 0x0000000D, 0x00000002, 0xFE363C80, 0x00020000, 0x00000028, 0x00000002, 0xFE363C80, 0x00020000, 0x00000013, 0x00000000, 0x0000000D, 0x00000002, 0xFE363C81, 0x00020000, 0x00000028, 0x00000002, 0xFE363C81, 0x00020000, 0x00000013, 0x00000000, 0x0000000D, 0x00000002, 0xFE363C82, 0x00020000, 0x00000028, 0x00000002, 0xFE363C82, 0x00020000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241678_92B928 -.word 0x00000043, 0x00000003, EnableModel, 0x00000080, 0x00000001, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFF9C, 0x00000005, 0x00000001, 0x00000064, 0x00000024, 0x00000002, 0xFE363C83, 0xFE363C82, 0x0000002F, 0x00000002, 0xFE363C83, 0x00000050, 0x00000043, 0x00000005, ScaleModel, 0x00000080, 0xFE363C83, 0xF24A7E80, 0xFE363C83, 0x00000043, 0x00000005, TranslateModel, 0x00000080, 0x00000000, 0xFE363C80, 0x00000000, 0x00000027, 0x00000002, 0xFE363C80, 0x00000001, 0x00000027, 0x00000002, 0xFE363C82, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, ScaleModel, 0x00000080, 0xFE363C83, 0xF24A7E80, 0xFE363C83, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241790_92BA40 -.word 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, EnableModel, 0x00002710, 0x00000001, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFF9C, 0x00000005, 0x00000001, 0x00000064, 0x00000024, 0x00000002, 0xFE363C83, 0xFE363C82, 0x0000002F, 0x00000002, 0xFE363C83, 0x0000006E, 0x00000043, 0x00000005, ScaleModel, 0x00002710, 0xFE363C83, 0xF24A7E80, 0xFE363C83, 0x00000043, 0x00000005, TranslateModel, 0x00002710, 0x00000000, 0xFE363C80, 0x00000000, 0x00000027, 0x00000002, 0xFE363C80, 0x00000001, 0x00000027, 0x00000002, 0xFE363C82, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, ScaleModel, 0x00002710, 0xFE363C83, 0xF24A7E80, 0xFE363C83, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802418B4_92BB64 -.word 0x00000043, 0x00000003, EnableModel, 0x00000080, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x00000064, 0x00000026, 0x00000002, 0xFE363C83, 0xF24A7F80, 0x00000005, 0x00000001, 0x00000014, 0x00000043, 0x00000005, ScaleModel, 0x00000080, 0xFE363C83, 0xF24A7E80, 0xFE363C83, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000005, 0x00000001, 0x00000046, 0x00000024, 0x00000002, 0xFE363C83, 0xFE363C82, 0x0000002F, 0x00000002, 0xFE363C83, 0x00000050, 0x00000043, 0x00000005, ScaleModel, 0x00000080, 0xFE363C83, 0xFE363C83, 0xFE363C83, 0x00000043, 0x00000005, TranslateModel, 0x00000080, 0x00000000, 0xFE363C80, 0x00000000, 0x00000028, 0x00000002, 0xFE363C80, 0x00000002, 0x00000027, 0x00000002, 0xFE363C82, 0x00000005, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000080, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802419F0_92BCA0 -.word 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, EnableModel, 0x00002710, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x00000064, 0x00000026, 0x00000002, 0xFE363C83, 0xF24A7E23, 0x00000005, 0x00000001, 0x00000014, 0x00000043, 0x00000005, ScaleModel, 0x00002710, 0xFE363C83, 0xF24A7E80, 0xFE363C83, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000005, 0x00000001, 0x00000046, 0x00000024, 0x00000002, 0xFE363C83, 0xFE363C82, 0x0000002F, 0x00000002, 0xFE363C83, 0x0000006E, 0x00000043, 0x00000005, ScaleModel, 0x00002710, 0xFE363C83, 0xFE363C83, 0xFE363C83, 0x00000043, 0x00000005, TranslateModel, 0x00002710, 0x00000000, 0xFE363C80, 0x00000000, 0x00000028, 0x00000002, 0xFE363C80, 0x00000002, 0x00000027, 0x00000002, 0xFE363C82, 0x00000005, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00002710, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241B38_92BDE8 -.word 0x00000058, 0x00000000, 0x00000043, 0x00000003, EnableTexPanning, 0x0000007E, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, SetTexPanOffset, 0x00000001, 0x00000000, 0xFE363C80, 0x00000000, 0x00000027, 0x00000002, 0xFE363C80, 0x000009C4, 0x0000000D, 0x00000002, 0xFE363C80, 0x00008000, 0x00000028, 0x00000002, 0xFE363C80, 0x00008000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000059, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x0000007E, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFF38, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x000000C8, 0x00000043, 0x00000005, TranslateModel, 0x0000007E, 0x00000000, 0xFE363C80, 0x00000000, 0x00000027, 0x00000002, 0xFE363C80, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241C90_92BF40 -.word 0x00000058, 0x00000000, 0x00000043, 0x00000003, EnableTexPanning, 0x0000007E, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, SetTexPanOffset, 0x00000001, 0x00000000, 0xFE363C80, 0x00000000, 0x00000027, 0x00000002, 0xFE363C80, 0x000009C4, 0x0000000D, 0x00000002, 0xFE363C80, 0x00008000, 0x00000028, 0x00000002, 0xFE363C80, 0x00008000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000059, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x0000007E, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000007E, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000005, 0x00000001, 0x00000064, 0x00000043, 0x00000005, TranslateModel, 0x0000007E, 0x00000000, 0xFE363C80, 0x00000000, 0x00000028, 0x00000002, 0xFE363C80, 0x00000002, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241DE0_92C090 -.word 0x00000043, 0x00000002, MakeTransformGroup, 0x00000072, 0x00000043, 0x00000003, EnableGroup, 0x00000072, 0x00000001, 0x00000056, 0x00000000, 0x00000043, 0x00000003, EnableTexPanning, 0x00000071, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000005, 0x00000001, 0x00000258, 0x00000043, 0x00000005, SetTexPanOffset, 0x00000002, 0x00000000, 0x00000000, 0xFE363C80, 0x00000043, 0x00000005, SetTexPanOffset, 0x00000002, 0x00000001, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x000000C8, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFF38, 0x00000027, 0x00000002, 0xFE363C82, 0x000002BC, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000071, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000005, 0x00000001, 0x0000001E, 0x00000043, 0x00000003, RandInt, 0x00000122, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFFFF92, 0x00000043, 0x0000000F, PlayEffect, 0x0000001D, 0x00000000, 0xFE363C80, 0x00000000, 0xFFFFFFDD, 0x00000014, 0x0000000A, 0x00000000, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000015, 0x00000002, 0xFE363C80, 0x00000000, 0xFFFFFFDD, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000005, 0x00000001, 0x0000000F, 0x00000043, 0x00000003, RandInt, 0x000000B4, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C80, 0x000000AA, 0x00000043, 0x0000000F, PlayEffect, 0x0000001D, 0x00000000, 0xFE363C80, 0x00000000, 0xFFFFFED4, 0x00000014, 0x0000000A, 0x00000000, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000015, 0x00000002, 0xFE363C80, 0x00000000, 0xFFFFFED4, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000005, 0x00000001, 0x00000005, 0x00000043, 0x0000000F, PlayEffect, 0x0000001D, 0x00000000, 0xFFFFFF4C, 0x00000000, 0x00000104, 0x00000014, 0x0000000A, 0x00000000, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000015, 0x00000002, 0xFFFFFF4C, 0x00000000, 0x00000104, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000028, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000006E, 0x00000005, 0x00000001, 0x00000004, 0x00000043, 0x0000000F, PlayEffect, 0x0000001D, 0x00000000, 0x000000B4, 0x00000000, 0x00000104, 0x00000014, 0x0000000A, 0x00000000, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000015, 0x00000002, 0x000000B4, 0x00000000, 0x00000104, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000032, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x8000005E, 0x00000043, 0x00000005, MakeLerp, 0xFFFFFECA, 0x00000000, 0x00000136, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateGroup, 0x00000072, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802422F0_92C5A0 -.word 0x00000043, 0x00000002, MakeTransformGroup, 0x00000072, 0x00000043, 0x00000003, EnableGroup, 0x00000072, 0x00000001, 0x00000056, 0x00000000, 0x00000043, 0x00000003, EnableTexPanning, 0x00000071, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x0000EA60, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFF15A0, 0x00000024, 0x00000002, 0xFE363C82, 0x00033450, 0x00000005, 0x00000001, 0x0000012C, 0x00000043, 0x00000005, SetTexPanOffset, 0x00000002, 0x00000000, 0x00000000, 0xFE363C80, 0x00000043, 0x00000005, SetTexPanOffset, 0x00000002, 0x00000001, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x000000C8, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFF38, 0x00000027, 0x00000002, 0xFE363C82, 0x000002BC, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000071, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000005, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, RandInt, 0x00000122, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFFFF92, 0x00000043, 0x0000000F, PlayEffect, 0x0000001D, 0x00000000, 0xFE363C80, 0x00000000, 0xFFFFFFDD, 0x00000014, 0x0000000A, 0x00000000, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000015, 0x00000002, 0xFE363C80, 0x00000000, 0xFFFFFFDD, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000005, 0x00000001, 0x00000005, 0x00000043, 0x00000003, RandInt, 0x000000B4, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C80, 0x000000AA, 0x00000043, 0x0000000F, PlayEffect, 0x0000001D, 0x00000000, 0xFE363C80, 0x00000000, 0xFFFFFED4, 0x00000014, 0x0000000A, 0x00000000, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000015, 0x00000002, 0xFE363C80, 0x00000000, 0xFFFFFED4, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000005, 0x00000001, 0x00000003, 0x00000043, 0x0000000F, PlayEffect, 0x0000001D, 0x00000000, 0xFFFFFF4C, 0x00000000, 0x00000104, 0x00000014, 0x0000000A, 0x00000000, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000015, 0x00000002, 0xFFFFFF4C, 0x00000000, 0x00000104, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000028, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000005, 0x00000001, 0x00000002, 0x00000043, 0x0000000F, PlayEffect, 0x0000001D, 0x00000000, 0x000000B4, 0x00000000, 0x00000104, 0x00000014, 0x0000000A, 0x00000000, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000015, 0x00000002, 0x000000B4, 0x00000000, 0x00000104, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000032, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0xFFFFFFEC, 0x00000000, 0x00000014, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateGroup, 0x00000072, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x0000000A, 0xF24A7E80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802427F4_92CAA4 -.word 0x00000043, 0x00000006, RotateGroup, 0x0000003D, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, RotateGroup, 0x0000004E, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000028, 0x00000002, 0xFE363C82, 0xFE363C80, 0x00000043, 0x00000006, RotateGroup, 0x0000001B, 0xFE363C82, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, RotateGroup, 0x0000002C, 0xFE363C82, 0x00000000, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802428A4_92CB54 -.word 0x00000043, 0x00000005, MakeLerp, 0x000000B4, 0x00000000, 0x0000003C, 0x00000004, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000046, 0x00000001, D_802427F4_92CAA4, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242928_92CBD8 -.word 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x0000003C, 0x000000B4, 0x00000001, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateModel, 0x00000021, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000022, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000024, 0xFFFFFFEC, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000025, 0xFFFFFFEC, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000024, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000025, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000024, 0x00000014, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000025, 0x00000014, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000032, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000033, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000035, 0xFFFFFFEC, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000036, 0xFFFFFFEC, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000035, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000036, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000035, 0x00000014, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000036, 0x00000014, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000028, 0x00000002, 0xFE363C82, 0xFE363C80, 0x00000043, 0x00000006, RotateModel, 0x00000043, 0xFE363C82, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000044, 0xFE363C82, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000046, 0x00000014, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000047, 0x00000014, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000046, 0xFE363C82, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000047, 0xFE363C82, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000046, 0xFFFFFFEC, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000047, 0xFFFFFFEC, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000054, 0xFE363C82, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000055, 0xFE363C82, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000057, 0x00000014, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000058, 0x00000014, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000057, 0xFE363C82, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000058, 0xFE363C82, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000057, 0xFFFFFFEC, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000058, 0xFFFFFFEC, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x0000003C, 0x000000B4, 0x00000004, 0x00000003, 0x00000001, 0x00000014, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateModel, 0x00000024, 0xFFFFFFEC, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000025, 0xFFFFFFEC, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000024, 0x0000003C, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000025, 0x0000003C, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000024, 0x00000014, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000025, 0x00000014, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000024, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000025, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000035, 0xFFFFFFEC, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000036, 0xFFFFFFEC, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000035, 0x0000003C, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000036, 0x0000003C, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000035, 0x00000014, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000036, 0x00000014, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000035, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000036, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000028, 0x00000002, 0xFE363C82, 0xFE363C80, 0x00000043, 0x00000005, TranslateModel, 0x00000046, 0x00000014, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000047, 0x00000014, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000046, 0xFFFFFFC4, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000047, 0xFFFFFFC4, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000046, 0xFFFFFFEC, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000047, 0xFFFFFFEC, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000046, 0xFE363C82, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000047, 0xFE363C82, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000057, 0x00000014, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000058, 0x00000014, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000057, 0xFFFFFFC4, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000058, 0xFFFFFFC4, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000057, 0xFFFFFFEC, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000058, 0xFFFFFFEC, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000057, 0xFE363C82, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000058, 0xFE363C82, 0x00000000, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000014, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802431C0_92D470 -.word 0x00000043, 0x00000003, EnableGroup, 0x0000007D, 0x00000001, 0x00000043, 0x00000005, MakeLerp, 0xFFFFFECA, 0x00000000, 0x00000136, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateGroup, 0x0000007D, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80243268_92D518 -.word 0x00000043, 0x00000003, EnableGroup, 0x0000007D, 0x00000001, 0x00000043, 0x00000005, MakeLerp, 0xFFFFFFEC, 0x00000000, 0x00000014, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateGroup, 0x0000007D, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80243310_92D5C0 -.word 0x00000043, 0x00000006, PlaySoundAt, 0x0000005E, 0x00000000, 0x00000000, 0x00000027, 0xFFFFFFB0, 0x00000056, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x00000005, 0xF24A7B4D, 0x00000057, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0xFFFFFF4C, 0x000000B4, 0x00000004, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateModel, 0x00000078, 0xFE363C80, 0x00000001, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000079, 0xFE363C80, 0x00000001, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x0000007A, 0xFE363C80, 0x00000001, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x0000007B, 0xFE363C80, 0x00000001, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x0000001D, 0x00000000, 0x0000003D, 0x00000002, 0xFFFFFFAD, 0x00000014, 0x0000000A, 0x00000000, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000015, 0x00000002, 0x0000003D, 0x00000002, 0xFFFFFFAD, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x0000000F, PlayEffect, 0x0000001D, 0x00000000, 0xFFFFFFC3, 0x00000002, 0xFFFFFFAD, 0x00000014, 0x0000000A, 0x00000000, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000015, 0x00000002, 0xFFFFFFC3, 0x00000002, 0xFFFFFFAD, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x00000005, 0xF24A7E80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024358C_92D83C -.word 0x00000043, 0x00000002, DisablePulseStone, 0x00000001, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x0000000E, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000043, 0x00000002, DisablePulseStone, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, func_802CF56C, 0x00000001, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000024, 0x00000002, 0xF5DE0180, 0xFFFFFFC2, 0x00000043, 0x00000001, func_80240338_92A5E8, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000083, 0x00000001, 0x00000008, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x000000D2, 0x00000000, 0x00000089, 0x00000043, 0x00000004, SetCamPosA, 0x00000000, 0xF24CD280, 0xF2524A80, 0x00000043, 0x00000004, SetCamPosB, 0x00000000, 0xF2437280, 0xF242AA80, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24AB680, 0xF24A5E80, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF2524A80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A7B4D, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x0000000A, 0x00000024, 0x00000002, 0xFE363C80, 0x000000B4, 0x00000046, 0x00000001, D_802427F4_92CAA4, 0x00000056, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x00000078, 0xF24A7B4D, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x0000012C, 0xF24A7C80, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x0000012C, 0xF24A7B4D, 0x00000057, 0x00000000, 0x00000044, 0x00000001, D_80241258_92B508, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000C, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFFB0, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000050, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000013, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, SetPlayerSpeed, 0xF24A8680, 0x00000043, 0x00000004, PlayerMoveTo, 0xFE363C80, 0x00000050, 0x00000000, 0x00000043, 0x00000004, func_802D2884, 0x00000000, 0x00000000, 0x00000000, 0x00000057, 0x00000000, 0x00000044, 0x00000001, D_80241430_92B6E0, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000003, CloneModel, 0x00000080, 0x00002710, 0x00000044, 0x00000001, D_802414FC_92B7AC, 0x00000044, 0x00000001, D_80241678_92B928, 0x00000044, 0x00000001, D_80241790_92BA40, 0x00000008, 0x00000001, 0x00000064, 0x00000044, 0x00000001, D_80241B38_92BDE8, 0x00000008, 0x00000001, 0x00000096, 0x00000044, 0x00000001, D_80241DE0_92C090, 0x00000044, 0x00000001, D_802431C0_92D470, 0x00000008, 0x00000001, 0x00000064, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24A9A80, 0xF24A5680, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A7B4D, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x00000050, 0x00000044, 0x00000001, D_802428A4_92CB54, 0x00000008, 0x00000001, 0x0000003C, 0x00000008, 0x00000001, 0x00000032, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000043, 0x00000003, GotoMap, 0x802455F0, 0x00000004, 0x00000012, 0x00000000, 0x00000043, 0x00000003, GotoMap, 0x802455F0, 0x00000005, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0xFFFFFFC1, 0x00000043, 0x00000003, EnableGroup, 0x00000016, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000016, 0x7FFFFE00, 0x00000018, 0x00000001, 0xFFFFFFC2, 0x00000043, 0x00000003, EnableGroup, 0x00000016, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000016, 0x7FFFFE00, 0x0000004E, 0x00000006, D_8024358C_92D83C, 0x00000100, 0x0000000D, D_80241250_92B500, 0x00000000, 0x00000001, 0x0000001C, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000082, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x0000000F, 0x7FFFFE00, 0x00000023, 0x00000000, 0x00000043, 0x00000003, EnableGroup, 0x00000072, 0x00000000, 0x00000043, 0x00000003, EnableGroup, 0x0000007D, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x0000007E, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000080, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000005C, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, func_802CF56C, 0x00000001, 0x00000043, 0x00000004, func_802D2884, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x0000000D, 0x7FFFFE00, 0x00000043, 0x00000003, EnableModel, 0x00000082, 0x00000000, 0x00000043, 0x00000003, EnableGroup, 0x00000016, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x00000190, 0xF24A7B4D, 0x00000057, 0x00000000, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x000000D2, 0x00000000, 0x00000089, 0x00000043, 0x00000004, SetCamPosA, 0x00000000, 0xF24CD280, 0xF2524A80, 0x00000043, 0x00000004, SetCamPosB, 0x00000000, 0xF2437280, 0xF242AA80, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24A9A80, 0xF24A5680, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF2524A80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000004, sbk_02_UnkFunc27, 0x00000002, 0x00000000, 0x00000003, 0x00000043, 0x00000004, sbk_02_UnkFunc27, 0x00000001, 0xFFFFFFFF, 0x00000003, 0x00000043, 0x00000004, sbk_02_UnkFunc27, 0x00000001, D_80241418_92B6C8, 0x00000000, 0x00000043, 0x00000004, sbk_02_UnkFunc27, 0x00000000, D_80241424_92B6D4, 0x00000000, 0x00000043, 0x00000008, func_80240364_92A614, 0x0000002C, 0x00000020, 0x000000B1, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000044, 0x00000001, D_802422F0_92C5A0, 0x00000044, 0x00000001, D_80243268_92D518, 0x00000043, 0x00000003, CloneModel, 0x00000080, 0x00002710, 0x00000044, 0x00000001, D_802414FC_92B7AC, 0x00000044, 0x00000001, D_802418B4_92BB64, 0x00000044, 0x00000001, D_802419F0_92BCA0, 0x00000008, 0x00000001, 0x00000014, 0x00000044, 0x00000001, D_80241C90_92BF40, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24A8A80, 0xF24A6080, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF256D280, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A7B4D, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000044, 0x00000001, D_80242928_92CBD8, 0x00000008, 0x00000001, 0x00000064, 0x00000046, 0x00000001, D_80243310_92D5C0, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0x00000016, 0x7FFFFE00, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000008, 0x00000001, 0x0000003C, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000002, func_802CF56C, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_sbk/sbk_02/92E220.data.s b/ver/us/asm/data/world/area_sbk/sbk_02/92E220.data.s deleted file mode 100644 index abdf6d2938..0000000000 --- a/ver/us/asm/data/world/area_sbk/sbk_02/92E220.data.s +++ /dev/null @@ -1,48 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80243F70_92E220 -.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_80243FF4_92E2A4 -.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_8024404C_92E2FC -.word 0x00000000 - -dlabel D_80244050_92E300 -.word 0x00000000 - -dlabel D_80244054_92E304 -.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, sbk_02_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_80240970_92AC20, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80244188_92E438 -.word 0x00000043, 0x00000002, func_802409A8_92AC58, 0xFE363C80, 0x0000004E, 0x00000006, D_80244054_92E304, 0x00000010, 0x00000000, sbk_02_D_80245630, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_8024091C_92ABCC, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel sbk_02_varStash -.word 0x00000000 - -dlabel D_802441DC_92E48C -.word 0x00000043, 0x00000004, ShowGotItem, 0xFE363C80, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000004, ShowGotItem, 0xFE363C80, 0x00000001, 0x00000010, 0x00000002, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024423C_92E4EC -.word 0x00000005, 0x00000001, 0x00000000, 0x00000005, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000005, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80244330_92E5E0 -.word 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000002, func_802CF56C, 0x00000002, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C83, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C83, 0xFFFFFFCE, 0x00000024, 0x00000002, 0xFE363C84, 0xFE363C81, 0x00000027, 0x00000002, 0xFE363C84, 0x0000001A, 0x00000043, 0x00000005, SetNpcPos, 0x00000001, 0xFE363C83, 0xFE363C84, 0xFE363C82, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x00000000, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x00000258, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24AC280, 0xF24A5680, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000001, WaitForPlayerInputEnabled, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF24F2A80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8080, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x00130002, 0x00130001, 0x00000200, 0x000D00EB, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF24F2A80, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0x00000012, 0xFFFFFFF7, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8A80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x00000168, 0x0000000A, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, SetNpcRotation, 0x00000001, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000003, EnableNpcAI, 0x00000001, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00130003, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, SetPlayerAnimation, 0x0001001F, 0x00000043, 0x00000003, PlaySoundAtPlayer, 0x00000139, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C83, 0xFE363C81, 0x00000027, 0x00000002, 0xFE363C81, 0x00000032, 0x00000027, 0x00000002, 0xFE363C82, 0x0000000A, 0x00000027, 0x00000002, 0xFE363C83, 0x0000001E, 0x00000005, 0x00000001, 0x00000005, 0x00000043, 0x0000000F, PlayEffect, 0x00000011, 0x00000003, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x0000000F, PlayEffect, 0x00000011, 0x00000001, 0xFE363C80, 0xFE363C83, 0xFE363C82, 0x00000014, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000006, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, PlaySoundAtPlayer, 0x00000188, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000014, 0x00000043, 0x0000000F, PlayEffect, 0x00000052, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x0000001E, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00130001, 0x00000043, 0x00000003, EnableNpcAI, 0x00000001, 0x00000001, 0x00000043, 0x00000001, PostChapter2StatUpdate, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D0192, 0x000000A0, 0x00000028, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, GetNpcPos, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF24E6280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x00130002, 0x00130001, 0x00000200, 0x000D00EC, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, GetNpcPos, 0x00000001, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000027, 0x00000002, 0xFE363C80, 0xFE363C83, 0x0000002A, 0x00000002, 0xFE363C80, 0x00000002, 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, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x00130002, 0x00130001, 0x00000200, 0x000D00ED, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000001, 0x00040000, 0x00000001, 0x00000056, 0x00000000, 0x00000005, 0x00000001, 0x00000019, 0x00000043, 0x00000005, GetNpcPos, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000011, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000004, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x00000708, 0x00000043, 0x00000005, MakeLerp, 0xFE363C82, 0xFE363C83, 0x00000064, 0x00000002, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, SetNpcRotation, 0x00000001, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000001, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C85, 0x000000B4, 0x00000043, 0x00000005, MakeLerp, 0xFE363C83, 0xFE363C85, 0x00000064, 0x00000002, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, SetNpcPos, 0x00000001, 0xFE363C82, 0xFE363C80, 0xFE363C84, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000001, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000001, 0x00002045, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, SetPlayerAnimation, 0x0001002A, 0x00000008, 0x00000001, 0x0000005A, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000024, 0x00000002, 0xF5DE0180, 0xFFFFFFCB, 0x00000044, 0x00000001, 0x80240CC0, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80244D38_92EFE8 -.word 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000005, 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, D_8024423C_92E4EC, 0x00000044, 0x00000001, D_80244330_92E5E0, 0x00000012, 0x00000000, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80244DA8_92F058 -.word 0x00000024, 0x00000002, 0xFE363C80, 0x00000005, 0x00000043, 0x00000001, sbk_02_CheckTradeEventTime, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00830404, 0x00830401, 0x00000000, 0x000D00EE, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFFFFFFFF, 0x000002CD, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x00000001, 0x00000001, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000024, 0x00000002, 0xF840627C, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, GetItemCount, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00830404, 0x00830401, 0x00000000, 0x000D00EF, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00830404, 0x00830401, 0x00000000, 0x000D00F0, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000002, 0x00000046, 0x00000001, D_80244188_92E438, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00830404, 0x00830401, 0x00000000, 0x000D00F4, 0x00000002, 0x00000000, 0x00000016, 0x00000001, 0x000000D6, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00830404, 0x00830401, 0x00000000, 0x000D00F1, 0x00000024, 0x00000002, 0xFE363C80, 0x000000C5, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000046, 0x00000001, D_802441DC_92E48C, 0x00000043, 0x00000003, AddItem, 0xFE363C80, 0xFE363C81, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00830404, 0x00830401, 0x00000000, 0x000D00F2, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFFFFFFFF, 0x000002CD, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x00000001, 0x00000001, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000024, 0x00000002, 0xF840627C, 0x00000000, 0x00000027, 0x00000002, 0xF5DE02E2, 0x00000001, 0x0000001C, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00830404, 0x00830401, 0x00000000, 0x000D00F3, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80245124_92F3D4 -.word 0x0000000B, 0x00000002, 0xF840627C, 0x00000000, 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, D_80244DA8_92F058, 0x00000012, 0x00000000, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80245178_92F428 -.word 0x00000001, D_80243F70_92E220, 0x00000000, 0xC47A0000, 0x00000000, 0x00000D01, D_80244D38_92EFE8, 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, 0x00130001, 0x00130001, 0x00130001, 0x00130001, 0x00130001, 0x00130001, 0x00130001, 0x00130001, 0x00130000, 0x00130001, 0x00130001, 0x00130001, 0x00130001, 0x00130001, 0x00130001, 0x00130001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_80245368_92F618 -.word 0x00000002, D_80243FF4_92E2A4, 0x00000000, 0x40000000, 0x43160000, 0x00112D09, D_80245124_92F3D4, 0x00000000, 0x00000000, 0x0000005A, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00830401, 0x00830402, 0x00830403, 0x00830403, 0x00830401, 0x00830401, 0x00830401, 0x00830406, 0x00830403, 0x00830403, 0x00830403, 0x00830403, 0x00830403, 0x00830403, 0x00830403, 0x00830403, 0x00000000, 0x00000000, 0x00000000, 0x001A0007, 0x00000001, D_80245178_92F428, 0x00000000, 0x00000001, D_80245368_92F618, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_sbk/sbk_02/92F830.data.s b/ver/us/asm/data/world/area_sbk/sbk_02/92F830.data.s deleted file mode 100644 index f86142503d..0000000000 --- a/ver/us/asm/data/world/area_sbk/sbk_02/92F830.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80245580_92F830 -.word 0x0000000F, 0x00000002, 0xF5DE0180, 0xFFFFFFC2, 0x00000043, 0x00000008, MakeEntity, Entity_HeartBlock, 0xFFFFFF10, 0x0000003C, 0xFFFFFF38, 0x00000000, 0x00000006, 0x80000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_sbk/sbk_30/940DC0.data.s b/ver/us/asm/data/world/area_sbk/sbk_30/940DC0.data.s deleted file mode 100644 index 1e9b44cc11..0000000000 --- a/ver/us/asm/data/world/area_sbk/sbk_30/940DC0.data.s +++ /dev/null @@ -1,144 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80241810_940DC0 -.word 0xC3ED8000, 0x00000000, 0x00000000, 0x42B40000, 0x43ED8000, 0x00000000, 0x00000000, 0x43870000, 0x00000000, 0x00000000, 0xC3ED8000, 0x43340000, 0x00000000, 0x00000000, 0x43ED8000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80241D90_941340, D_80241810_940DC0, 0x00000006, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, func_80200000, sbk_30_get_tattle - -dlabel D_802418B0_940E60 -.word 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x0000001D, 0x00000001, 0x00000004, 0x0000001D, 0x00000001, 0x00000005, 0x00000020, 0x00000000, 0x0000001C, 0x00000000, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000017, 0x00000000, 0x00000008, 0x00000020, 0x00000000, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241930_940EE0 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80244870, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024198C_940F3C -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000001, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80244878, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802419E8_940F98 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000002, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80244880, 0x00000003, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241A44_940FF4 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000003, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80244888, 0x00000002, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241AA0_941050 -.word 0x00000047, 0x00000005, D_80241930_940EE0, 0x00080000, 0x00000009, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_8024198C_940F3C, 0x00080000, 0x00000005, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_802419E8_940F98, 0x00080000, 0x00000003, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80241A44_940FF4, 0x00080000, 0x00000007, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241B20_9410D0 -.word 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF8405EBE, 0x00000000, 0x00000024, 0x00000002, 0xF8405EBE, 0x00000001, 0x00000024, 0x00000002, 0xF5DE0180, 0xFFFFFFBB, 0x00000013, 0x00000000, 0x00000016, 0x00000001, 0x00000001, 0x00000016, 0x00000001, 0x00000002, 0x00000016, 0x00000001, 0x00000003, 0x00000016, 0x00000001, 0x00000004, 0x00000002, 0x00000000, 0x00000023, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_80241AA0_941050, 0x00000044, 0x00000001, EnterWalk, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241BEC_94119C -.word 0x00000043, 0x00000002, PlaySound, 0x80000060, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x000000C1, 0x00000000, 0xFFFFFF13, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x000000C1, 0x00000000, 0xFFFFFF13, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000004, sbk_30_UnkFunc27, 0x00000002, 0x00000000, 0x00000003, 0x00000043, 0x00000004, sbk_30_UnkFunc27, 0x00000001, 0xFFFFFFFF, 0x00000003, 0x00000043, 0x0000000B, sbk_30_UnkFunc26, 0x00000003, 0x0000002C, 0x00000020, 0x000000B1, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000056, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x0000012C, 0xF24A7B80, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000003C, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000004, 0x00000043, 0x00000003, GotoMap, 0x80244890, 0x00000003, 0x00000012, 0x00000000, 0x00000043, 0x00000003, GotoMap, 0x80244890, 0x00000004, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241D90_941340 -.word 0x00000024, 0x00000002, 0xF5DE0329, 0x0000000A, 0x00000043, 0x00000002, SetSpriteShading, 0xFFFFFFFF, 0x0000000A, 0x00000002, 0xF5DE0180, 0xFFFFFFC1, 0x00000043, 0x00000002, DisablePulseStone, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000043, 0x00000003, SetCamLeadPlayer, 0x00000000, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFFCC, 0x00000043, 0x00000003, EnableGroup, 0x0000002C, 0x00000000, 0x00000043, 0x00000003, MakeNpcs, 0x00000000, D_80243DF8_9433A8, 0x00000012, 0x00000000, 0x00000043, 0x00000003, EnableGroup, 0x0000002A, 0x00000000, 0x00000043, 0x00000003, EnableGroup, 0x00000023, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000017, 0x7FFFFE00, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000044, 0x00000001, D_802418B0_940E60, 0x00000044, 0x00000001, D_80241B20_9410D0, 0x00000044, 0x00000001, D_802447DC_943D8C, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x0000001D, 0x00000001, 0x00000004, 0x0000001D, 0x00000001, 0x00000005, 0x00000046, 0x00000001, D_80241BEC_94119C, 0x00000020, 0x00000000, 0x0000001C, 0x00000000, 0x00000043, 0x00000001, sbk_30_SpawnSunEffect, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241F70_941520 -.word 0x00000000, 0x00280018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000, 0x00000000, 0x00230018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000 - -dlabel D_80241FC8_941578 -.word 0x00000000, 0x002A0018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000 - -dlabel sbk_30_varStash -.word 0x00000000 - -dlabel D_80241FF8_9415A8 -.word 0x00000043, 0x00000004, ShowGotItem, 0xFE363C80, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000004, ShowGotItem, 0xFE363C80, 0x00000001, 0x00000010, 0x00000002, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242058_941608 -.word 0x00000000 - -dlabel D_8024205C_94160C -.word 0x00000000 - -dlabel D_80242060_941610 -.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, sbk_30_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, func_80241174_940724, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802421A4_941754 -.word 0x00000043, 0x00000002, func_802411AC_94075C, 0xFE363C80, 0x0000004E, 0x00000006, D_80242060_941610, 0x00000010, 0x00000000, btl_state_update_end_battle, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_80241120_9406D0, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802421F4_9417A4 -.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, sbk_30_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, func_80241174_940724, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_80241248_9407F8, 0xFE363C80, 0x0000004E, 0x00000006, D_802421F4_9417A4, 0x00000010, 0x00000000, sbk_30_D_80244C18, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_80241120_9406D0, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242378_941928 -.word 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, sbk_30_LetterDelivery_CalcLetterPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, SetItemPos, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802423F8_9419A8 -.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, sbk_30_LetterDelivery_CalcLetterPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000045, 0x00000002, D_80242378_941928, 0xFE363C8A, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00040002, 0x00000043, 0x00000004, GetAngleBetweenNPCs, 0xFE363C89, 0xFFFFFFFC, 0xFE363C8B, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, GetNpcPos, 0xFE363C89, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x0000000E, 0x00000002, 0xFE363C8B, 0x000000B4, 0x00000027, 0x00000002, 0xFE363C86, 0x00000014, 0x00000012, 0x00000000, 0x00000027, 0x00000002, 0xFE363C86, 0xFFFFFFEC, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C87, 0x0000000A, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFC, 0xF24A7A80, 0x00000043, 0x00000006, NpcJump1, 0xFFFFFFFC, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000014, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, GetNpcYaw, 0xFFFFFFFC, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C8A, 0x000000B4, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0xFE363C8A, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000006, NpcJump1, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00040001, 0x00000043, 0x00000004, NpcFaceNpc, 0xFFFFFFFC, 0xFE363C89, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000008, 0x00000001, 0x00000005, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_80241174_940724, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024271C_941CCC -.word 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, func_802411AC_94075C, 0xFE363C80, 0x0000004E, 0x00000006, D_802423F8_9419A8, 0x00000010, 0x00000000, btl_state_update_end_battle, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_80241120_9406D0, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024278C_941D3C -.word 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFFBA, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, sbk_30_LetterDelivery_SaveNpcAnim, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x00000043, 0x00000003, FindKeyItem, 0xFE363C85, 0xFE363C81, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000004, 0x0000000B, 0x00000002, 0xFE363C81, 0xFFFFFFFF, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000003, PlayerFaceNpc, 0xFE363C82, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, GetNpcPos, 0xFE363C82, 0xFE363C8D, 0xFE363C80, 0xFE363C8E, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C8D, 0xFE363C8E, 0xFE363C8F, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFC, 0xF24A7A80, 0x00000027, 0x00000002, 0xFE363C80, 0x0000000A, 0x00000043, 0x00000006, NpcJump1, 0xFFFFFFFC, 0xFE363C8D, 0xFE363C80, 0xFE363C8F, 0x0000000A, 0x00000043, 0x00000007, SpeakToNpc, 0xFFFFFFFC, 0x00040006, 0x00040001, 0x00000000, 0xFE363C82, 0xFE363C87, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000046, 0x00000001, D_8024271C_941CCC, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x00040006, 0x00040001, 0x00000005, 0xFE363C88, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000001, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x00040006, 0x00040001, 0x00000005, 0xFE363C89, 0x0000000B, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000000, 0xFE363C8A, 0x00000013, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x0000000B, 0x00000002, 0xFE363C86, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C86, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000046, 0x00000001, D_80241FF8_9415A8, 0x00000043, 0x00000002, AddKeyItem, 0xFE363C86, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000002, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, sbk_30_LetterDelivery_RestoreNpcAnim, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242A84_942034 -.word 0x00000054, 0x00000000 - -dlabel D_80242A8C_94203C -.word 0x00000043, 0x0000000B, sbk_30_LetterDelivery_Init, 0x00000000, 0x00B60008, 0x00B60001, 0x00000054, 0x00000000, 0x000D004A, 0x000D004B, 0x000D004C, 0x000D004D, D_80242A84_942034, 0x00000046, 0x00000001, D_8024278C_941D3C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242ADC_94208C -.word 0x0000000A, 0x00000002, 0xFE363C8C, 0x00000002, 0x00000024, 0x00000002, 0xFE363C80, 0x0000015C, 0x00000024, 0x00000002, 0xFE363C81, 0x00000003, 0x00000046, 0x00000001, D_80241FF8_9415A8, 0x00000043, 0x00000002, AddStarPieces, 0x00000001, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242B40_9420F0 -.word 0x00000053, 0x00000000 - -dlabel D_80242B48_9420F8 -.word 0x00000024, 0x00000002, 0xF8405E92, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00B60008, 0x00B60001, 0x00000000, 0x000D0044, 0x00000024, 0x00000002, 0xFE363C80, 0x0000015C, 0x00000024, 0x00000002, 0xFE363C81, 0x00000003, 0x00000046, 0x00000001, D_80241FF8_9415A8, 0x00000043, 0x00000002, AddStarPieces, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00B60008, 0x00B60001, 0x00000000, 0x000D0045, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242BE4_942194 -.word 0x00000043, 0x00000003, GetNpcAnimation, 0xFFFFFFFF, 0xFE363C89, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00B60001, 0x0000000A, 0x00000002, 0xF8405E8E, 0x00000000, 0x00000043, 0x00000007, AdjustCam, 0x00000000, 0xF24A8A80, 0x00000000, 0xF24F2A80, 0xF24AB680, 0xF24A5C80, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00B60008, 0x00B60001, 0x00000000, 0x000D0037, 0x00000043, 0x00000003, ResetCam, 0x00000000, 0x00000004, 0x00000024, 0x00000002, 0xF8405E8E, 0x00000001, 0x00000004, 0x00000001, 0x00000032, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405E92, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00B60008, 0x00B60001, 0x00000000, 0x000D0046, 0x00000004, 0x00000001, 0x00000032, 0x00000013, 0x00000000, 0x00000043, 0x00000003, HasKeyItem, 0x00000053, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x0000000A, 0x00000002, 0xF8405E91, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00B60008, 0x00B60001, 0x00000000, 0x000D0043, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xF8405E91, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00B60008, 0x00B60001, 0x00000000, 0x000D0040, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_80242B40_9420F0, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000046, 0x00000001, D_802421A4_941754, 0x00000014, 0x00000001, 0xFE363C80, 0x0000001B, 0x00000001, 0x00000001, 0x00000046, 0x00000001, D_80242B48_9420F8, 0x00000004, 0x00000001, 0x00000032, 0x0000001C, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00B60008, 0x00B60001, 0x00000000, 0x000D0041, 0x00000024, 0x00000002, 0xFE363C80, D_80242B40_9420F0, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000046, 0x00000001, D_802421A4_941754, 0x00000014, 0x00000001, 0xFE363C80, 0x0000001B, 0x00000001, 0x00000001, 0x00000046, 0x00000001, D_80242B48_9420F8, 0x0000001C, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00B60008, 0x00B60001, 0x00000000, 0x000D0042, 0x00000004, 0x00000001, 0x00000032, 0x00000023, 0x00000000, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x0000000F, 0x00000002, 0xF5DE0180, 0xFFFFFFBC, 0x0000000A, 0x00000002, 0xF8405E6A, 0x00000000, 0x0000000A, 0x00000002, 0xF9718884, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00B60008, 0x00B60001, 0x00000000, 0x000D0039, 0x00000024, 0x00000002, 0xF9718884, 0x00000001, 0x00000004, 0x00000001, 0x00000032, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00B60008, 0x00B60001, 0x00000000, 0x000D003A, 0x00000004, 0x00000001, 0x00000032, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405E6C, 0x00000000, 0x0000000A, 0x00000002, 0xF9718885, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00B60008, 0x00B60001, 0x00000000, 0x000D003B, 0x00000024, 0x00000002, 0xF8405E93, 0x00000001, 0x00000024, 0x00000002, 0xF9718885, 0x00000001, 0x00000004, 0x00000001, 0x00000032, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00B60008, 0x00B60001, 0x00000000, 0x000D003C, 0x00000004, 0x00000001, 0x00000032, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405E93, 0x00000001, 0x0000000A, 0x00000002, 0xF8405E6D, 0x00000000, 0x0000000A, 0x00000002, 0xF9718886, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00B60008, 0x00B60001, 0x00000000, 0x000D003D, 0x00000024, 0x00000002, 0xF9718886, 0x00000001, 0x00000004, 0x00000001, 0x00000032, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00B60008, 0x00B60001, 0x00000000, 0x000D003E, 0x00000004, 0x00000001, 0x00000032, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00B60008, 0x00B60001, 0x00000000, 0x000D003F, 0x00000004, 0x00000001, 0x00000032, 0x00000013, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00B60008, 0x00B60001, 0x00000000, 0x000D0038, 0x00000003, 0x00000001, 0x00000032, 0x00000003, 0x00000001, 0x0000005A, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000002, 0x0000000A, 0x00000002, 0xF8405ED1, 0x00000000, 0x00000024, 0x00000002, 0xF8405ED1, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000007, SpeakToNpc, 0xFFFFFFFC, 0x00020011, 0x00020003, 0x00000000, 0xFFFFFFFF, 0x000D0047, 0x00000043, 0x00000007, SpeakToNpc, 0xFFFFFFFF, 0x00B60008, 0x00B60001, 0x00000000, 0xFFFFFFFC, 0x000D0048, 0x00000043, 0x00000007, SpeakToNpc, 0xFFFFFFFC, 0x00020011, 0x00020003, 0x00000000, 0xFFFFFFFF, 0x000D0049, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0xFE363C89, 0x00000046, 0x00000001, D_80242A8C_94203C, 0x00000046, 0x00000001, D_80242ADC_94208C, 0x0000000B, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80243248_9427F8 -.word 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00B60001, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00B60004, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0x00000061, 0xFFFFFF4D, 0x00000078, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00B60001, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00B60004, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0x000000C8, 0xFFFFFF9C, 0x00000078, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024330C_9428BC -.word 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00B60007, 0x00000043, 0x00000003, SetNpcSpeed, 0xFFFFFFFF, 0xF24A8A80, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0x00000091, 0xFFFFFF6F, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000003, RandInt, 0x0000001E, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C80, 0x00000001, 0x00000008, 0x00000001, 0xFE363C80, 0x00000043, 0x00000003, GetNpcYaw, 0xFFFFFFFF, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C80, 0x000000B4, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFF, 0xFE363C80, 0x00000005, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802433E4_942994 -.word 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x0000001D, 0x00000001, 0x00000004, 0x0000001D, 0x00000001, 0x00000005, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x000000D2, 0x00000000, 0xFFFFFF2E, 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, D_8024330C_9428BC, 0x00000020, 0x00000000, 0x0000001C, 0x00000000, 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, D_80242BE4_942194, 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, D_80243248_9427F8, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80243498_942A48 -.word 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00B80004, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000003, RandInt, 0x00000032, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C80, 0x00000001, 0x00000008, 0x00000001, 0xFE363C80, 0x00000043, 0x00000003, GetNpcYaw, 0xFFFFFFFF, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C80, 0x000000B4, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFF, 0xFE363C80, 0x00000005, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80243540_942AF0 -.word 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0xFFFFFFC1, 0x0000000A, 0x00000002, 0xF9718882, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x000D004E, 0x00000024, 0x00000002, 0xF9718882, 0x00000001, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x000D004F, 0x00000024, 0x00000002, 0xF9718882, 0x00000000, 0x00000013, 0x00000000, 0x0000001C, 0x00000000, 0x0000000A, 0x00000002, 0xF8405E92, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x000D0050, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x000D0051, 0x00000013, 0x00000000, 0x00000023, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00B80004, 0x00B80001, 0x00000000, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80243638_942BE8 -.word 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, D_80243540_942AF0, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x0000001D, 0x00000001, 0x00000004, 0x0000001D, 0x00000001, 0x00000005, 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, D_80243498_942A48, 0x00000020, 0x00000000, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802436B4_942C64 -.word 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0xFFFFFFC1, 0x0000000A, 0x00000002, 0xF9718883, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x000D0052, 0x00000024, 0x00000002, 0xF9718883, 0x00000001, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x000D0053, 0x00000024, 0x00000002, 0xF9718883, 0x00000000, 0x00000013, 0x00000000, 0x0000001C, 0x00000000, 0x0000000A, 0x00000002, 0xF8405E92, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x000D0054, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x000D0055, 0x00000013, 0x00000000, 0x00000023, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00B80004, 0x00B80001, 0x00000000, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802437AC_942D5C -.word 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, D_802436B4_942C64, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x0000001D, 0x00000001, 0x00000004, 0x0000001D, 0x00000001, 0x00000005, 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, D_80243498_942A48, 0x00000020, 0x00000000, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80243828_942DD8 -.word 0x00000000, D_80241F70_941520, 0x43480000, 0x00000000, 0xC2C80000, 0x00002D01, D_802433E4_942994, 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, 0x00B60001, 0x00B60004, 0x00B60006, 0x00B60006, 0x00B60001, 0x00B60001, 0x00B60001, 0x00B60001, 0x00B60001, 0x00B60001, 0x00B60001, 0x00B60001, 0x00B60001, 0x00B60001, 0x00B60001, 0x00B60001, 0x00000000, 0x00000000, 0x00000000, 0x001A008B, 0x00000001, D_80241FC8_941578, 0x436E0000, 0x00000000, 0xC2E00000, 0x00002D01, D_80243638_942BE8, 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, 0x00000064, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00B80001, 0x00B80002, 0x00B80003, 0x00B80003, 0x00B80001, 0x00B80001, 0x00B80001, 0x00B80001, 0x00B80001, 0x00B80001, 0x00B80001, 0x00B80001, 0x00B80001, 0x00B80001, 0x00B80001, 0x00B80001, 0x00000000, 0x00000000, 0x00000000, 0x001A008C, 0x00000002, D_80241FC8_941578, 0x432A0000, 0x00000000, 0xC33E0000, 0x00002D01, D_802437AC_942D5C, 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, 0x00000064, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00B80001, 0x00B80002, 0x00B80003, 0x00B80003, 0x00B80001, 0x00B80001, 0x00B80001, 0x00B80001, 0x00B80001, 0x00B80001, 0x00B80001, 0x00B80001, 0x00B80001, 0x00B80001, 0x00B80001, 0x00B80001, 0x00000000, 0x00000000, 0x00000000, 0x001A008D - -dlabel D_80243DF8_9433A8 -.word 0x00000003, D_80243828_942DD8, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000030, 0x00000001, 0xFE363C80, 0x00000034, 0x00000004, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C85, 0xFE363C8F, 0xFE363C87, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000006, sbk_30_TransformFoliage, 0xFE363C83, 0xF24A7AE7, 0x00000001, 0xFE363C8F, 0x00000000, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000043, 0x00000004, PlaySoundAtModel, 0xFE363C83, 0x00000153, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000006, sbk_30_TransformFoliage, 0xFE363C83, 0xF24A7AE7, 0xFFFFFFFF, 0xFE363C8F, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000005, TranslateModel, 0xFE363C83, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C82, 0x00000000, 0x00000030, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000005, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000033, 0x00000003, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000033, 0x00000003, 0xFE363C88, 0xFE363C89, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000007, DropItemEntity, 0xFE363C84, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x00000012, 0x00000000, 0x00000043, 0x00000003, GetValueByRef, 0xFE363C8A, 0xFE363C8B, 0x0000000A, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000043, 0x00000003, SetValueByRef, 0xFE363C8A, 0x00000001, 0x00000043, 0x00000007, DropItemEntity, 0xFE363C84, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x0000000B, 0x00000002, 0xFE363C84, 0x00000000, 0x00000046, 0x00000001, 0xFE363C84, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80244170_943720 -.word 0x0000004C, 0x00000001, 0xF24A8280, 0x00000030, 0x00000001, 0xFE363C80, 0x00000034, 0x00000004, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000031, 0x00000001, 0xFE363C85, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C86, 0xFE363C8F, 0xFE363C88, 0x00000043, 0x00000002, PlaySound, 0x00000165, 0x00000043, 0x00000002, PlaySound, 0x00000166, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000005, 0x00000001, 0x00000005, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000006, sbk_30_TransformFoliage, 0xFE363C83, 0xF24A7AE7, 0xF24A7B4D, 0xFE363C8F, 0x00000000, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000043, 0x00000004, PlaySoundAtModel, 0xFE363C83, 0x00000166, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000006, sbk_30_TransformFoliage, 0xFE363C83, 0xF24A7AE7, 0xF24A79B4, 0xFE363C8F, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000005, TranslateModel, 0xFE363C83, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C82, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x00000030, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000005, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000043, 0x00000006, sbk_30_TransformFoliage, 0xFE363C84, 0xF24A7AE7, 0xF24A7B4D, 0xFE363C8F, 0x00000000, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000043, 0x00000004, PlaySoundAtModel, 0xFE363C84, 0x00000165, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000030, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000005, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000043, 0x00000006, sbk_30_TransformFoliage, 0xFE363C84, 0xF24A7AE7, 0xF24A79B4, 0xFE363C8F, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000030, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000005, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000043, 0x00000005, TranslateModel, 0xFE363C84, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C83, 0x00000000, 0x00000030, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000005, 0x00000001, 0xFE363C84, 0x00000031, 0x00000001, 0xFE363C85, 0x00000033, 0x00000003, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000033, 0x00000003, 0xFE363C89, 0xFE363C8A, 0xFE363C8B, 0x0000000A, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000043, 0x00000007, DropItemEntity, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0xFE363C8A, 0x00000012, 0x00000000, 0x00000043, 0x00000003, GetValueByRef, 0xFE363C8B, 0xFE363C8C, 0x0000000A, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000043, 0x00000003, SetValueByRef, 0xFE363C8B, 0x00000001, 0x00000043, 0x00000007, DropItemEntity, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0xFE363C8A, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C84, 0x00000000, 0x00000030, 0x00000001, 0xFE363C84, 0x00000031, 0x00000001, 0xFE363C85, 0x00000005, 0x00000001, 0xFE363C85, 0x00000033, 0x00000003, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000043, 0x0000000F, PlayEffect, 0x00000014, 0x00000000, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000064, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C85, 0x00000000, 0x00000046, 0x00000001, 0xFE363C85, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80244774_943D24 -.word 0x00000001, 0x00000037 - -dlabel D_8024477C_943D2C -.word 0x00000001, 0x00000036 - -dlabel D_80244784_943D34 -.word 0x00000001, 0x00000037, 0x000000CC, 0x0000005C, 0xFFFFFF24, 0x0000000D, 0xF8405EC0, 0xFAA2B58A - -dlabel D_802447A4_943D54 -.word D_80244774_943D24, D_8024477C_943D2C, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_802447B8_943D68 -.word D_80244774_943D24, D_8024477C_943D2C, D_80244784_943D34, 0x00000000, 0x00000000 - -dlabel D_802447CC_943D7C -.word 0x43850000, 0x00000000, 0xC3510000, 0x00000000 - -dlabel D_802447DC_943D8C -.word 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFFCC, 0x00000024, 0x00000002, 0xFE363C80, D_802447A4_943D54, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_802447B8_943D68, 0x00000013, 0x00000000, 0x00000047, 0x00000005, D_80244170_943720, 0x00001000, 0x0000001B, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80244170_943720, 0x00100000, D_802447CC_943D7C, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/nonmatchings/world/area_sbk/sbk_02/92A9A0/func_8024091C_92ABCC.s b/ver/us/asm/nonmatchings/world/area_sbk/sbk_02/92A9A0/func_8024091C_92ABCC.s deleted file mode 100644 index 6711196b8b..0000000000 --- a/ver/us/asm/nonmatchings/world/area_sbk/sbk_02/92A9A0/func_8024091C_92ABCC.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024091C_92ABCC -/* 92ABCC 8024091C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 92ABD0 80240920 AFBF0010 */ sw $ra, 0x10($sp) -/* 92ABD4 80240924 10A00003 */ beqz $a1, .L80240934 -/* 92ABD8 80240928 8C86000C */ lw $a2, 0xc($a0) -/* 92ABDC 8024092C 3C018024 */ lui $at, %hi(D_8024404C_92E2FC) -/* 92ABE0 80240930 AC20404C */ sw $zero, %lo(D_8024404C_92E2FC)($at) -.L80240934: -/* 92ABE4 80240934 3C038024 */ lui $v1, %hi(D_8024404C_92E2FC) -/* 92ABE8 80240938 2463404C */ addiu $v1, $v1, %lo(D_8024404C_92E2FC) -/* 92ABEC 8024093C 8C620000 */ lw $v0, ($v1) -/* 92ABF0 80240940 54400003 */ bnel $v0, $zero, .L80240950 -/* 92ABF4 80240944 AC600000 */ sw $zero, ($v1) -/* 92ABF8 80240948 08090259 */ j .L80240964 -/* 92ABFC 8024094C 0000102D */ daddu $v0, $zero, $zero -.L80240950: -/* 92AC00 80240950 8CC50000 */ lw $a1, ($a2) -/* 92AC04 80240954 3C068024 */ lui $a2, %hi(D_80244050_92E300) -/* 92AC08 80240958 0C0B2026 */ jal evt_set_variable -/* 92AC0C 8024095C 8CC64050 */ lw $a2, %lo(D_80244050_92E300)($a2) -/* 92AC10 80240960 24020002 */ addiu $v0, $zero, 2 -.L80240964: -/* 92AC14 80240964 8FBF0010 */ lw $ra, 0x10($sp) -/* 92AC18 80240968 03E00008 */ jr $ra -/* 92AC1C 8024096C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_sbk/sbk_30/93F5B0/func_80241120_9406D0.s b/ver/us/asm/nonmatchings/world/area_sbk/sbk_30/93F5B0/func_80241120_9406D0.s deleted file mode 100644 index 034e770513..0000000000 --- a/ver/us/asm/nonmatchings/world/area_sbk/sbk_30/93F5B0/func_80241120_9406D0.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241120_9406D0 -/* 9406D0 80241120 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 9406D4 80241124 AFBF0010 */ sw $ra, 0x10($sp) -/* 9406D8 80241128 10A00003 */ beqz $a1, .L80241138 -/* 9406DC 8024112C 8C86000C */ lw $a2, 0xc($a0) -/* 9406E0 80241130 3C018024 */ lui $at, %hi(D_80242058_941608) -/* 9406E4 80241134 AC202058 */ sw $zero, %lo(D_80242058_941608)($at) -.L80241138: -/* 9406E8 80241138 3C038024 */ lui $v1, %hi(D_80242058_941608) -/* 9406EC 8024113C 24632058 */ addiu $v1, $v1, %lo(D_80242058_941608) -/* 9406F0 80241140 8C620000 */ lw $v0, ($v1) -/* 9406F4 80241144 54400003 */ bnel $v0, $zero, .L80241154 -/* 9406F8 80241148 AC600000 */ sw $zero, ($v1) -/* 9406FC 8024114C 0809045A */ j .L80241168 -/* 940700 80241150 0000102D */ daddu $v0, $zero, $zero -.L80241154: -/* 940704 80241154 8CC50000 */ lw $a1, ($a2) -/* 940708 80241158 3C068024 */ lui $a2, %hi(D_8024205C_94160C) -/* 94070C 8024115C 0C0B2026 */ jal evt_set_variable -/* 940710 80241160 8CC6205C */ lw $a2, %lo(D_8024205C_94160C)($a2) -/* 940714 80241164 24020002 */ addiu $v0, $zero, 2 -.L80241168: -/* 940718 80241168 8FBF0010 */ lw $ra, 0x10($sp) -/* 94071C 8024116C 03E00008 */ jr $ra -/* 940720 80241170 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_sbk/sbk_30/93F5B0/func_80241174_940724.s b/ver/us/asm/nonmatchings/world/area_sbk/sbk_30/93F5B0/func_80241174_940724.s deleted file mode 100644 index ef67e6e483..0000000000 --- a/ver/us/asm/nonmatchings/world/area_sbk/sbk_30/93F5B0/func_80241174_940724.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241174_940724 -/* 940724 80241174 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 940728 80241178 AFBF0010 */ sw $ra, 0x10($sp) -/* 94072C 8024117C 8C82000C */ lw $v0, 0xc($a0) -/* 940730 80241180 0C0B1EAF */ jal evt_get_variable -/* 940734 80241184 8C450000 */ lw $a1, ($v0) -/* 940738 80241188 3C018024 */ lui $at, %hi(D_8024205C_94160C) -/* 94073C 8024118C AC22205C */ sw $v0, %lo(D_8024205C_94160C)($at) -/* 940740 80241190 24020002 */ addiu $v0, $zero, 2 -/* 940744 80241194 8FBF0010 */ lw $ra, 0x10($sp) -/* 940748 80241198 24030001 */ addiu $v1, $zero, 1 -/* 94074C 8024119C 3C018024 */ lui $at, %hi(D_80242058_941608) -/* 940750 802411A0 AC232058 */ sw $v1, %lo(D_80242058_941608)($at) -/* 940754 802411A4 03E00008 */ jr $ra -/* 940758 802411A8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/splat.yaml b/ver/us/splat.yaml index 64d48fcd2a..3eea4114d6 100644 --- a/ver/us/splat.yaml +++ b/ver/us/splat.yaml @@ -8306,14 +8306,13 @@ segments: start: 0x92A2B0 vram: 0x80240000 subsegments: - - [0x92A2B0, c] - - [0x92A9A0, c] - - [0x92AEB0, data] - - [0x92AFF0, data] - - [0x92B500, data] - - [0x92E220, data] - - [0x92F830, data] - - [0x92F880] + - [0x92A2B0, c, sbk_02_0_header] + - [0x92A2F0, c, sbk_02_1_music] + - [0x92A2F0, c, sbk_02_2_main] + - [0x92A2F0, c, sbk_02_3_ruins] + - [0x92A9A0, c, sbk_02_4_npc] + - [0x92A9A0, c, sbk_02_5_entity] + - [0x92AEB0] - name: sbk_03 dir: world/area_sbk/sbk_03 type: code @@ -8485,19 +8484,18 @@ segments: - [0x93DD10, c, sbk_26_2_npc] - [0x93DE30, c, sbk_26_3_foliage] - [0x93E070] - - name: sbk_30 #TODO + - name: sbk_30 dir: world/area_sbk/sbk_30 type: code start: 0x93F5B0 vram: 0x80240000 subsegments: - - [0x93F5B0, c] - - [0x940DC0, data] - - [0x943E20] -# - [0x93F5B0, c, sbk_30_1_main] -# - [0x93F5B0, c, sbk_30_2_npc] -# - [0x93F5B0, c, sbk_30_3_foliage] -# - [0x940DC0] + - [0x93F5B0, c, sbk_30_0_header] + - [0x93F5B0, c, sbk_30_1_music] + - [0x93F5B0, c, sbk_30_2_main] + - [0x93F5B0, c, sbk_30_3_npc] + - [0x93F5B0, c, sbk_30_4_foliage] + - [0x940DC0] - name: sbk_31 dir: world/area_sbk/sbk_31 type: code diff --git a/ver/us/symbol_addrs.txt b/ver/us/symbol_addrs.txt index dd62597f1a..a6dd3a00dc 100644 --- a/ver/us/symbol_addrs.txt +++ b/ver/us/symbol_addrs.txt @@ -16540,7 +16540,7 @@ sbk_02_get_tattle = 0x80240000; // type:func rom:0x92A2B0 sbk_02_UnkFunc27 = 0x80240040; // type:func rom:0x92A2F0 sbk_02_UnkFunc26 = 0x80240164; // type:func rom:0x92A414 sbk_02_func_80240338_92A5E8 = 0x80240338; // type:func rom:0x92A5E8 -sbk_02_func_80240364_92A614 = 0x80240364; // type:func rom:0x92A614 +sbk_02_InterpWorldEnvColor = 0x80240364; // type:func rom:0x92A614 sbk_02_GetNpcCollisionHeight = 0x802406F0; // type:func rom:0x92A9A0 sbk_02_AddPlayerHandsOffset = 0x8024074C; // type:func rom:0x92A9FC func_8024091C_92ABCC = 0x8024091C; // type:func rom:0x92ABCC @@ -16548,7 +16548,7 @@ func_80240970_92AC20 = 0x80240970; // type:func rom:0x92AC20 func_802409A8_92AC58 = 0x802409A8; // type:func rom:0x92AC58 sbk_02_StashVars = 0x80240A44; // type:func rom:0x92ACF4 sbk_02_GetItemName = 0x80240AF8; // type:func rom:0x92ADA8 -PostChapter2StatUpdate = 0x80240B5C; // type:func rom:0x92AE0C +UpgradeStarPower = 0x80240B5C; // type:func rom:0x92AE0C sbk_02_CheckTradeEventTime = 0x80240B98; // type:func rom:0x92AE48 GetItemCount = 0x80240BD4; // type:func rom:0x92AE84 D_8024404C_92E2FC = 0x8024404C; // type:data rom:0x92E2FC